index fcb4ad9047279574b9622aa6158f23ed4373e7a1..d9cf5684c508c43eed986b311e1dcad0aba5a6f9 100644 (file)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
uses sysutils, Classes, md5, g_net, g_netmsg, g_console, g_main, e_log;
uses sysutils, Classes, md5, g_net, g_netmsg, g_console, g_main, e_log;
-function g_Res_SearchSameWAD(const path, filename: string; const resMd5: TMD5Digest): string;
-function g_Res_DownloadWAD(const FileName: string): string;
+function g_Res_SearchSameWAD(const path, filename: AnsiString; const resMd5: TMD5Digest): AnsiString;
+
+// download map wad from server (if necessary)
+// download all required map resource wads too
+// returns name of the map wad (relative to mapdir), or empty string on error
+function g_Res_DownloadMapWAD (FileName: AnsiString; const mapHash: TMD5Digest): AnsiString;
+
+// call this before downloading a new map from a server
+procedure g_Res_ClearReplacementWads ();
+// returns original name, or replacement name
+function g_Res_FindReplacementWad (oldname: AnsiString): AnsiString;
+procedure g_Res_PutReplacementWad (oldname: AnsiString; newDiskName: AnsiString);
+
implementation
implementation
-uses g_language, sfs, utils, wadreader, g_game;
+uses g_language, sfs, utils, wadreader, g_game, hashtable;
-const DOWNLOAD_DIR = 'downloads';
+//const DOWNLOAD_DIR = 'downloads';
-procedure FindFiles(const dirName, filename: string; var files: TStringList);
var
var
- searchResult: TSearchRec;
+ replacements: THashStrStr = nil;
+
+
+// call this before downloading a new map from a server
+procedure g_Res_ClearReplacementWads ();
begin
begin
- if FindFirst(dirName+'/*', faAnyFile, searchResult) = 0 then
- begin
- try
- repeat
- if (searchResult.Attr and faDirectory) = 0 then
- begin
- if StrEquCI1251(searchResult.Name, filename) then
- begin
- files.Add(dirName+'/'+filename);
- Exit;
- end;
- end
- else if (searchResult.Name <> '.') and (searchResult.Name <> '..') then
- FindFiles(IncludeTrailingPathDelimiter(dirName)+searchResult.Name, filename, files);
- until FindNext(searchResult) <> 0;
- finally
- FindClose(searchResult);
- end;
- end;
+ if assigned(replacements) then replacements.clear();
+ e_LogWriteln('cleared replacement wads');
end;
end;
-function CompareFileHash(const filename: string; const resMd5: TMD5Digest): Boolean;
+
+// returns original name, or replacement name
+function g_Res_FindReplacementWad (oldname: AnsiString): AnsiString;
var
var
- gResHash: TMD5Digest;
- fname: string;
+ fn: AnsiString;
begin
begin
- fname := findDiskWad(filename);
- if length(fname) = 0 then begin result := false; exit; end;
- gResHash := MD5File(fname);
- Result := MD5Match(gResHash, resMd5);
+ result := oldname;
+ if not assigned(replacements) then exit;
+ if (replacements.get(toLowerCase1251(ExtractFileName(oldname)), fn)) then result := fn;
end;
end;
-function CheckFileHash(const path, filename: string; const resMd5: TMD5Digest): Boolean;
-var
- fname: string;
+
+procedure g_Res_PutReplacementWad (oldname: AnsiString; newDiskName: AnsiString);
begin
begin
- fname := findDiskWad(path+filename);
- if length(fname) = 0 then begin result := false; exit; end;
- Result := FileExists(fname) and CompareFileHash(fname, resMd5);
+ e_LogWritefln('adding replacement wad: oldname=%s; newname=%s', [oldname, newDiskName]);
+ if not assigned(replacements) then replacements := THashStrStr.Create();
+ replacements.put(toLowerCase1251(oldname), newDiskName);
end;
end;
-function g_Res_SearchSameWAD(const path, filename: string; const resMd5: TMD5Digest): string;
+
+function scanDir (dirName: AnsiString; baseName: AnsiString; const resMd5: TMD5Digest): AnsiString;
var
var
- res: string;
- files: TStringList;
- i: Integer;
+ searchResult: TSearchRec;
+ dfn: AnsiString;
+ md5: TMD5Digest;
+ dirs: array of AnsiString;
+ f: Integer;
begin
begin
- Result := '';
+ result := '';
+ SetLength(dirs, 0);
+ if (length(baseName) = 0) then exit;
+ dirName := IncludeTrailingPathDelimiter(dirName);
+ e_LogWritefln('scanning dir `%s` for file `%s`...', [dirName, baseName]);
- if CheckFileHash(path, filename, resMd5) then
+ // scan files
+ if (FindFirst(dirName+'*', faAnyFile, searchResult) <> 0) then exit;
+ try
+ repeat
+ if ((searchResult.Attr and faDirectory) = 0) then
+ begin
+ if (isWadNamesEqu(searchResult.Name, baseName)) then
+ begin
+ dfn := dirName+searchResult.Name;
+ if FileExists(dfn) then
+ begin
+ e_LogWritefln(' found `%s`...', [dfn]);
+ md5 := MD5File(dfn);
+ if MD5Match(md5, resMd5) then
+ begin
+ e_LogWritefln(' MATCH `%s`...', [dfn]);
+ SetLength(dirs, 0);
+ result := dfn;
+ exit;
+ end;
+ end;
+ end;
+ end
+ else
+ begin
+ if (searchResult.Name <> '.') and (searchResult.Name <> '..') then
+ begin
+ dfn := dirName+searchResult.Name;
+ SetLength(dirs, Length(dirs)+1);
+ dirs[length(dirs)-1] := dfn;
+ end;
+ end;
+ until (FindNext(searchResult) <> 0);
+ finally
+ FindClose(searchResult);
+ end;
+
+ // scan subdirs
+ for f := 0 to High(dirs) do
begin
begin
- Result := path + filename;
- Exit;
+ dfn := dirs[f];
+ result := scanDir(dfn, baseName, resMd5);
+ if (length(result) <> 0) then begin SetLength(dirs, 0); exit; end;
end;
end;
+ SetLength(dirs, 0);
+end;
- files := TStringList.Create;
- FindFiles(path, filename, files);
- for i := 0 to files.Count - 1 do
+function g_Res_SearchResWad (asMap: Boolean; fname: AnsiString; const resMd5: TMD5Digest): AnsiString;
+begin
+ result := '';
+ //if not assigned(scannedDirs) then scannedDirs := THashStrInt.Create();
+ if (asMap) then
begin
begin
- res := files.Strings[i];
- if CompareFileHash(res, resMd5) then
- begin
- Result := res;
- Break;
- end;
+ result := scanDir(GameDir+'/maps', ExtractFileName(fname), resMd5);
+ end
+ else
+ begin
+ result := scanDir(GameDir+'/wads', ExtractFileName(fname), resMd5);
end;
end;
+end;
- files.Free;
+
+function g_Res_SearchSameWAD (const path, filename: AnsiString; const resMd5: TMD5Digest): AnsiString;
+begin
+ result := scanDir(path, filename, resMd5);
end;
end;
-function SaveWAD(const path, filename: string; const data: array of Byte): string;
+
+function g_Res_DownloadMapWAD (FileName: AnsiString; const mapHash: TMD5Digest): AnsiString;
var
var
- resFile: TStream;
- dpt: string;
+ tf: TNetFileTransfer;
+ resList: TStringList;
+ f, res: Integer;
+ strm: TStream;
+ fname: AnsiString;
+ wadname: AnsiString;
begin
begin
+ //SetLength(mapData.ExternalResources, 0);
+ result := '';
+ g_Res_ClearReplacementWads();
+ g_Res_received_map_start := false;
+
try
try
- result := path+DOWNLOAD_DIR+'/'+filename;
- dpt := path+DOWNLOAD_DIR;
- if not findFileCI(dpt, true) then CreateDir(dpt);
- resFile := createDiskFile(result);
- resFile.WriteBuffer(data[0], Length(data));
- resFile.Free
+ CreateDir(GameDir+'/maps/downloads');
except
except
- Result := '';
end;
end;
-end;
-function g_Res_DownloadWAD(const FileName: string): string;
-var
- msgStream: TMemoryStream;
- resStream: TStream;
- mapData: TMapDataMsg;
- i: Integer;
- resData: TResDataMsg;
-begin
- SetLength(mapData.ExternalResources, 0);
- g_Console_Add(Format(_lc[I_NET_MAP_DL], [FileName]));
- e_WriteLog('Downloading map `' + FileName + '` from server', TMsgType.Notify);
- g_Game_SetLoadingText(FileName + '...', 0, False);
- MC_SEND_MapRequest();
-
- msgStream := g_Net_Wait_Event(NET_MSG_MAP_RESPONSE);
- if msgStream <> nil then
- begin
- mapData := MapDataFromMsgStream(msgStream);
- msgStream.Free;
+ try
+ CreateDir(GameDir+'/wads/downloads');
+ except
end;
end;
- for i := 0 to High(mapData.ExternalResources) do
- begin
- if not CheckFileHash(GameDir + '/wads/',
- mapData.ExternalResources[i].Name,
- mapData.ExternalResources[i].md5) then
+ resList := TStringList.Create();
+
+ try
+ g_Console_Add(Format(_lc[I_NET_MAP_DL], [FileName]));
+ e_WriteLog('Downloading map `' + FileName + '` from server', TMsgType.Notify);
+ g_Game_SetLoadingText(FileName + '...', 0, False);
+ //MC_SEND_MapRequest();
+ if (not g_Net_SendMapRequest()) then exit;
+
+ FileName := ExtractFileName(FileName);
+ if (length(FileName) = 0) then FileName := 'fucked_map_wad.wad';
+ res := g_Net_Wait_MapInfo(tf, resList);
+ if (res <> 0) then exit;
+
+ // find or download a map
+ result := g_Res_SearchResWad(true{asMap}, tf.diskName, mapHash);
+ if (length(result) = 0) then
begin
begin
- g_Console_Add(Format(_lc[I_NET_WAD_DL],
- [mapData.ExternalResources[i].Name]));
- e_WriteLog('Downloading Wad `' + mapData.ExternalResources[i].Name +
- '` from server', TMsgType.Notify);
- g_Game_SetLoadingText(mapData.ExternalResources[i].Name + '...', 0, False);
- MC_SEND_ResRequest(mapData.ExternalResources[i].Name);
-
- msgStream := g_Net_Wait_Event(NET_MSG_RES_RESPONSE);
- resData := ResDataFromMsgStream(msgStream);
-
- resStream := createDiskFile(GameDir+'/wads/'+mapData.ExternalResources[i].Name);
- resStream.WriteBuffer(resData.FileData[0], resData.FileSize);
-
- resData.FileData := nil;
- resStream.Free;
- msgStream.Free;
+ // download map
+ res := g_Net_RequestResFileInfo(-1{map}, tf);
+ if (res <> 0) then
+ begin
+ e_LogWriteln('error requesting map wad');
+ result := '';
+ exit;
+ end;
+ fname := GameDir+'/maps/downloads/'+FileName;
+ try
+ strm := createDiskFile(fname);
+ except
+ e_WriteLog('cannot create map file `'+FileName+'`', TMsgType.Fatal);
+ result := '';
+ exit;
+ end;
+ tf.diskName := fname;
+ try
+ res := g_Net_ReceiveResourceFile(-1{map}, tf, strm);
+ except
+ e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
+ strm.Free;
+ result := '';
+ exit;
+ end;
+ strm.Free;
+ if (res <> 0) then
+ begin
+ e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
+ result := '';
+ exit;
+ end;
+ result := fname;
end;
end;
- end;
- Result := SaveWAD(MapsDir, ExtractFileName(FileName), mapData.FileData);
+ // download resources
+ for f := 0 to resList.Count-1 do
+ begin
+ res := g_Net_RequestResFileInfo(f, tf);
+ if (res <> 0) then begin result := ''; exit; end;
+ wadname := g_Res_SearchResWad(false{asMap}, tf.diskName, tf.hash);
+ if (length(wadname) <> 0) then
+ begin
+ // already here
+ g_Net_AbortResTransfer(tf);
+ g_Res_PutReplacementWad(tf.diskName, wadname);
+ end
+ else
+ begin
+ fname := GameDir+'/wads/downloads/'+tf.diskName;
+ e_LogWritefln('downloading resource `%s` to `%s`...', [tf.diskName, fname]);
+ try
+ strm := createDiskFile(fname);
+ except
+ e_WriteLog('cannot create resource file `'+fname+'`', TMsgType.Fatal);
+ result := '';
+ exit;
+ end;
+ try
+ res := g_Net_ReceiveResourceFile(f, tf, strm);
+ except
+ e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
+ strm.Free;
+ result := '';
+ exit;
+ end;
+ strm.Free;
+ if (res <> 0) then
+ begin
+ e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
+ result := '';
+ exit;
+ end;
+ g_Res_PutReplacementWad(tf.diskName, fname);
+ end;
+ end;
+ finally
+ resList.Free;
+ end;
end;
end;
+
end.
end.