X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_res_downloader.pas;h=d67dc4c52db84c01abb20d58eb8f3ccae120908b;hb=4d7452d2a7340e4c245f5de3eec3c4d4a7e98fe2;hp=a092437993d1601f774deb9235ff1ac037916e7d;hpb=8f5d5b700022732e21511affb218f8179344c90e;p=d2df-sdl.git

diff --git a/src/game/g_res_downloader.pas b/src/game/g_res_downloader.pas
index a092437..d67dc4c 100644
--- a/src/game/g_res_downloader.pas
+++ b/src/game/g_res_downloader.pas
@@ -19,300 +19,362 @@ interface
 
 uses sysutils, Classes, md5, g_net, g_netmsg, g_console, g_main, e_log;
 
-function g_Res_SearchSameWAD(const path, filename: AnsiString; const resMd5: TMD5Digest): AnsiString;
-function g_Res_SearchResWad (asMap: Boolean; const resMd5: TMD5Digest): AnsiString;
 
 // download map wad from server (if necessary)
 // download all required map resource wads too
+// registers all required replacement wads
 // 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);
 
+// call this somewhere in startup sequence
+procedure g_Res_CreateDatabases (allowRescan: Boolean=false);
 
-implementation
-
-uses g_language, sfs, utils, wadreader, g_game, hashtable;
 
-const DOWNLOAD_DIR = 'downloads';
+implementation
 
-type
-  TFileInfo = record
-    diskName: AnsiString; // lowercased
-    baseName: AnsiString; // lowercased
-    md5: TMD5Digest;
-    md5valid: Boolean;
-    nextBaseNameIndex: Integer;
-  end;
+uses g_language, sfs, utils, wadreader, g_game, hashtable, fhashdb;
 
 var
-  knownFiles: array of TFileInfo;
-  knownHash: THashStrInt = nil; // key: base name; value: index
-  scannedDirs: THashStrInt = nil; // key: lowercased dir name
+  // 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
 
 
-function findKnownFile (diskName: AnsiString): Integer;
+//==========================================================================
+//
+//  saveDatabases
+//
+//==========================================================================
+procedure saveDatabases (saveMap, saveRes: Boolean);
 var
-  idx: Integer;
-  baseName: AnsiString;
+  err: Boolean;
+  st: TStream;
 begin
-  result := -1;
-  if not assigned(knownHash) then exit;
-  if (length(diskName) = 0) then exit;
-  baseName := toLowerCase1251(ExtractFileName(diskName));
-  if (not knownHash.get(baseName, idx)) then exit;
-  if (idx < 0) or (idx >= length(knownFiles)) then raise Exception.Create('wutafuck?');
-  while (idx >= 0) do
+  if (not saveDBsToDiskEnabled) or (not g_res_save_databases) then exit;
+  // rescan dirs
+  // save map database
+  if (saveMap) then
   begin
-    if (strEquCI1251(knownFiles[idx].diskName, diskName)) then begin result := idx; exit; end; // i found her!
-    idx := knownFiles[idx].nextBaseNameIndex;
+    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;
 
 
-function addKnownFile (diskName: AnsiString): Integer;
+//==========================================================================
+//
+//  g_Res_CreateDatabases
+//
+//==========================================================================
+procedure g_Res_CreateDatabases (allowRescan: Boolean=false);
 var
-  idx: Integer;
-  lastIdx: Integer = -1;
-  baseName: AnsiString;
-  fi: ^TFileInfo;
+  st: TStream;
+  upmap: Boolean;
+  upres: Boolean;
+  forcesave: Boolean;
 begin
-  result := -1;
-  if not assigned(knownHash) then knownHash := THashStrInt.Create();
-  if (length(diskName) = 0) then exit;
-  baseName := toLowerCase1251(ExtractFileName(diskName));
-  if (length(baseName) = 0) then exit;
-  // check if we already have this file
-  if (knownHash.get(baseName, idx)) then
+  if not assigned(knownMaps) then
   begin
