完善下载进度

Pixeval · Mar 10, 2020 · 5d46cc4 · 5d46cc4
1 parent 6aadf2c
commit 5d46cc4
Show file tree

Hide file tree

Showing 34 changed files with 392 additions and 290 deletions.
diff --git a/App.xaml b/App.xaml
@@ -13,8 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.-->
-
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
 <Application
     x:Class="Pixeval.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -136,10 +136,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.-->
                             </Grid>
                             <ControlTemplate.Triggers>
                                 <Trigger SourceName="Thumb" Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="Thumb" Property="Background" Value="{DynamicResource ButtonSelectBrush}" />
+                                    <Setter TargetName="Thumb" Property="Background"
+                                            Value="{DynamicResource ButtonSelectBrush}" />
                                 </Trigger>
                                 <Trigger SourceName="Thumb" Property="IsDragging" Value="true">
-                                    <Setter TargetName="Thumb" Property="Background" Value="{DynamicResource DarkBrush}" />
+                                    <Setter TargetName="Thumb" Property="Background"
+                                            Value="{DynamicResource DarkBrush}" />
                                 </Trigger>
                                 <Trigger Property="IsEnabled" Value="false">
                                     <Setter TargetName="Thumb" Property="Visibility" Value="Collapsed" />

diff --git a/AppContext.cs b/AppContext.cs
@@ -1,5 +1,20 @@
-using System;
-using System.Collections.Generic;
+// Pixeval - A Strong, Fast and Flexible Pixiv Client
+// Copyright (C) 2019 Dylech30th
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Threading.Tasks;
@@ -22,22 +37,26 @@ public static class AppContext
 
         internal static bool LogoutExit = false;
 
+        public static IDownloadPathProvider DownloadPathProvider = new DefaultDownloadPathProvider();
+
+        public static IIllustrationFileNameFormatter FileNameFormatter = new DefaultIllustrationFileNameFormatter();
+
+        public static ObservableCollection<DownloadableIllustrationViewModel> Downloading = new ObservableCollection<DownloadableIllustrationViewModel>();
+
         static AppContext()
         {
             Directory.CreateDirectory(ProjectFolder);
             Directory.CreateDirectory(SettingsFolder);
             Directory.CreateDirectory(ExceptionReportFolder);
         }
 
-        public static IDownloadPathProvider DownloadPathProvider = new DefaultDownloadPathProvider();
-
-        public static IIllustrationFileNameFormatter FileNameFormatter = new DefaultIllustrationFileNameFormatter();
-
-        public static ObservableCollection<DownloadableIllustrationViewModel> Downloading = new ObservableCollection<DownloadableIllustrationViewModel>();
-
         public static void EnqueueDownloadItem(Illustration illustration)
         {
-            static void RemoveAction(DownloadableIllustrationViewModel d) => Downloading.Remove(d);
+            static void RemoveAction(DownloadableIllustrationViewModel d)
+            {
+                Downloading.Remove(d);
+            }
+
             if (illustration.IsManga)
             {
                 for (var j = 0; j < illustration.MangaMetadata.Length; j++)

diff --git a/Core/AbstractPixivAsyncEnumerable.cs b/Core/AbstractPixivAsyncEnumerable.cs
@@ -1,4 +1,20 @@
-using System.Collections.Generic;
+// Pixeval - A Strong, Fast and Flexible Pixiv Client
+// Copyright (C) 2019 Dylech30th
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+using System.Collections.Generic;
 using System.Threading;
 
 namespace Pixeval.Core

diff --git a/Core/AbstractPixivAsyncEnumerator.cs b/Core/AbstractPixivAsyncEnumerator.cs
@@ -1,4 +1,19 @@
-using System;
+// Pixeval - A Strong, Fast and Flexible Pixiv Client
+// Copyright (C) 2019 Dylech30th
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -18,10 +33,10 @@ public ValueTask DisposeAsync()
             return default;
         }
 
-        protected abstract void UpdateEnumerator();
-
         public abstract ValueTask<bool> MoveNextAsync();
 
         public abstract T Current { get; }
+
+        protected abstract void UpdateEnumerator();
     }
 }
diff --git a/Core/DefaultDownloadPathProvider.cs b/Core/DefaultDownloadPathProvider.cs
@@ -1,5 +1,20 @@
-using System.IO;
-using Pixeval.Data.ViewModel;
+// Pixeval - A Strong, Fast and Flexible Pixiv Client
+// Copyright (C) 2019 Dylech30th
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+using System.IO;
 using Pixeval.Objects;
 using Pixeval.Persisting;
 

diff --git a/Core/DefaultIllustrationFileNameFormatter.cs b/Core/DefaultIllustrationFileNameFormatter.cs
@@ -1,4 +1,20 @@
-using Pixeval.Data.ViewModel;
+// Pixeval - A Strong, Fast and Flexible Pixiv Client
+// Copyright (C) 2019 Dylech30th
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+using Pixeval.Data.ViewModel;
 using Pixeval.Objects;
 
 namespace Pixeval.Core

