tsanie/Pixiview
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

optimize tasks

Browse Source
This commit is contained in:
Tsanie Lily
2020-05-17 19:57:07 +08:00
parent 91e3ba62bf
commit 2ae415f00f
6 changed files with 85 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Pixiview/Illust/IllustCollectionPage.cs
View File

@@ -75,6 +75,7 @@ namespace Pixiview.Illust
protected double topOffset;
private T illustData;
private ParallelTask task;
public IllustCollectionPage()
{
@@ -95,6 +96,11 @@ namespace Pixiview.Illust
public override void OnUnload()
{
if (task != null)
{
task.Dispose();
task = null;
}
InvalidateCollection();
Illusts = null;
lastUpdated = default;
@@ -559,7 +565,12 @@ namespace Pixiview.Illust
void DoLoadImages(IllustCollection collection)
{
ParallelTask.Start(0, collection.Count, Configs.MaxThreads, i =>
if (task != null)
{
task.Dispose();
task = null;
}
task = ParallelTask.Start(0, collection.Count, Configs.MaxThreads, i =>
{
if (!collection.Running)
{
@@ -716,11 +727,17 @@ namespace Pixiview.Illust
}
private readonly object sync = new object();
private volatile bool running;
private bool running;
public bool Running
{
get => running;
get
{
lock (sync)
{
return running;
}
}
set
{
lock (sync)

7
Pixiview/Illust/UserIllustPage.xaml.cs
View File

@@ -109,13 +109,6 @@ namespace Pixiview.Illust
return;
}
await ScrollToTopAsync(scrollView);
// release
var collection = IllustCollection;
if (collection != null)
{
collection.Running = false;
IllustCollection = null;
}
startIndex = -1;
nextIndex = 0;
illustIds = null;

18
Pixiview/Illust/ViewIllustPage.xaml.cs
View File

@@ -128,6 +128,7 @@ namespace Pixiview.Illust
private readonly ImageSource fontIconNotLove;
private IllustUgoiraData ugoiraData;
private Ugoira ugoira;
private ParallelTask task;
private readonly object sync = new object();
private int downloaded = 0;
@@ -188,6 +189,15 @@ namespace Pixiview.Illust
}
}
public override void OnUnload()
{
if (task != null)
{
task.Dispose();
task = null;
}
}
#if __IOS__
protected override void OnPageTopMarginChanged(Thickness old, Thickness @new)
{
@@ -387,7 +397,12 @@ namespace Pixiview.Illust
}
}
ParallelTask.Start(0, items.Length, Configs.MaxPageThreads, i =>
if (task != null)
{
task.Dispose();
task = null;
}
task = ParallelTask.Start(0, items.Length, Configs.MaxPageThreads, i =>
{
DoLoadImage(i);
return true;
@@ -461,7 +476,6 @@ namespace Pixiview.Illust
else
{
var val = downloaded / (float)pageCount;
App.DebugPrint($"download progress: {val}");
MainThread.BeginInvokeOnMainThread(() =>
{
ViewExtensions.CancelAnimations(progress);

2
Pixiview/UI/AdaptedPage.cs
View File

@@ -153,7 +153,7 @@ namespace Pixiview.UI
return _instance;
}
private volatile bool isBusy = false;
private bool isBusy = false;
public void Dispose()
{

40
Pixiview/Utils/Extensions.cs
View File

@@ -93,16 +93,18 @@ namespace Pixiview.Utils
}
}
public class ParallelTask
public class ParallelTask : IDisposable
{
public static void Start(int from, int toExclusive, int maxCount, Predicate<int> action)
public static ParallelTask Start(int from, int toExclusive, int maxCount, Predicate<int> action)
{
var task = new ParallelTask(from, toExclusive, maxCount, action);
Task.Run(task.Start);
return task;
}
private volatile int count;
private volatile bool disposed;
private readonly object sync = new object();
private int count;
private bool disposed;
private readonly int max;
private readonly int from;
@@ -130,7 +132,12 @@ namespace Pixiview.Utils
for (int i = from; i < to; i++)
{
var index = i;
while (count >= max)
bool flag;
lock (sync)
{
flag = count >= max;
}
while (flag)
{
if (disposed)
{
@@ -139,14 +146,20 @@ namespace Pixiview.Utils
}
Thread.Sleep(100);
}
count++;
lock (sync)
{
count++;
}
Task.Run(() =>
{
try
{
if (!action(index))
{
disposed = true;
lock (sync)
{
disposed = true;
}
}
}
catch (Exception ex)
@@ -155,11 +168,22 @@ namespace Pixiview.Utils
}
finally
{
count--;
lock (sync)
{
count--;
}
}
});
}
}
public void Dispose()
{
lock (sync)
{
disposed = true;
}
}
}
public static class Screen

43
Pixiview/Utils/Stores.cs
View File

@@ -32,8 +32,6 @@ namespace Pixiview.Utils
private const string userFolder = "user-profile";
private const string recommendsFolder = "recommends";
private static readonly object sync = new object();
public static bool NetworkAvailable
{
get
@@ -57,25 +55,22 @@ namespace Pixiview.Utils
public static IllustFavorite GetFavoriteObject(bool force = false)
{
lock (sync)
if (force || favoriteObject == null)
{
if (force || favoriteObject == null)
var favorites = LoadFavoritesIllusts();
if (favorites != null)
{
var favorites = LoadFavoritesIllusts();
if (favorites != null)
{
favoriteObject = favorites;
}
else
{
favoriteObject = new IllustFavorite
{
Illusts = new FavoriteList()
};
}
favoriteObject = favorites;
}
else
{
favoriteObject = new IllustFavorite
{
Illusts = new FavoriteList()
};
}
return favoriteObject;
}
return favoriteObject;
}
public static IllustFavorite LoadFavoritesIllusts(string file = null)
@@ -84,21 +79,15 @@ namespace Pixiview.Utils
{
file = FavoritesPath;
}
lock (sync)
{
return ReadObject<IllustFavorite>(file);
}
return ReadObject<IllustFavorite>(file);
}
public static void SaveFavoritesIllusts()
{
var file = FavoritesPath;
lock (sync)
{
var data = GetFavoriteObject();
data.LastFavoriteUtc = DateTime.UtcNow;
WriteObject(file, data);
}
var data = GetFavoriteObject();
data.LastFavoriteUtc = DateTime.UtcNow;
WriteObject(file, data);
}
public static string LoadUgoiraImage(string zip, string frame)