-    if (idx < 0) or (idx >= length(knownFiles)) then raise Exception.Create('wutafuck?');
-    while (idx >= 0) do
-    begin
-      if (strEquCI1251(knownFiles[idx].diskName, diskName)) then
-      begin
-        // already here
-        result := idx;
-        exit;
-      end;
-      lastIdx := idx;
-      idx := knownFiles[idx].nextBaseNameIndex;
+    // create and load a know map database, if necessary
+    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;
-  end;
-  // this file is not there, append it
-  idx := length(knownFiles);
-  result := idx;
-  SetLength(knownFiles, idx+1); // sorry
-  fi := @knownFiles[idx];
-  fi.diskName := diskName;
-  fi.baseName := baseName;
-  fi.md5valid := false;
-  fi.nextBaseNameIndex := -1;
-  if (lastIdx < 0) then
-  begin
-    // totally new one
-    knownHash.put(baseName, idx);
+    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;
+    forcesave := true;
   end
   else
   begin
-    knownFiles[lastIdx].nextBaseNameIndex := idx;
+    if (not allowRescan) then exit;
+    forcesave := false;
   end;
+  // rescan dirs
+  e_LogWriteln('refreshing map database');
+  upmap := knownMaps.scanFiles();
+  e_LogWriteln('refreshing resource database');
+  upres := knownRes.scanFiles();
+  // save databases
+  if (forcesave) then begin upmap := true; upres := true; end;
+  if upmap or upres then saveDatabases(upmap, upres);
 end;
 
 
-function getKnownFileWithMD5 (diskDir: AnsiString; baseName: AnsiString; const md5: TMD5Digest): AnsiString;
+//==========================================================================
+//
+//  getWord
+//
+//  get next word from a string
+//  words are delimited with ';'
+//  ignores leading and trailing spaces
+//  returns empty string if there are no more words
+//
+//==========================================================================
+function getWord (var list: AnsiString): AnsiString;
 var
-  idx: Integer;
+  pos: Integer;
 begin
   result := '';
-  if not assigned(knownHash) then exit;
-  if (not knownHash.get(toLowerCase1251(baseName), idx)) then exit;
-  if (idx < 0) or (idx >= length(knownFiles)) then raise Exception.Create('wutafuck?');
-  while (idx >= 0) do
+  while (length(list) > 0) do
   begin
-    if (strEquCI1251(knownFiles[idx].diskName, IncludeTrailingPathDelimiter(diskDir)+baseName)) then
-    begin
-      if (not knownFiles[idx].md5valid) then
-      begin
-        knownFiles[idx].md5 := MD5File(knownFiles[idx].diskName);
-        knownFiles[idx].md5valid := true;
-      end;
-      if (MD5Match(knownFiles[idx].md5, md5)) then
-      begin
-        result := knownFiles[idx].diskName;
-        exit;
-      end;
-    end;
-    idx := knownFiles[idx].nextBaseNameIndex;
+    if (ord(list[1]) <= 32) or (list[1] = ';') or (list[1] = ':') then begin Delete(list, 1, 1); continue; end;
+    pos := 1;
+    while (pos <= length(list)) and (list[pos] <> ';') and (list[pos] <> ':') do Inc(pos);
+    result := Copy(list, 1, pos-1);
+    Delete(list, 1, pos);
+    while (length(result) > 0) and (ord(result[length(result)]) <= 32) do Delete(result, length(result), 1);
+    if (length(result) > 0) then exit;
   end;
 end;
 
 
-// call this before downloading a new map from a server
-procedure g_Res_ClearReplacementWads ();
+//==========================================================================
+//
+//  isIgnoredResWad
+//
+//  checks if the given resource wad can be ignored
+//
+//  FIXME: preparse name list?
+//
+//==========================================================================
+function isIgnoredResWad (fname: AnsiString): Boolean;
+var
+  list: AnsiString;
+  name: AnsiString;
 begin
-  if assigned(replacements) then replacements.clear();
-  e_LogWriteln('cleared replacement wads');
+  result := false;
+  if (not g_res_ignore_enabled) then exit;
+  fname := forceFilenameExt(ExtractFileName(fname), '');
+  list := g_res_ignore_names;
+  name := getWord(list);
+  while (length(name) > 0) do
+  begin
+    name := forceFilenameExt(name, '');
+    //writeln('*** name=[', name, ']; fname=[', fname, ']');
+    if (StrEquCI1251(name, fname)) then begin result := true; exit; end;
+    name := getWord(list);
+  end;
 end;
 
 
