Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved Utils WJ LocalAppData filewatching to lazy system

Browse Source
This commit is contained in:
Justin Swanson 2020-09-21 20:29:45 -05:00
parent 30b85bb442
commit 1d6663629e
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Wabbajack.Common/Utils.cs
View File

@ -46,13 +46,6 @@ namespace Wabbajack.Common
public static AbsolutePath LogFile { get; } public static AbsolutePath LogFile { get; }
public static AbsolutePath LogFolder { get; } public static AbsolutePath LogFolder { get; }
public enum FileEventType
{
Created,
Changed,
Deleted
}
static Utils() static Utils()
{ {
LogFolder = Consts.LogsFolder; LogFolder = Consts.LogsFolder;
@ -98,13 +91,6 @@ namespace Wabbajack.Common
Log($"Deleted {success} log files, failed to delete {failed} logs"); Log($"Deleted {success} log files, failed to delete {failed} logs");
} }
var watcher = new FileSystemWatcher((string)Consts.LocalAppDataPath);
AppLocalEvents = Observable.Merge(Observable.FromEventPattern<FileSystemEventHandler, FileSystemEventArgs>(h => watcher.Changed += h, h => watcher.Changed -= h).Select(e => (FileEventType.Changed, e.EventArgs)),
Observable.FromEventPattern<FileSystemEventHandler, FileSystemEventArgs>(h => watcher.Created += h, h => watcher.Created -= h).Select(e => (FileEventType.Created, e.EventArgs)),
Observable.FromEventPattern<FileSystemEventHandler, FileSystemEventArgs>(h => watcher.Deleted += h, h => watcher.Deleted -= h).Select(e => (FileEventType.Deleted, e.EventArgs)))
.ObserveOn(Scheduler.Default);
watcher.EnableRaisingEvents = true;
} }
private static readonly Subject<IStatusMessage> LoggerSubj = new Subject<IStatusMessage>(); private static readonly Subject<IStatusMessage> LoggerSubj = new Subject<IStatusMessage>();
@ -997,13 +983,11 @@ namespace Wabbajack.Common
return false; return false;
} }
public static IObservable<(FileEventType, FileSystemEventArgs)> AppLocalEvents { get; }
public static IObservable<bool> HaveEncryptedJsonObservable(string key) public static IObservable<bool> HaveEncryptedJsonObservable(string key)
{ {
var path = Consts.LocalAppDataPath.Combine(key); var path = Consts.LocalAppDataPath.Combine(key);
return AppLocalEvents.Where(t => (AbsolutePath)t.Item2.FullPath.ToLower() == path) return WJFileWatcher.AppLocalEvents
.Where(t => (AbsolutePath)t.Item2.FullPath.ToLower() == path)
.Select(_ => path.Exists) .Select(_ => path.Exists)
.StartWith(path.Exists) .StartWith(path.Exists)
.DistinctUntilChanged(); .DistinctUntilChanged();

32
Wabbajack.Common/WJFileWatcher.cs Normal file
View File

@ -0,0 +1,32 @@
using System;
using System.IO;
using System.Reactive.Concurrency;
using System.Reactive.Linq;
using System.Text;
namespace Wabbajack.Common
{
public static class WJFileWatcher
{
public enum FileEventType
{
Created,
Changed,
Deleted
}
public static IObservable<(FileEventType, FileSystemEventArgs)> AppLocalEvents { get; }
static WJFileWatcher()
{
var watcher = new FileSystemWatcher((string)Consts.LocalAppDataPath);
AppLocalEvents = Observable.Merge(
Observable.FromEventPattern<FileSystemEventHandler, FileSystemEventArgs>(h => watcher.Changed += h, h => watcher.Changed -= h).Select(e => (FileEventType.Changed, e.EventArgs)),
Observable.FromEventPattern<FileSystemEventHandler, FileSystemEventArgs>(h => watcher.Created += h, h => watcher.Created -= h).Select(e => (FileEventType.Created, e.EventArgs)),
Observable.FromEventPattern<FileSystemEventHandler, FileSystemEventArgs>(h => watcher.Deleted += h, h => watcher.Deleted -= h).Select(e => (FileEventType.Deleted, e.EventArgs)))
.ObserveOn(Scheduler.Default);
watcher.EnableRaisingEvents = true;
}
}
}