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

Slideshow made into VM

Browse Source 
Some random cleaning
This commit is contained in:
Justin Swanson 2019-10-13 14:12:33 -05:00
parent 3774f902d8
commit 93b6829904
2 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Wabbajack/AppState.cs
View File

@ -30,9 +30,7 @@ namespace Wabbajack
{
public class AppState : ViewModel, IDataErrorInfo
{
public const bool GcCollect = true;
private SlideShow _slideShow;
public SlideShow Slideshow { get; }
private string _mo2Folder;
@ -128,7 +126,7 @@ namespace Wabbajack
})
.DisposeWith(this.CompositeDisposable);
_slideShow = new SlideShow(this, true);
this.Slideshow = new SlideShow(this);
// Update splashscreen when modlist changes
Observable.CombineLatest(
@ -196,7 +194,7 @@ namespace Wabbajack
// Don't ever update more than once every half second. ToDo: Update to debounce
.Throttle(TimeSpan.FromMilliseconds(500), RxApp.MainThreadScheduler)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => _slideShow.UpdateSlideShowItem())
.Subscribe(_ => this.Slideshow.UpdateSlideShowItem())
.DisposeWith(this.CompositeDisposable);
// Initialize work queue
@ -410,7 +408,7 @@ namespace Wabbajack
HTMLReport = this.ModList.ReportHTML;
Location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
_slideShow.SlideShowElements = modlist.Archives
this.Slideshow.SlideShowElements = modlist.Archives
.Select(m => m.State)
.OfType<NexusDownloader.State>()
.Select(m =>
@ -419,7 +417,7 @@ namespace Wabbajack
m.Adult,m.NexusURL,m.SlideShowPic)).ToList();
_slideShow.PreloadSlideShow();
this.Slideshow.PreloadSlideShow();
}
private void ExecuteBegin()

52
Wabbajack/UI/SlideShow.cs
View File

@ -34,29 +34,34 @@ namespace Wabbajack.UI
}
internal class SlideShow
public class SlideShow : ViewModel
{
private readonly Random _random;
private Slide _lastSlide;
private const bool UseSync = false;
private const int MaxCacheSize = 10;
private readonly AppState _appState;
public SlideShow(AppState appState, bool checkCache)
public List<Slide> SlideShowElements { get; set; }
public Dictionary<string, Slide> CachedSlides { get; }
public Queue<Slide> SlidesQueue { get; }
public AppState AppState { get; }
private bool _ShowNSFW;
public bool ShowNSFW { get => _ShowNSFW; set => this.RaiseAndSetIfChanged(ref _ShowNSFW, value); }
private bool _GCAfterUpdating = true;
public bool GCAfterUpdating { get => _GCAfterUpdating; set => this.RaiseAndSetIfChanged(ref _GCAfterUpdating, value); }
public SlideShow(AppState appState)
{
SlideShowElements = new List<Slide>();
SlideShowElements = NexusApiClient.CachedSlideShow.ToList();
CachedSlides = new Dictionary<string, Slide>();
SlidesQueue = new Queue<Slide>();
_random = new Random();
_appState = appState;
if (!checkCache) return;
IEnumerable<Slide> files = NexusApiClient.CachedSlideShow;
IEnumerable<Slide> enumerable = files.ToList();
if (enumerable.Any())
{
SlideShowElements = enumerable.ToList();
}
AppState = appState;
}
public void PreloadSlideShow()
@ -89,23 +94,23 @@ namespace Wabbajack.UI
//if (SlidesQueue.Contains(randomSlide)) continue;
CachedSlides.Remove(randomSlide.ModID);
if (AppState.GcCollect)
if (this.GCAfterUpdating)
GC.Collect();
}
if (!slide.IsNSFW || (slide.IsNSFW && ShowNSFW))
{
_appState.SplashScreenImage = _appState._noneImage;
AppState.SplashScreenImage = AppState._noneImage;
if (slide.ImageURL != null && slide.Image != null)
{
if (!CachedSlides.ContainsKey(slide.ModID)) return;
_appState.SplashScreenImage = slide.Image;
AppState.SplashScreenImage = slide.Image;
}
_appState.SplashScreenModName = slide.ModName;
_appState.SplashScreenAuthorName = slide.ModAuthor;
_appState.SplashScreenSummary = slide.ModDescription;
_appState._nexusSiteURL = slide.ModURL;
AppState.SplashScreenModName = slide.ModName;
AppState.SplashScreenAuthorName = slide.ModAuthor;
AppState.SplashScreenSummary = slide.ModDescription;
AppState._nexusSiteURL = slide.ModURL;
}
SlidesQueue.Dequeue();
@ -194,12 +199,5 @@ namespace Wabbajack.UI
return result;
}
public bool ShowNSFW { get; set; }
public List<Slide> SlideShowElements { get; set; }
public Dictionary<string, Slide> CachedSlides { get; }
public Queue<Slide> SlidesQueue { get; }
}
}