-// returns original name, or replacement name
-function g_Res_FindReplacementWad (oldname: AnsiString): AnsiString;
-var
-  fn: AnsiString;
+//==========================================================================
+//
+//  clearReplacementWads
+//
+//  call this before downloading a new map from a server
+//
+//==========================================================================
+procedure clearReplacementWads ();
 begin
-  result := oldname;
-  if not assigned(replacements) then exit;
-  if (replacements.get(toLowerCase1251(ExtractFileName(oldname)), fn)) then result := fn;
+  if assigned(replacements) then replacements.clear();
+  e_LogWriteln('cleared replacement wads');
 end;
 
 
-procedure g_Res_PutReplacementWad (oldname: AnsiString; newDiskName: AnsiString);
+//==========================================================================
+//
+//  addReplacementWad
+//
+//  register new replacement wad
+//
+//==========================================================================
+procedure addReplacementWad (oldname: AnsiString; newDiskName: AnsiString);
 begin
   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;
 
 
-procedure scanDir (const dirName: AnsiString; calcMD5: Boolean);
+//==========================================================================
+//
+//  g_Res_FindReplacementWad
+//
+//  returns original name, or replacement name
+//
+//==========================================================================
+function g_Res_FindReplacementWad (oldname: AnsiString): AnsiString;
 var
-  searchResult: TSearchRec;
-  dfn: AnsiString;
-  idx: Integer;
+  fn: AnsiString;
 begin
-  if not assigned(scannedDirs) then scannedDirs := THashStrInt.Create();
-  dfn := toLowerCase1251(IncludeTrailingPathDelimiter(dirName));
-  if scannedDirs.has(dfn) then exit;
-  scannedDirs.put(dfn, 42);
-
-  if (FindFirst(dirName+'/*', faAnyFile, searchResult) <> 0) then exit;
-  try
-    repeat
-      if (searchResult.Attr and faDirectory) = 0 then
-      begin
-        dfn := dirName+'/'+searchResult.Name;
-        idx := addKnownFile(dfn);
-        if (calcMD5) and (idx >= 0) then
-        begin
-          if (not knownFiles[idx].md5valid) then
-          begin
-            knownFiles[idx].md5 := MD5File(knownFiles[idx].diskName);
-            knownFiles[idx].md5valid := true;
-          end;
-        end;
-      end
-      else if (searchResult.Name <> '.') and (searchResult.Name <> '..') then
-      begin
-        scanDir(IncludeTrailingPathDelimiter(dirName)+searchResult.Name, calcMD5);
-      end;
-    until (FindNext(searchResult) <> 0);
-  finally
-    FindClose(searchResult);
+  //e_LogWritefln('LOOKING for replacement wad for [%s]...', [oldname], TMsgType.Notify);
+  result := oldname;
+  if not assigned(replacements) then exit;
+  if (replacements.get(toLowerCase1251(ExtractFileName(oldname)), fn)) then
+  begin
+    //e_LogWritefln('found replacement wad for [%s] -> [%s]', [oldname, fn], TMsgType.Notify);
+    result := fn;
   end;
 end;
 
 
-function CompareFileHash(const filename: AnsiString; const resMd5: TMD5Digest): Boolean;
-var
-  gResHash: TMD5Digest;
-  fname: AnsiString;
+//==========================================================================
+//
+//  findExistingMapWadWithHash
+//
+//  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;
 begin
-  fname := findDiskWad(filename);
-  if length(fname) = 0 then begin result := false; exit; end;
-  gResHash := MD5File(fname);
-  Result := MD5Match(gResHash, resMd5);
-end;
-
-function CheckFileHash(const path, filename: AnsiString; const resMd5: TMD5Digest): Boolean;
-var
-  fname: AnsiString;
-begin
-  fname := findDiskWad(path+filename);
-  if length(fname) = 0 then begin result := false; exit; end;
-  Result := FileExists(fname) and CompareFileHash(fname, resMd5);
+  //result := scanDir(GameDir+'/maps', ExtractFileName(fname), resMd5);
+  result := knownMaps.findByHash(resMd5);
+  if (length(result) > 0) then
+  begin
+    result := GameDir+'/maps/'+result;
+    if not FileExists(result) then
+    begin
+      if (knownMaps.scanFiles()) then saveDatabases(true, false);
+      result := '';
+    end;
+  end;
 end;
 
 