diff --git a/Core/GalleryAsyncEnumerable.cs b/Core/GalleryAsyncEnumerable.cs
@@ -31,13 +31,13 @@ public class GalleryAsyncEnumerable : AbstractPixivAsyncEnumerable<Illustration>
     {
         private readonly string uid;
 
-        public override int RequestedPages { get; protected set; }
-
         public GalleryAsyncEnumerable(string uid)
         {
             this.uid = uid;
         }
 
+        public override int RequestedPages { get; protected set; }
+
         public override SortOption SortOption { get; } = SortOption.None;
 
         public override IAsyncEnumerator<Illustration> GetAsyncEnumerator(CancellationToken cancellationToken = default)
@@ -47,40 +47,42 @@ public override IAsyncEnumerator<Illustration> GetAsyncEnumerator(CancellationTo
 
         private class GalleryAsyncEnumerator : AbstractPixivAsyncEnumerator<Illustration>
         {
+            private readonly string uid;
             private GalleryResponse entity;
 
             private IEnumerator<Illustration> illustrationsEnumerator;
 
-            private readonly string uid;
-
             public GalleryAsyncEnumerator(string uid, IPixivAsyncEnumerable<Illustration> outerInstance) : base(outerInstance)
             {
                 this.uid = uid;
             }
 
+            public override Illustration Current => illustrationsEnumerator.Current;
+
             protected override void UpdateEnumerator()
             {
                 illustrationsEnumerator = entity.Illusts.NonNull().Select(_ => _.Parse()).GetEnumerator();
             }
 
             public override async ValueTask<bool> MoveNextAsync()
             {
+                await Task.Delay(500);
                 if (entity == null)
                 {
                     if (await TryGetResponse($"/v1/user/bookmarks/illust?user_id={uid}&restrict=public&filter=for_ios") is (true, var model))
                     {
                         entity = model;
                         UpdateEnumerator();
                     }
-                    else throw new QueryNotRespondingException();
+                    else
+                    {
+                        throw new QueryNotRespondingException();
+                    }
 
                     Enumerable.ReportRequestedPages();
                 }
 
-                if (illustrationsEnumerator.MoveNext())
-                {
-                    return true;
-                }
+                if (illustrationsEnumerator.MoveNext()) return true;
 
                 if (entity.NextUrl.IsNullOrEmpty()) return false;
 
@@ -95,16 +97,11 @@ public override async ValueTask<bool> MoveNextAsync()
                 return false;
             }
 
-            public override Illustration Current => illustrationsEnumerator.Current;
-
             private static async Task<HttpResponse<GalleryResponse>> TryGetResponse(string url)
             {
                 var result = (await HttpClientFactory.AppApiHttpClient.GetStringAsync(url)).FromJson<GalleryResponse>();
 
-                if (result is { } response && !response.Illusts.IsNullOrEmpty())
-                {
-                    return HttpResponse<GalleryResponse>.Wrap(true, response);
-                }
+                if (result is { } response && !response.Illusts.IsNullOrEmpty()) return HttpResponse<GalleryResponse>.Wrap(true, response);
                 return HttpResponse<GalleryResponse>.Wrap(false);
             }
         }

diff --git a/Core/IDownloadPathProvider.cs b/Core/IDownloadPathProvider.cs
@@ -1,4 +1,20 @@
-using Pixeval.Data.ViewModel;
+// Pixeval - A Strong, Fast and Flexible Pixiv Client
+// Copyright (C) 2019 Dylech30th
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+using Pixeval.Data.ViewModel;
 
 namespace Pixeval.Core
 {

diff --git a/Core/IPixivAsyncEnumerable.cs b/Core/IPixivAsyncEnumerable.cs
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Pixeval.Core
 {

diff --git a/Core/PixevalDownloadTask.cs b/Core/PixevalDownloadTask.cs
diff --git a/Core/PixivHelper.cs b/Core/PixivHelper.cs
@@ -89,10 +89,7 @@ internal static async void Iterate<T>(IPixivAsyncEnumerable<T> pixivIterator, IC
 
             await foreach (T illust in IteratingSchedule.CurrentItr)
             {
-                if (IteratingSchedule.CurrentItr.IsCancellationRequested() || limit != -1 && pixivIterator.RequestedPages > limit)
-                {
-                    break;
-                }
+                if (IteratingSchedule.CurrentItr.IsCancellationRequested() || limit != -1 && pixivIterator.RequestedPages > limit) break;
 
                 if (illust is Illustration i)
                 {
@@ -116,7 +113,7 @@ await foreach (T illust in IteratingSchedule.CurrentItr)
                 }
                 else
                 {
-                    container.Add(illust);
+                    if (illust != null) container.Add(illust);
                 }
             }
         }