index fd2d90b9d4d541c4275dc644a211c0e15b6f4c35..438cd58357c6a1a0ecde23a83ffe62f4cc12c2ed 100644 (file)
@@ -29,17 +29,109 @@ function g_Res_DownloadMapWAD (FileName: AnsiString; const mapHash: TMD5Digest):
// returns original name, or replacement name
function g_Res_FindReplacementWad (oldname: AnsiString): AnsiString;
+// call this somewhere in startup sequence
+procedure g_Res_CreateDatabases ();
+
implementation
-uses g_language, sfs, utils, wadreader, g_game, hashtable;
+uses g_language, sfs, utils, wadreader, g_game, hashtable, fhashdb;
var
// cvars
g_res_ignore_names: AnsiString = 'standart;shrshade';
g_res_ignore_enabled: Boolean = true;
+ g_res_save_databases: Boolean = true;
// other vars
replacements: THashStrStr = nil;
+ knownMaps: TFileHashDB = nil;
+ knownRes: TFileHashDB = nil;
+ saveDBsToDiskEnabled: Boolean = false; // this will be set to `true` if initial database saving succeed
+
+
+//==========================================================================
+//
+// saveDatabases
+//
+//==========================================================================
+procedure saveDatabases (saveMap, saveRes: Boolean);
+var
+ err: Boolean;
+ st: TStream;
+begin
+ if (not saveDBsToDiskEnabled) or (not g_res_save_databases) then exit;
+ // rescan dirs
+ // save map database
+ if (saveMap) then
+ begin
+ err := true;
+ st := nil;
+ try
+ st := createDiskFile(GameDir+'/data/maphash.db');
+ knownMaps.saveTo(st);
+ err := false;
+ except
+ end;
+ st.Free;
+ if (err) then begin saveDBsToDiskEnabled := false; e_LogWriteln('cannot write map database, disk refresh disabled'); exit; end;
+ end;
+ // save resource database
+ if (saveRes) then
+ begin
+ err := true;
+ st := nil;
+ try
+ st := createDiskFile(GameDir+'/data/reshash.db');
+ knownRes.saveTo(st);
+ err := false;
+ except
+ end;
+ st.Free;
+ if (err) then begin saveDBsToDiskEnabled := false; e_LogWriteln('cannot write resource database, disk refresh disabled'); exit; end;
+ end;
+end;
+
+
+//==========================================================================
+//
+// g_Res_CreateDatabases
+//
+//==========================================================================
+procedure g_Res_CreateDatabases ();
+var
+ st: TStream;
+begin
+ // create and load a know map database, if necessary
+ knownMaps.Free;
+ knownMaps := TFileHashDB.Create(GameDir+'/maps/');
+ knownRes := TFileHashDB.Create(GameDir+'/wads/');
+ saveDBsToDiskEnabled := true;
+ // load map database
+ st := nil;
+ try
+ st := openDiskFileRO(GameDir+'/data/maphash.db');
+ knownMaps.loadFrom(st);
+ e_LogWriteln('loaded map database');
+ except
+ end;
+ st.Free;
+ // load resource database
+ st := nil;
+ try
+ st := openDiskFileRO(GameDir+'/data/reshash.db');
+ knownRes.loadFrom(st);
+ e_LogWriteln('loaded resource database');
+ except
+ end;
+ st.Free;
+ // rescan dirs
+ e_LogWriteln('refreshing map database');
+ knownMaps.scanFiles();
+ e_LogWriteln('refreshing resource database');
+ knownRes.scanFiles();
+ // save databases
+ saveDatabases(true, true);
+end;
//==========================================================================
//==========================================================================
//
-// scanDir
+// findExistingMapWadWithHash
//
-// look for a wad to match the hash
-// scans subdirs, ignores known wad extensions
+// find map or resource wad using its base name and hash
//
// returns found wad disk name, or empty string
//
//==========================================================================
-function scanDir (dirName: AnsiString; baseName: AnsiString; const resMd5: TMD5Digest): AnsiString;
-var
- searchResult: TSearchRec;
- dfn: AnsiString;
- md5: TMD5Digest;
- dirs: array of AnsiString;
- f: Integer;
+function findExistingMapWadWithHash (fname: AnsiString; const resMd5: TMD5Digest): AnsiString;
begin
- result := '';
- SetLength(dirs, 0);
- if (length(baseName) = 0) then exit;
- dirName := IncludeTrailingPathDelimiter(dirName);
- e_LogWritefln('scanning dir `%s` for file `%s`...', [dirName, baseName]);
-
- // 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
+ //result := scanDir(GameDir+'/maps', ExtractFileName(fname), resMd5);
+ result := knownMaps.findByHash(resMd5);
+ if (length(result) > 0) then
begin
- dfn := dirs[f];
- result := scanDir(dfn, baseName, resMd5);
- if (length(result) <> 0) then begin SetLength(dirs, 0); exit; end;
+ result := GameDir+'/maps/'+result;
+ if not FileExists(result) then
+ begin
+ if (knownMaps.scanFiles()) then saveDatabases(true, false);
+ result := '';
+ end;
end;
- SetLength(dirs, 0);
end;
//==========================================================================
//
-// findExistingMapWadWithHash
+// findExistingResWadWithHash
//
// find map or resource wad using its base name and hash
//
// returns found wad disk name, or empty string
//
//==========================================================================
-function findExistingMapWadWithHash (fname: AnsiString; const resMd5: TMD5Digest): AnsiString;
+function findExistingResWadWithHash (fname: AnsiString; const resMd5: TMD5Digest): AnsiString;
begin
- result := scanDir(GameDir+'/maps', ExtractFileName(fname), resMd5);
+ //result := scanDir(GameDir+'/wads', ExtractFileName(fname), resMd5);
+ result := knownRes.findByHash(resMd5);
+ if (length(result) > 0) then
+ begin
+ result := GameDir+'/wads/'+result;
+ if not FileExists(result) then
+ begin
+ if (knownRes.scanFiles()) then saveDatabases(false, true);
+ result := '';
+ end;
+ end;
end;
//==========================================================================
//
-// findExistingResWadWithHash
-//
-// find map or resource wad using its base name and hash
+// generateFileName
//
-// returns found wad disk name, or empty string
+// generate new file name based on the given one and the hash
+// you can pass files with pathes here too
//
//==========================================================================
-function findExistingResWadWithHash (fname: AnsiString; const resMd5: TMD5Digest): AnsiString;
+function generateFileName (fname: AnsiString; const hash: TMD5Digest): AnsiString;
+var
+ mds: AnsiString;
+ path: AnsiString;
+ base: AnsiString;
+ ext: AnsiString;
begin
- result := scanDir(GameDir+'/wads', ExtractFileName(fname), resMd5);
+ mds := MD5Print(hash);
+ if (length(mds) > 16) then mds := Copy(mds, 1, 16);
+ mds := '_'+mds;
+ if (length(fname) = 0) then begin result := mds; exit; end;
+ path := ExtractFilePath(fname);
+ base := ExtractFileName(fname);
+ ext := getFilenameExt(base);
+ base := forceFilenameExt(base, '');
+ if (length(path) > 0) then result := IncludeTrailingPathDelimiter(path) else result := '';
+ result := result+base+mds+ext;
end;
function g_Res_DownloadMapWAD (FileName: AnsiString; const mapHash: TMD5Digest): AnsiString;
var
tf: TNetFileTransfer;
- resList: TStringList;
+ resList: array of TNetMapResourceInfo = nil;
f, res: Integer;
strm: TStream;
fname: AnsiString;
wadname: AnsiString;
md5: TMD5Digest;
+ mapdbUpdated: Boolean = false;
+ resdbUpdated: Boolean = false;
+ transStarted: Boolean;
begin
result := '';
clearReplacementWads();
- resList := TStringList.Create();
-
try
g_Res_received_map_start := 1;
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);
- if (not g_Net_SendMapRequest()) then exit;
FileName := ExtractFileName(FileName);
if (length(FileName) = 0) then FileName := 'fucked_map_wad.wad';
+
+ // this also sends map request
res := g_Net_Wait_MapInfo(tf, resList);
if (res <> 0) then exit;
CreateDir(GameDir+'/maps/downloads');
except
end;
- fname := GameDir+'/maps/downloads/'+FileName;
+ fname := GameDir+'/maps/downloads/'+generateFileName(FileName, mapHash);
+ tf.diskName := fname;
try
strm := openDiskFileRW(fname);
except
result := '';
exit;
end;
- tf.diskName := fname;
try
res := g_Net_ReceiveResourceFile(-1{map}, tf, strm);
except
end;
end;
end;
+ if (knownMaps.addWithHash(fname, mapHash)) then mapdbUpdated := true;
result := fname;
end;
// download resources
- for f := 0 to resList.Count-1 do
+ for f := 0 to High(resList) do
begin
- res := g_Net_RequestResFileInfo(f, tf);
- if (res <> 0) then begin result := ''; exit; end;
+ // if we got a new-style reslist packet, use received data to check for resource files
+ if (resList[f].size < 0) then
+ begin
+ // old-style packet
+ transStarted := true;
+ res := g_Net_RequestResFileInfo(f, tf);
+ if (res <> 0) then begin result := ''; exit; end;
+ end
+ else
+ begin
+ // new-style packet
+ transStarted := false;
+ tf.diskName := resList[f].wadName;
+ tf.hash := resList[f].hash;
+ tf.size := resList[f].size;
+ end;
if (isIgnoredResWad(tf.diskName)) then
begin
// ignored file, abort download
- g_Net_AbortResTransfer(tf);
+ if (transStarted) then g_Net_AbortResTransfer(tf);
e_LogWritefln('ignoring wad resource `%s` by user request', [tf.diskName]);
continue;
end;
if (length(wadname) <> 0) then
begin
// already here
- g_Net_AbortResTransfer(tf);
+ if (transStarted) then g_Net_AbortResTransfer(tf);
addReplacementWad(tf.diskName, wadname);
end
else
begin
+ if (not transStarted) then
+ begin
+ res := g_Net_RequestResFileInfo(f, tf);
+ if (res <> 0) then begin result := ''; exit; end;
+ end;
try
CreateDir(GameDir+'/wads/downloads');
except
end;
- fname := GameDir+'/wads/downloads/'+tf.diskName;
+ fname := GameDir+'/wads/downloads/'+generateFileName(tf.diskName, tf.hash);
e_LogWritefln('downloading resource `%s` to `%s`...', [tf.diskName, fname]);
try
strm := openDiskFileRW(fname);
end;
end;
addReplacementWad(tf.diskName, fname);
+ if (knownRes.addWithHash(fname, tf.hash)) then resdbUpdated := true;
end;
end;
finally
- resList.Free;
+ SetLength(resList, 0);
g_Res_received_map_start := 0;
end;
+
+ if saveDBsToDiskEnabled and (mapdbUpdated or resdbUpdated) then saveDatabases(mapdbUpdated, resdbUpdated);
end;
initialization
conRegVar('rdl_ignore_names', @g_res_ignore_names, 'list of resource wad names (without extensions) to ignore in dl hash checks', 'dl ignore wads');
conRegVar('rdl_ignore_enabled', @g_res_ignore_enabled, 'enable dl hash check ignore list', 'dl hash check ignore list active');
+ conRegVar('rdl_hashdb_save_enabled', @g_res_save_databases, 'enable saving map/resource hash databases to disk', 'controls storing hash databases to disk');
end.