-function g_Res_SearchResWad (asMap: Boolean; const resMd5: TMD5Digest): AnsiString;
-var
-  f: Integer;
+//==========================================================================
+//
+//  findExistingResWadWithHash
+//
+//  find map or resource wad using its base name and hash
+//
+//  returns found wad disk name, or empty string
+//
+//==========================================================================
+function findExistingResWadWithHash (fname: AnsiString; const resMd5: TMD5Digest): AnsiString;
 begin
-  result := '';
-  //if not assigned(scannedDirs) then scannedDirs := THashStrInt.Create();
-  if (asMap) then
-  begin
-    scanDir(GameDir+'/maps/downloads', true);
-  end
-  else
+  //result := scanDir(GameDir+'/wads', ExtractFileName(fname), resMd5);
+  result := knownRes.findByHash(resMd5);
+  if (length(result) > 0) then
   begin
-    scanDir(GameDir+'/wads/downloads', true);
-  end;
-  for f := Low(knownFiles) to High(knownFiles) do
-  begin
-    if (not knownFiles[f].md5valid) then continue;
-    if (MD5Match(knownFiles[f].md5, resMd5)) then
+    result := GameDir+'/wads/'+result;
+    if not FileExists(result) then
     begin
-      result := knownFiles[f].diskName;
-      exit;
+      if (knownRes.scanFiles()) then saveDatabases(false, true);
+      result := '';
     end;
   end;
-  //resStream := createDiskFile(GameDir+'/wads/'+mapData.ExternalResources[i].Name);
 end;
 
 
-function g_Res_SearchSameWAD (const path, filename: AnsiString; const resMd5: TMD5Digest): AnsiString;
+//==========================================================================
+//
+//  generateFileName
+//
+//  generate new file name based on the given one and the hash
+//  you can pass files with pathes here too
+//
+//==========================================================================
+function generateFileName (fname: AnsiString; const hash: TMD5Digest): AnsiString;
+var
+  mds: AnsiString;
+  path: AnsiString;
+  base: AnsiString;
+  ext: AnsiString;
 begin
-  scanDir(path, false);
-  result := getKnownFileWithMD5(path, filename, 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;
 
 
+//==========================================================================
+//
+//  g_Res_DownloadMapWAD
+//
+//  download map wad from server (if necessary)
+//  download all required map resource wads too
+//  registers all required replacement wads
+//
+//  returns name of the map wad (relative to mapdir), or empty string on error
+//
+//==========================================================================
 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;
-  mmd5: TMD5Digest;
   fname: AnsiString;
-  idx: Integer;
   wadname: AnsiString;
+  md5: TMD5Digest;
+  mapdbUpdated: Boolean = false;
+  resdbUpdated: Boolean = false;
+  transStarted: Boolean;
 begin
-  //SetLength(mapData.ExternalResources, 0);
-  //result := g_Res_SearchResWad(true{asMap}, mapHash);
   result := '';
-  g_Res_ClearReplacementWads();
-
-  try
-    CreateDir(GameDir+'/maps/downloads');
-  except
-  end;
-
-  try
-    CreateDir(GameDir+'/wads/downloads');
-  except
-  end;
-
-  resList := TStringList.Create();
+  clearReplacementWads();
+  g_Res_CreateDatabases();
 
   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);
-    //MC_SEND_MapRequest();
-    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;
 
     // find or download a map
-    result := g_Res_SearchResWad(true{asMap}, mapHash);
+    result := findExistingMapWadWithHash(tf.diskName, mapHash);
     if (length(result) = 0) then
     begin
       // download map
@@ -323,18 +385,24 @@ begin
         result := '';
         exit;
       end;
-      fname := GameDir+'/maps/downloads/'+FileName;
       try
-        strm := createDiskFile(fname);
+        CreateDir(GameDir+'/maps/downloads');
+      except
+      end;
+      fname := GameDir+'/maps/downloads/'+generateFileName(FileName, mapHash);
+      tf.diskName := fname;
+      e_LogWritefln('map disk file for `%s` is `%s`', [FileName, fname], TMsgType.Fatal);
+      try
+        strm := openDiskFileRW(fname);
       except
