Skip to content

Commit cc5f370

Browse files
Fix for downloaded RetroAchievements content (#127)
1 parent 3d35e96 commit cc5f370

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

hasheous/Classes/Metadata/RetroAchievements/MetadataDownload.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,12 @@ public void Download()
181181
if (datFile.allowOverwrite == true)
182182
{
183183
// copy the DAT file to the signature ingest directory
184-
File.Copy(datFile.FileName, Path.Combine(Config.LibraryConfiguration.LibrarySignaturesDirectory, "RetroAchievements", Path.GetFileName(datFile.FileName)));
184+
string ingestPath = Path.Combine(Config.LibraryConfiguration.LibrarySignaturesDirectory, "RetroAchievements", Path.GetFileName(datFile.FileName));
185+
if (File.Exists(ingestPath))
186+
{
187+
File.Delete(ingestPath);
188+
}
189+
File.Copy(datFile.FileName, ingestPath);
185190
}
186191
}
187192

hasheous/Classes/Metadata/TheGamesDB/SQL/MetadataDownload.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ public string Download()
9494
string sqlFile = Directory.GetFiles(extractedFolder, "*.sql", SearchOption.AllDirectories).FirstOrDefault();
9595

9696
// move the sql file to the correct location
97+
if (File.Exists(LocalFileName))
98+
{
99+
File.Delete(LocalFileName);
100+
}
97101
File.Move(sqlFile, LocalFileName);
98102

99103
// reset the last modified date

hasheous/Classes/SignatureIngestors/XML.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,20 @@ public void Import(string SearchPath, string ProcessedDirectory, gaseous_signatu
448448
}
449449
}
450450

451-
File.Move(XMLFile, Path.Combine(ProcessedDirectory, Path.GetFileName(XMLFile)));
451+
string destFile = Path.Combine(ProcessedDirectory, Path.GetFileName(XMLFile));
452+
if (File.Exists(destFile))
453+
{
454+
File.Delete(destFile);
455+
}
456+
File.Move(XMLFile, destFile);
452457
if (DBFile != null)
453458
{
454-
File.Move(DBFile, Path.Combine(XMLDBProcessedDirectory, Path.GetFileName(DBFile)));
459+
string destDBFile = Path.Combine(XMLDBProcessedDirectory, Path.GetFileName(DBFile));
460+
if (File.Exists(destDBFile))
461+
{
462+
File.Delete(destDBFile);
463+
}
464+
File.Move(DBFile, destDBFile);
455465
}
456466
}
457467
catch (Exception ex)
@@ -462,7 +472,12 @@ public void Import(string SearchPath, string ProcessedDirectory, gaseous_signatu
462472
else
463473
{
464474
Logging.Log(Logging.LogType.Information, "Signature Ingest", "Rejecting already imported " + XMLType.ToString() + " file: " + XMLFile);
465-
File.Move(XMLFile, Path.Combine(ProcessedDirectory, Path.GetFileName(XMLFile)));
475+
string destFile = Path.Combine(ProcessedDirectory, Path.GetFileName(XMLFile));
476+
if (File.Exists(destFile))
477+
{
478+
File.Delete(destFile);
479+
}
480+
File.Move(XMLFile, destFile);
466481
if (DBFile != null)
467482
{
468483
File.Move(DBFile, Path.Combine(XMLDBProcessedDirectory, Path.GetFileName(DBFile)));

0 commit comments

Comments
 (0)