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

Put database context outside of worker. Reduces memory usage by quite a lot.

Browse Source
This commit is contained in:
Natalia Portillo
2025-07-24 04:26:56 +01:00
parent 134f8c7183
commit 2d54cbdf23
2 changed files with 93 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
RomRepoMgr.Core/Workers/FileImporter.cs
View File

@@ -22,14 +22,18 @@ using CompressionMode = SharpCompress.Compressors.CompressionMode;
namespace RomRepoMgr.Core.Workers; namespace RomRepoMgr.Core.Workers;
public sealed class FileImporter(bool onlyKnown, bool deleteAfterImport) public sealed class FileImporter
(
Context _ctx,
ConcurrentBag<DbFile> _newFiles,
ConcurrentBag<DbDisk> _newDisks,
ConcurrentBag<DbMedia> _newMedias,
bool onlyKnown,
bool deleteAfterImport
)
{ {
const long BUFFER_SIZE = 131072; const long BUFFER_SIZE = 131072;
static readonly Lock DbLock = new(); static readonly Lock DbLock = new();
readonly Context _ctx = Context.Create(Settings.Settings.Current.DatabasePath);
readonly List<DbDisk> _newDisks = [];
readonly List<DbFile> _newFiles = [];
readonly List<DbMedia> _newMedias = [];
readonly Dictionary<string, DbDisk> _pendingDisksByMd5 = []; readonly Dictionary<string, DbDisk> _pendingDisksByMd5 = [];
readonly Dictionary<string, DbDisk> _pendingDisksBySha1 = []; readonly Dictionary<string, DbDisk> _pendingDisksBySha1 = [];
readonly Dictionary<string, DbFile> _pendingFiles = []; readonly Dictionary<string, DbFile> _pendingFiles = [];
@@ -1298,9 +1302,9 @@ public sealed class FileImporter(bool onlyKnown, bool deleteAfterImport)
public void SaveChanges() public void SaveChanges()
{ {
SetIndeterminateProgress2?.Invoke(this, System.EventArgs.Empty); SetIndeterminateProgress?.Invoke(this, System.EventArgs.Empty);
SetMessage2?.Invoke(this, SetMessage?.Invoke(this,
new MessageEventArgs new MessageEventArgs
{ {
Message = Localization.SavingChangesToDatabase Message = Localization.SavingChangesToDatabase

46
RomRepoMgr/ViewModels/ImportRomFolderViewModel.cs
View File

@@ -12,6 +12,8 @@ using Avalonia.Threading;
using ReactiveUI; using ReactiveUI;
using RomRepoMgr.Core.EventArgs; using RomRepoMgr.Core.EventArgs;
using RomRepoMgr.Core.Workers; using RomRepoMgr.Core.Workers;
using RomRepoMgr.Database;
using RomRepoMgr.Database.Models;
using RomRepoMgr.Models; using RomRepoMgr.Models;
using RomRepoMgr.Resources; using RomRepoMgr.Resources;
@@ -19,6 +21,11 @@ namespace RomRepoMgr.ViewModels;
public class ImportRomFolderViewModel : ViewModelBase public class ImportRomFolderViewModel : ViewModelBase
{ {
readonly Context _ctx = Context.Create(Settings.Settings.Current.DatabasePath);
readonly ConcurrentBag<DbDisk> _newDisks = [];
readonly ConcurrentBag<DbFile> _newFiles = [];
readonly ConcurrentBag<DbMedia> _newMedias = [];
readonly Stopwatch _stopwatch = new();
bool _canClose; bool _canClose;
bool _canStart; bool _canStart;
string _folderPath; string _folderPath;
@@ -43,7 +50,7 @@ public class ImportRomFolderViewModel : ViewModelBase
string _statusMessage; string _statusMessage;
string _statusMessage2; string _statusMessage2;
bool _statusMessage2Visible; bool _statusMessage2Visible;
readonly Stopwatch _stopwatch = new();
public ImportRomFolderViewModel() public ImportRomFolderViewModel()
{ {
@@ -207,7 +214,7 @@ public class ImportRomFolderViewModel : ViewModelBase
void Start() void Start()
{ {
_rootImporter = new FileImporter(KnownOnlyChecked, RemoveFilesChecked); _rootImporter = new FileImporter(_ctx, _newFiles, _newDisks, _newMedias, KnownOnlyChecked, RemoveFilesChecked);
_rootImporter.SetMessage += SetMessage; _rootImporter.SetMessage += SetMessage;
_rootImporter.SetIndeterminateProgress += SetIndeterminateProgress; _rootImporter.SetIndeterminateProgress += SetIndeterminateProgress;
_rootImporter.SetProgress += SetProgress; _rootImporter.SetProgress += SetProgress;
@@ -310,7 +317,13 @@ public class ImportRomFolderViewModel : ViewModelBase
Indeterminate = true Indeterminate = true
}; };
var worker = new FileImporter(KnownOnlyChecked, RemoveFilesChecked); var worker = new FileImporter(_ctx,
_newFiles,
_newDisks,
_newMedias,
KnownOnlyChecked,
RemoveFilesChecked);
worker.SetIndeterminateProgress2 += model.OnSetIndeterminateProgress; worker.SetIndeterminateProgress2 += model.OnSetIndeterminateProgress;
worker.SetMessage2 += model.OnSetMessage; worker.SetMessage2 += model.OnSetMessage;
worker.SetProgress2 += model.OnSetProgress; worker.SetProgress2 += model.OnSetProgress;
@@ -322,13 +335,14 @@ public class ImportRomFolderViewModel : ViewModelBase
worker.ImportFile(file); worker.ImportFile(file);
worker.SaveChanges();
Interlocked.Increment(ref _listPosition); Interlocked.Increment(ref _listPosition);
}); });
_stopwatch.Stop(); _stopwatch.Stop();
Console.WriteLine("Took " + _stopwatch.Elapsed.TotalSeconds + " seconds to process files."); Console.WriteLine("Took " + _stopwatch.Elapsed.TotalSeconds + " seconds to process files.");
_rootImporter.SaveChanges();
_rootImporter.UpdateRomStats(); _rootImporter.UpdateRomStats();
_listPosition = 0; _listPosition = 0;
@@ -351,8 +365,8 @@ public class ImportRomFolderViewModel : ViewModelBase
ProgressMinimum = 0; ProgressMinimum = 0;
ProgressValue = 0; ProgressValue = 0;
ProgressIsIndeterminate = false; ProgressIsIndeterminate = false;
Progress2Visible = true; Progress2Visible = false;
StatusMessage2Visible = true; StatusMessage2Visible = false;
_listPosition = 0; _listPosition = 0;
_stopwatch.Restart(); _stopwatch.Restart();
@@ -366,12 +380,12 @@ public class ImportRomFolderViewModel : ViewModelBase
}); });
// Create FileImporter // Create FileImporter
var archiveImporter = new FileImporter(KnownOnlyChecked, RemoveFilesChecked); var archiveImporter = new FileImporter(_ctx,
_newFiles,
archiveImporter.SetIndeterminateProgress2 += SetIndeterminateProgress2; _newDisks,
archiveImporter.SetMessage2 += SetMessage2; _newMedias,
archiveImporter.SetProgress2 += SetProgress2; KnownOnlyChecked,
archiveImporter.SetProgressBounds2 += SetProgress2Bounds; RemoveFilesChecked);
// Extract archive // Extract archive
bool ret = archiveImporter.ExtractArchive(archive); bool ret = archiveImporter.ExtractArchive(archive);
@@ -387,7 +401,13 @@ public class ImportRomFolderViewModel : ViewModelBase
Indeterminate = true Indeterminate = true
}; };
var worker = new FileImporter(KnownOnlyChecked, RemoveFilesChecked); var worker = new FileImporter(_ctx,
_newFiles,
_newDisks,
_newMedias,
KnownOnlyChecked,
RemoveFilesChecked);
worker.SetIndeterminateProgress2 += model.OnSetIndeterminateProgress; worker.SetIndeterminateProgress2 += model.OnSetIndeterminateProgress;
worker.SetMessage2 += model.OnSetMessage; worker.SetMessage2 += model.OnSetMessage;
worker.SetProgress2 += model.OnSetProgress; worker.SetProgress2 += model.OnSetProgress;