-        e_WriteLog('cannot create map file `'+FileName+'`', TMsgType.Fatal);
+        e_WriteLog('cannot create map file `'+fname+'`', TMsgType.Fatal);
         result := '';
         exit;
       end;
       try
         res := g_Net_ReceiveResourceFile(-1{map}, tf, strm);
       except
-        e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
+        e_WriteLog('error downloading map file (exception) `'+FileName+'`', TMsgType.Fatal);
         strm.Free;
         result := '';
         exit;
@@ -342,46 +410,95 @@ begin
       strm.Free;
       if (res <> 0) then
       begin
-        e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
-        result := '';
-        exit;
-      end;
-      mmd5 := MD5File(fname);
-      if (not MD5Match(mmd5, mapHash)) then
-      begin
-        e_WriteLog('error downloading map file `'+FileName+'` (bad hash)', TMsgType.Fatal);
+        e_LogWritefln('error downloading map `%s` (res=%d)', [FileName, res], TMsgType.Fatal);
         result := '';
         exit;
       end;
-      idx := addKnownFile(fname);
-      if (idx < 0) then
+      // if it was resumed, check md5 and initiate full download if necessary
+      if tf.resumed then
       begin
-        e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
-        result := '';
-        exit;
+        md5 := MD5File(fname);
+        // sorry for pasta, i am asshole
+        if not MD5Match(md5, tf.hash) then
+        begin
+          e_LogWritefln('resuming failed; downloading map `%s` from scratch...', [fname]);
+          try
+            DeleteFile(fname);
+            strm := createDiskFile(fname);
+          except
+            e_WriteLog('cannot create map file `'+fname+'` (exception)', TMsgType.Fatal);
+            result := '';
+            exit;
+          end;
+          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_LogWritefln('error downloading map `%s` (res=%d)', [FileName, res], TMsgType.Fatal);
+            result := '';
+            exit;
+          end;
+        end;
       end;
-      knownFiles[idx].md5 := mmd5;
-      knownFiles[idx].md5valid := true;
+      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;
-      wadname := g_Res_SearchResWad(false{asMap}, tf.hash);
+      // 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
+        if (transStarted) then g_Net_AbortResTransfer(tf);
+        e_LogWritefln('ignoring wad resource `%s` by user request', [tf.diskName]);
+        continue;
+      end;
+      wadname := findExistingResWadWithHash(tf.diskName, tf.hash);
       if (length(wadname) <> 0) then
       begin
         // already here
-        g_Net_AbortResTransfer(tf);
-        g_Res_PutReplacementWad(tf.diskName, wadname);
+        if (transStarted) then g_Net_AbortResTransfer(tf);
+        addReplacementWad(tf.diskName, wadname);
       end
       else
       begin
-        fname := GameDir+'/wads/downloads/'+tf.diskName;
+        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/'+generateFileName(tf.diskName, tf.hash);
+        e_LogWritefln('downloading resource `%s` to `%s`...', [tf.diskName, fname]);
         try
-          strm := createDiskFile(fname);
+          strm := openDiskFileRW(fname);
         except
           e_WriteLog('cannot create resource file `'+fname+'`', TMsgType.Fatal);
           result := '';
@@ -402,22 +519,54 @@ begin
           result := '';
           exit;
         end;
-        idx := addKnownFile(fname);
-        if (idx < 0) then
+        // if it was resumed, check md5 and initiate full download if necessary
+        if tf.resumed then
         begin
-          e_WriteLog('error downloading map file `'+FileName+'`', TMsgType.Fatal);
-          result := '';
-          exit;
+          md5 := MD5File(fname);
+          // sorry for pasta, i am asshole
+          if not MD5Match(md5, tf.hash) then
+          begin
+            e_LogWritefln('resuming failed; downloading resource `%s` to `%s` from scratch...', [tf.diskName, fname]);
+            try
+              DeleteFile(fname);
+              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;
+          end;
         end;
-        knownFiles[idx].md5 := tf.hash;
-        knownFiles[idx].md5valid := true;
-        g_Res_PutReplacementWad(tf.diskName, fname);
+        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.