claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filename is a bad indicator

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-10 13:03:53 -07:00
parent f626cae2b1
commit 37253b8c91
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
DATabaseTwo/Generate.cs
View File

@@ -3,8 +3,8 @@ using System.Collections.Generic;
using Mono.Data.Sqlite; using Mono.Data.Sqlite;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Security.Cryptography;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using SabreTools.Helper; using SabreTools.Helper;
@@ -126,18 +126,18 @@ namespace SabreTools
{ {
dbc.Open(); dbc.Open();
string tquery = "SELECT DISTINCT dats.name, datsdata.value FROM dats JOIN datsdata ON dats.id=datsdata.id WHERE key='source'"; string tquery = "SELECT DISTINCT dats.sha1, datsdata.value FROM dats JOIN datsdata ON dats.id=datsdata.id WHERE key='source'";
using (SqliteCommand slc = new SqliteCommand(tquery, dbc)) using (SqliteCommand slc = new SqliteCommand(tquery, dbc))
{ {
using (SqliteDataReader sldr = slc.ExecuteReader()) using (SqliteDataReader sldr = slc.ExecuteReader())
{ {
while (sldr.Read()) while (sldr.Read())
{ {
string tempname = sldr.GetString(0); string tempsha1 = sldr.GetString(0);
string tempval = sldr.GetString(1); string tempval = sldr.GetString(1);
if (!sourcemap.ContainsKey(tempname)) if (!sourcemap.ContainsKey(tempsha1))
{ {
sourcemap.Add(tempname, tempval); sourcemap.Add(tempsha1, tempval);
} }
} }
} }
@@ -145,13 +145,20 @@ namespace SabreTools
} }
// Now read in all of the files // Now read in all of the files
SHA1 sha1 = SHA1.Create();
Dictionary<string, List<RomData>> roms = new Dictionary<string, List<RomData>>(); Dictionary<string, List<RomData>> roms = new Dictionary<string, List<RomData>>();
foreach (string file in Directory.GetFiles(path, "*", SearchOption.AllDirectories)) foreach (string file in Directory.GetFiles(path, "*", SearchOption.AllDirectories))
{ {
int tempSrcId = 0; string hash = "";
if (sourcemap.ContainsKey(file)) using (FileStream fs = File.Open(file, FileMode.Open))
{ {
Int32.TryParse(sourcemap[file], out tempSrcId); hash = BitConverter.ToString(sha1.ComputeHash(fs)).Replace("-", "");
}
int tempSrcId = 0;
if (sourcemap.ContainsKey(hash))
{
Int32.TryParse(sourcemap[hash], out tempSrcId);
} }
roms = RomManipulation.ParseDict(file, 0, tempSrcId, roms, _logger); roms = RomManipulation.ParseDict(file, 0, tempSrcId, roms, _logger);
} }