aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct path for database.

Browse Source
This commit is contained in:
Natalia Portillo
2019-01-01 05:43:32 +00:00
parent 5ea28edfbf
commit a95a1f71e0
9 changed files with 351 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/.idea.DiscImageChef/.idea/contentModel.xml generated
View File

@@ -56,7 +56,6 @@
<e p="Settings.StyleCop" t="Include" />
<e p="StyleCop.Cache" t="Include" />
<e p="bin" t="ExcludeRecursive" />
<e p="discimagechef.db" t="Include" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="net461" t="Include">
@@ -1147,7 +1146,6 @@
<e p="DiscImageChef.EntityFramework.csproj" t="IncludeRecursive" />
<e p="Program.cs" t="Include" />
<e p="bin" t="ExcludeRecursive" />
<e p="discimagechef.db" t="Include" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp2.1" t="Include">

149
DiscImageChef.Core/Statistics.cs
View File

@@ -60,13 +60,13 @@ namespace DiscImageChef.Core
/// </summary>
static bool submitStatsLock;
static DicContext ctx = new DicContext();
/// <summary>
/// Loads saved statistics from disk
/// </summary>
public static void LoadStats()
{
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
if(File.Exists(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")))
try
{
@@ -431,10 +431,12 @@ namespace DiscImageChef.Core
Version = DetectOS.GetVersion(),
Count = 1
});
ctx.Versions.Add(new Version
{
Value = CommonTypes.Interop.Version.GetVersion(), Synchronized = false, Count = 1
});
ctx.SaveChanges();
}
/// <summary>
@@ -442,6 +444,7 @@ namespace DiscImageChef.Core
/// </summary>
public static void SaveStats()
{
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.SaveChanges();
if(Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats) SubmitStats();
}
@@ -453,7 +456,8 @@ namespace DiscImageChef.Core
{
Thread submitThread = new Thread(() =>
{
lock(ctx)
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
if(ctx.Commands.Any(c => !c.Synchronized) || ctx.Filesystems.Any(c => !c.Synchronized) ||
ctx.Filters.Any(c => !c.Synchronized) || ctx.MediaFormats.Any(c => !c.Synchronized) ||
ctx.Partitions.Any(c => !c.Synchronized) || ctx.Medias.Any(c => !c.Synchronized) ||
@@ -465,8 +469,7 @@ namespace DiscImageChef.Core
if(ctx.Commands.Any(c => !c.Synchronized))
{
dto.Commands = new List<NameValueStats>();
foreach(string nvs in
ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.Commands.Add(new NameValueStats
{
name = nvs,
@@ -478,8 +481,8 @@ namespace DiscImageChef.Core
if(ctx.Filesystems.Any(c => !c.Synchronized))
{
dto.Filesystems = new List<NameValueStats>();
foreach(string nvs in
ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).Distinct()
)
dto.Filesystems.Add(new NameValueStats
{
name = nvs,
@@ -491,21 +494,18 @@ namespace DiscImageChef.Core
if(ctx.Filters.Any(c => !c.Synchronized))
{
dto.Filters = new List<NameValueStats>();
foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).Distinct()
)
foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.Filters.Add(new NameValueStats
{
name = nvs,
Value = ctx.Filters.LongCount(c => !c.Synchronized &&
c.Name == nvs)
Value = ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs)
});
}
if(ctx.MediaFormats.Any(c => !c.Synchronized))
{
dto.MediaFormats = new List<NameValueStats>();
foreach(string nvs in
ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.MediaFormats.Add(new NameValueStats
{
name = nvs,
@@ -517,8 +517,7 @@ namespace DiscImageChef.Core
if(ctx.Partitions.Any(c => !c.Synchronized))
{
dto.Partitions = new List<NameValueStats>();
foreach(string nvs in
ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
foreach(string nvs in ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).Distinct())
dto.Partitions.Add(new NameValueStats
{
name = nvs,
@@ -530,8 +529,7 @@ namespace DiscImageChef.Core
if(ctx.Versions.Any(c => !c.Synchronized))
{
dto.Versions = new List<NameValueStats>();
foreach(string nvs in
ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Value).Distinct())
foreach(string nvs in ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Value).Distinct())
dto.Versions.Add(new NameValueStats
{
name = nvs,
@@ -543,8 +541,7 @@ namespace DiscImageChef.Core
if(ctx.Medias.Any(c => !c.Synchronized))
{
dto.Medias = new List<MediaStats>();
foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type)
.Distinct())
foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type).Distinct())
{
if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
dto.Medias.Add(new MediaStats
@@ -582,8 +579,8 @@ namespace DiscImageChef.Core
if(ctx.OperatingSystems.Any(c => !c.Synchronized))
{
dto.OperatingSystems = new List<OsStats>();
foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized)
.Select(c => c.Name).Distinct())
foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized).Select(c => c.Name)
.Distinct())
{
foreach(string osVersion in
ctx.OperatingSystems.Where(c => !c.Synchronized && c.Name == osName)
@@ -618,12 +615,10 @@ namespace DiscImageChef.Core
jsonSw.Write(JsonConvert.SerializeObject(dto, Formatting.Indented,
new JsonSerializerSettings
{
NullValueHandling =
NullValueHandling.Ignore
NullValueHandling = NullValueHandling.Ignore
}));
jsonStream.Seek(0, SeekOrigin.Begin);
WebRequest request =
WebRequest.Create("http://discimagechef.claunia.com/api/uploadstatsv2");
WebRequest request = WebRequest.Create("http://discimagechef.claunia.com/api/uploadstatsv2");
((HttpWebRequest)request).UserAgent =
$"DiscImageChef {typeof(Version).Assembly.GetName().Version}";
request.Method = "POST";
@@ -646,23 +641,19 @@ namespace DiscImageChef.Core
jsonStream.Close();
if(ctx.Commands.Any(c => !c.Synchronized))
foreach(string nvs in ctx
.Commands.Where(c => !c.Synchronized).Select(c => c.Name)
foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name)
.Distinct())
{
Command existing =
ctx.Commands.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
Command existing = ctx.Commands.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
new Command {Name = nvs, Synchronized = true};
existing.Count +=
(ulong)ctx.Commands.LongCount(c => !c.Synchronized && c.Name == nvs);
existing.Count += (ulong)ctx.Commands.LongCount(c => !c.Synchronized && c.Name == nvs);
ctx.Commands.Update(existing);
ctx.Commands.RemoveRange(ctx.Commands.Where(c => !c.Synchronized && c.Name == nvs));
}
if(ctx.Filesystems.Any(c => !c.Synchronized))
foreach(string nvs in ctx
.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name)
foreach(string nvs in ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name)
.Distinct())
{
Filesystem existing =
@@ -677,23 +668,19 @@ namespace DiscImageChef.Core
}
if(ctx.Filters.Any(c => !c.Synchronized))
foreach(string nvs in ctx
.Filters.Where(c => !c.Synchronized).Select(c => c.Name)
.Distinct())
foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).Distinct()
)
{
Filter existing =
ctx.Filters.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
Filter existing = ctx.Filters.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
new Filter {Name = nvs, Synchronized = true};
existing.Count +=
(ulong)ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs);
existing.Count += (ulong)ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs);
ctx.Filters.Update(existing);
ctx.Filters.RemoveRange(ctx.Filters.Where(c => !c.Synchronized && c.Name == nvs));
}
if(ctx.MediaFormats.Any(c => !c.Synchronized))
foreach(string nvs in ctx
.MediaFormats.Where(c => !c.Synchronized).Select(c => c.Name)
foreach(string nvs in ctx.MediaFormats.Where(c => !c.Synchronized).Select(c => c.Name)
.Distinct())
{
MediaFormat existing =
@@ -708,8 +695,7 @@ namespace DiscImageChef.Core
}
if(ctx.Partitions.Any(c => !c.Synchronized))
foreach(string nvs in ctx
.Partitions.Where(c => !c.Synchronized).Select(c => c.Name)
foreach(string nvs in ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name)
.Distinct())
{
Partition existing =
@@ -719,24 +705,19 @@ namespace DiscImageChef.Core
existing.Count +=
(ulong)ctx.Partitions.LongCount(c => !c.Synchronized && c.Name == nvs);
ctx.Partitions.Update(existing);
ctx.Partitions.RemoveRange(ctx.Partitions.Where(c => !c.Synchronized &&
c.Name == nvs));
ctx.Partitions.RemoveRange(ctx.Partitions.Where(c => !c.Synchronized && c.Name == nvs));
}
if(ctx.Versions.Any(c => !c.Synchronized))
foreach(string nvs in ctx
.Versions.Where(c => !c.Synchronized).Select(c => c.Value)
foreach(string nvs in ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Value)
.Distinct())
{
Version existing =
ctx.Versions.FirstOrDefault(c => c.Synchronized && c.Value == nvs) ??
Version existing = ctx.Versions.FirstOrDefault(c => c.Synchronized && c.Value == nvs) ??
new Version {Value = nvs, Synchronized = true};
existing.Count +=
(ulong)ctx.Versions.LongCount(c => !c.Synchronized && c.Value == nvs);
existing.Count += (ulong)ctx.Versions.LongCount(c => !c.Synchronized && c.Value == nvs);
ctx.Versions.Update(existing);
ctx.Versions.RemoveRange(ctx.Versions.Where(c => !c.Synchronized &&
c.Value == nvs));
ctx.Versions.RemoveRange(ctx.Versions.Where(c => !c.Synchronized && c.Value == nvs));
}
if(ctx.Medias.Any(c => !c.Synchronized))
@@ -746,36 +727,28 @@ namespace DiscImageChef.Core
if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
{
Database.Models.Media existing =
ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media &&
c.Real) ?? new Database.Models.Media
{
Synchronized = true, Type = media, Real = true
};
ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && c.Real) ??
new Database.Models.Media {Synchronized = true, Type = media, Real = true};
existing.Count +=
(ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media &&
c.Real);
(ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && c.Real);
ctx.Medias.Update(existing);
ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized &&
c.Type == media && c.Real));
ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized && c.Type == media &&
c.Real));
}
if(!ctx.Medias.Any(c => !c.Synchronized && c.Type == media && !c.Real)) continue;
{
Database.Models.Media existing =
ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media &&
!c.Real) ?? new Database.Models.Media
{
Synchronized = true, Type = media, Real = false
};
ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && !c.Real) ??
new Database.Models.Media {Synchronized = true, Type = media, Real = false};
existing.Count +=
(ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media &&
!c.Real);
(ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && !c.Real);
ctx.Medias.Update(existing);
ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized &&
c.Type == media && !c.Real));
ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized && c.Type == media &&
!c.Real));
}
}
@@ -796,24 +769,18 @@ namespace DiscImageChef.Core
.Select(c => c.Version).Distinct())
{
OperatingSystem existing =
ctx.OperatingSystems.FirstOrDefault(c => c.Synchronized &&
c.Name == osName &&
c.Version == osVersion) ??
new OperatingSystem
{
Synchronized = true, Version = osVersion, Name = osName
};
ctx.OperatingSystems.FirstOrDefault(c => c.Synchronized && c.Name == osName &&
c.Version ==
osVersion) ??
new OperatingSystem {Synchronized = true, Version = osVersion, Name = osName};
existing.Count +=
(ulong)ctx.OperatingSystems.LongCount(c => !c.Synchronized &&
c.Name == osName &&
c.Version == osVersion);
ctx.OperatingSystems.Update(existing);
ctx.OperatingSystems.RemoveRange(ctx.OperatingSystems.Where(c =>
!c
.Synchronized &&
c.Name ==
osName &&
ctx.OperatingSystems.RemoveRange(ctx.OperatingSystems.Where(c => !c.Synchronized &&
c.Name == osName &&
c.Version ==
osVersion));
}
@@ -911,7 +878,9 @@ namespace DiscImageChef.Core
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.DeviceStats) return;
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.Commands.Add(new Command {Name = command, Synchronized = false, Count = 1});
ctx.SaveChanges();
}
/// <summary>
@@ -924,7 +893,9 @@ namespace DiscImageChef.Core
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.FilesystemStats) return;
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.Filesystems.Add(new Filesystem {Name = filesystem, Synchronized = false, Count = 1});
ctx.SaveChanges();
}
/// <summary>
@@ -937,7 +908,9 @@ namespace DiscImageChef.Core
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.PartitionStats) return;
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.Partitions.Add(new Partition {Name = partition, Synchronized = false, Count = 1});
ctx.SaveChanges();
}
/// <summary>
@@ -950,7 +923,9 @@ namespace DiscImageChef.Core
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.FilterStats) return;
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.Filters.Add(new Filter {Name = filter, Synchronized = false, Count = 1});
ctx.SaveChanges();
}
/// <summary>
@@ -963,7 +938,9 @@ namespace DiscImageChef.Core
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.MediaImageStats) return;
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.MediaFormats.Add(new MediaFormat {Name = format, Synchronized = false, Count = 1});
ctx.SaveChanges();
}
/// <summary>
@@ -979,6 +956,7 @@ namespace DiscImageChef.Core
else if(dev.IsFireWire) deviceBus = "FireWire";
else deviceBus = dev.Type.ToString();
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.SeenDevices.Add(new DeviceStat
{
Bus = deviceBus,
@@ -987,6 +965,7 @@ namespace DiscImageChef.Core
Revision = dev.Revision,
Synchronized = false
});
ctx.SaveChanges();
}
/// <summary>
@@ -998,10 +977,12 @@ namespace DiscImageChef.Core
{
if(Settings.Settings.Current.Stats == null || !Settings.Settings.Current.Stats.MediaStats) return;
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.Medias.Add(new Database.Models.Media
{
Real = real, Synchronized = false, Type = type.ToString(), Count = 1
});
ctx.SaveChanges();
}
}
}

10
DiscImageChef.Database/Context.cs
View File

@@ -37,8 +37,7 @@ namespace DiscImageChef.Database
{
public sealed class DicContext : DbContext
{
// Note: If table does not appear check that last migration has been REALLY added to the project
public DicContext()
public DicContext(DbContextOptions options) : base(options)
{
Database.Migrate();
}
@@ -57,10 +56,13 @@ namespace DiscImageChef.Database
public DbSet<UsbVendor> UsbVendors { get; set; }
public DbSet<UsbProduct> UsbProducts { get; set; }
public DbSet<CdOffset> CdOffsets { get; set; }
// Note: If table does not appear check that last migration has been REALLY added to the project
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
public static DicContext Create(string dbPath)
{
optionsBuilder.UseSqlite("Data Source=discimagechef.db");
DbContextOptionsBuilder optionsBuilder = new DbContextOptionsBuilder();
optionsBuilder.UseSqlite($"Data Source={dbPath}");
return new DicContext(optionsBuilder.Options);
}
}
}

4
DiscImageChef.Gui/Dialogs/dlgStatistics.xeto.cs
View File

@@ -41,13 +41,11 @@ namespace DiscImageChef.Gui.Dialogs
{
public class dlgStatistics : Dialog
{
DicContext ctx;
public dlgStatistics()
{
XamlReader.Load(this);
ctx = new DicContext();
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
if(ctx.Commands.Any())
{

2
DiscImageChef.Gui/Forms/frmMain.xeto.cs
View File

@@ -597,7 +597,7 @@ namespace DiscImageChef.Gui.Forms
protected void OnMenuStatistics(object sender, EventArgs e)
{
DicContext ctx = new DicContext();
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
if(!ctx.Commands.Any() && !ctx.Filesystems.Any() && !ctx.Filters.Any() && !ctx.MediaFormats.Any() &&
!ctx.Medias.Any() && !ctx.Partitions.Any() && !ctx.SeenDevices.Any())

9
DiscImageChef.Settings/Settings.cs
View File

@@ -155,6 +155,8 @@ namespace DiscImageChef.Settings
/// </summary>
public static string StatsPath { get; private set; }
public static string DbPath { get; private set; }
/// <summary>
/// Loads settings
/// </summary>
@@ -163,6 +165,7 @@ namespace DiscImageChef.Settings
Current = new DicSettings();
PlatformID ptId = DetectOS.GetRealPlatformID();
string homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
DbPath = "discimagechef.db";
try
{
@@ -180,6 +183,8 @@ namespace DiscImageChef.Settings
string dicPath = Path.Combine(appSupportPath, "DiscImageChef");
if(!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
DbPath = Path.Combine(dicPath, DbPath);
ReportsPath = Path.Combine(dicPath, "Reports");
if(!Directory.Exists(ReportsPath)) Directory.CreateDirectory(ReportsPath);
@@ -202,6 +207,8 @@ namespace DiscImageChef.Settings
string dicPath = Path.Combine(appSupportPath, "DiscImageChef");
if(!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
DbPath = Path.Combine(dicPath, DbPath);
ReportsPath = Path.Combine(dicPath, "Reports");
if(!Directory.Exists(ReportsPath)) Directory.CreateDirectory(ReportsPath);
@@ -227,6 +234,8 @@ namespace DiscImageChef.Settings
if(!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
DbPath = Path.Combine(dicPath, DbPath);
ReportsPath = Path.Combine(dicPath, "Reports");
if(!Directory.Exists(ReportsPath)) Directory.CreateDirectory(ReportsPath);

2
DiscImageChef/Commands/DeviceReport.cs
View File

@@ -924,7 +924,7 @@ namespace DiscImageChef.Commands
Core.Statistics.AddCommand("device-report");
using(DicContext ctx = new DicContext())
using(DicContext ctx = DicContext.Create(Settings.Settings.DbPath))
{
ctx.Reports.Add(new Report(report));
ctx.SaveChanges();

2
DiscImageChef/Commands/Statistics.cs
View File

@@ -41,7 +41,7 @@ namespace DiscImageChef.Commands
{
internal static void ShowStats()
{
DicContext ctx = new DicContext();
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
if(!ctx.Commands.Any() && !ctx.Filesystems.Any() && !ctx.Filters.Any() && !ctx.MediaFormats.Any() &&
!ctx.Medias.Any() && !ctx.Partitions.Any() && !ctx.SeenDevices.Any())

5
DiscImageChef/Main.cs
View File

@@ -55,11 +55,12 @@ namespace DiscImageChef
DicConsole.WriteEvent += System.Console.Write;
DicConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine;
DicContext ctx = new DicContext();
Settings.Settings.LoadSettings();
DicContext ctx = DicContext.Create(Settings.Settings.DbPath);
ctx.Database.Migrate();
ctx.SaveChanges();
Settings.Settings.LoadSettings();
if((args.Length < 1 || args[0].ToLowerInvariant() != "gui") &&
Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel) Configure.DoConfigure(true);
Statistics.LoadStats();