Merge 0edd05bc31 into 2c227d5d26

src/DownKyi.Core/DownKyi.Core.csproj

@@ -308,6 +308,7 @@
     <Compile Include="Settings\Models\VideoContentSettings.cs" />
     <Compile Include="Settings\OrderFormat.cs" />
     <Compile Include="Settings\ParseScope.cs" />
+    <Compile Include="Settings\RepeatDownloadStrategy.cs" />
     <Compile Include="Settings\SettingsManager.Video.cs" />
     <Compile Include="Settings\SettingsManager.Basic.cs" />
     <Compile Include="Settings\SettingsManager.Network.cs" />

src/DownKyi.Core/FileName/FileName.cs

@@ -163,7 +163,7 @@ namespace DownKyi.Core.FileName
                         path += videoPublishTime;
                         break;
                     case FileNamePart.AVID:
-                        path += avid;
+                        path += $"av{avid}";
                         break;
                     case FileNamePart.BVID:
                         path += bvid;

src/DownKyi.Core/Settings/Models/BasicSettings.cs

@@ -11,5 +11,6 @@
         public ParseScope ParseScope { get; set; } = ParseScope.NOT_SET;
         public AllowStatus IsAutoDownloadAll { get; set; } = AllowStatus.NONE;
         public DownloadFinishedSort DownloadFinishedSort { get; set; } = DownloadFinishedSort.NOT_SET;
+        public RepeatDownloadStrategy RepeatDownloadStrategy { get; set; } = RepeatDownloadStrategy.Ask;
     }
 }

src/DownKyi.Core/Settings/RepeatDownloadStrategy.cs

@@ -0,0 +1,9 @@
+namespace DownKyi.Core.Settings
+{
+    public enum RepeatDownloadStrategy
+    {
+        Ask,
+        ReDownload,
+        JumpOver
+    }
+}

src/DownKyi.Core/Settings/SettingsManager.Basic.cs

@@ -19,6 +19,9 @@
 
         // 下载完成列表排序
         private readonly DownloadFinishedSort finishedSort = DownloadFinishedSort.DOWNLOAD;
+        
+        // 重复下载策略
+        private readonly RepeatDownloadStrategy _repeatDownloadStrategy = RepeatDownloadStrategy.Ask;
 
         /// <summary>
         /// 获取下载完成后的操作
@@ -182,5 +185,32 @@
             return SetSettings();
         }
 
+        /// <summary>
+        /// 获取重复下载策略
+        /// </summary>
+        /// <returns></returns>
+        public RepeatDownloadStrategy GetRepeatDownloadStrategy()
+        {
+            appSettings = GetSettings();
+            if (appSettings.Basic.RepeatDownloadStrategy == RepeatDownloadStrategy.Ask)
+            {
+                // 第一次获取，先设置默认值
+                SetRepeatDownloadStrategy(_repeatDownloadStrategy);
+                return _repeatDownloadStrategy;
+            }
+
+            return appSettings.Basic.RepeatDownloadStrategy;
+        }
+
+        /// <summary>
+        /// 设置重复下载策略
+        /// </summary>
+        /// <param name="repeatDownloadStrategy"></param>
+        /// <returns></returns>
+        public bool SetRepeatDownloadStrategy(RepeatDownloadStrategy repeatDownloadStrategy)
+        {
+            appSettings.Basic.RepeatDownloadStrategy = repeatDownloadStrategy;
+            return SetSettings();
+        }
     }
 }

src/DownKyi/DownKyi.csproj

@@ -116,6 +116,7 @@
     <Compile Include="Models\Downloading.cs" />
     <Compile Include="Models\DownloadStatus.cs" />
     <Compile Include="Models\OrderFormatDisplay.cs" />
+    <Compile Include="Models\RepeatDownloadStrategyDisplay.cs" />
     <Compile Include="Services\AlertService.cs" />
     <Compile Include="Services\Download\AddToDownloadService.cs" />
     <Compile Include="Services\Download\CustomAriaDownloadService.cs" />

src/DownKyi/Languages/Default.xaml

@@ -195,6 +195,10 @@
     <system:String x:Key="ListenClipboard">监听剪贴板</system:String>
     <system:String x:Key="VideoAutoParse">视频自动解析</system:String>
     <system:String x:Key="VideoParseScope">视频解析范围：</system:String>
+    <system:String x:Key="RepeatDownloadStrategy">重复下载策略：</system:String>
+    <system:String x:Key="RepeatDownloadAsk">每次询问</system:String>
+    <system:String x:Key="RepeatDownloadReDownload">重新下载</system:String>
+    <system:String x:Key="RepeatDownloadReJumpOver">跳过重复项</system:String>
     <system:String x:Key="AutoDownloadAll">解析后自动下载已解析视频</system:String>
 
     <system:String x:Key="Network">网络</system:String>

src/DownKyi/Models/RepeatDownloadStrategyDisplay.cs

@@ -0,0 +1,10 @@
+using DownKyi.Core.Settings;
+
+namespace DownKyi.Models
+{
+    public class RepeatDownloadStrategyDisplay
+    {
+        public string Name { get; set; }
+        public RepeatDownloadStrategy RepeatDownloadStrategy { get; set; }
+    }
+}

src/DownKyi/Services/Download/AddToDownloadService.cs

@@ -279,21 +279,37 @@ namespace DownKyi.Services.Download
                         {
                             //eventAggregator.GetEvent<MessageEvent>().Publish($"{page.Name}{DictionaryResource.GetString("TipAlreadyToAddDownloaded")}");
                             //isDownloaded = true;
-
-                            AlertService alertService = new AlertService(dialogService);
-                            ButtonResult result = alertService.ShowInfo(DictionaryResource.GetString("TipAlreadyToAddDownloaded2"));
-                            if (result == ButtonResult.OK)
+                            var repeatDownloadStrategy = SettingsManager.GetInstance().GetRepeatDownloadStrategy();
+                            switch (repeatDownloadStrategy)
                             {
-                                App.PropertyChangeAsync(() =>
+                                case RepeatDownloadStrategy.Ask:
                                 {
-                                    App.DownloadedList.Remove(item);
-                                });
-
-                                isDownloaded = false;
-                            }
-                            else
-                            {
-                                isDownloaded = true;
+                                    AlertService alertService = new AlertService(dialogService);
+                                    ButtonResult result = alertService.ShowInfo(DictionaryResource.GetString("TipAlreadyToAddDownloaded2"));
+                                    if (result == ButtonResult.OK)
+                                    {
+                                        App.PropertyChangeAsync(() =>
+                                        {
+                                            App.DownloadedList.Remove(item);
+                                        });
+
+                                        isDownloaded = false;
+                                    }
+                                    else
+                                    {
+                                        isDownloaded = true;
+                                    }
+                                    break;
+                                }
+                                case RepeatDownloadStrategy.ReDownload:
+                                    isDownloaded = false;
+                                    break;
+                                case RepeatDownloadStrategy.JumpOver:
+                                    isDownloaded = true;
+                                    break;
+                                default:
+                                    isDownloaded = true;
+                                    break;
                             }
 
                             break;

src/DownKyi/Services/VideoInfoService.cs

@@ -151,7 +151,7 @@ namespace DownKyi.Services
                         Bvid = episode.Bvid,
                         Cid = episode.Cid,
                         EpisodeId = -1,
-                        FirstFrame = episode.Page.FirstFrame,
+                        FirstFrame = episode.Arc.Pic,
                         Order = order,
                         Name = episode.Title,
                         Duration = "N/A"

src/DownKyi/ViewModels/Settings/ViewBasicViewModel.cs

@@ -73,6 +73,22 @@ namespace DownKyi.ViewModels.Settings
             get => autoDownloadAll;
             set => SetProperty(ref autoDownloadAll, value);
         }
+        
+        private List<RepeatDownloadStrategyDisplay> _repeatDownloadStrategy;
+
+        public List<RepeatDownloadStrategyDisplay> RepeatDownloadStrategy
+        {
+            get => _repeatDownloadStrategy;
+            set => SetProperty(ref _repeatDownloadStrategy, value);
+        }
+
+        private RepeatDownloadStrategyDisplay _selectedRepeatDownloadStrategy;
+
+        public RepeatDownloadStrategyDisplay SelectedRepeatDownloadStrategy
+        {
+            get => _selectedRepeatDownloadStrategy;
+            set => SetProperty(ref _selectedRepeatDownloadStrategy, value);
+        }
 
         #endregion
 
@@ -89,6 +105,14 @@ namespace DownKyi.ViewModels.Settings
                 new ParseScopeDisplay{ Name = DictionaryResource.GetString("ParseCurrentSection"), ParseScope = ParseScope.CURRENT_SECTION },
                 new ParseScopeDisplay{ Name = DictionaryResource.GetString("ParseAll"), ParseScope = ParseScope.ALL }
             };
+            
+            // 重复下载策略
+            RepeatDownloadStrategy = new List<RepeatDownloadStrategyDisplay>
+            {
+                new RepeatDownloadStrategyDisplay { Name = DictionaryResource.GetString("RepeatDownloadAsk"), RepeatDownloadStrategy = Core.Settings.RepeatDownloadStrategy.Ask },
+                new RepeatDownloadStrategyDisplay { Name = DictionaryResource.GetString("RepeatDownloadReDownload"), RepeatDownloadStrategy = Core.Settings.RepeatDownloadStrategy.ReDownload },
+                new RepeatDownloadStrategyDisplay { Name = DictionaryResource.GetString("RepeatDownloadReJumpOver"), RepeatDownloadStrategy = Core.Settings.RepeatDownloadStrategy.JumpOver }
+            };
 
             #endregion
 
@@ -123,6 +147,10 @@ namespace DownKyi.ViewModels.Settings
             // 解析后是否自动下载解析视频
             AllowStatus isAutoDownloadAll = SettingsManager.GetInstance().IsAutoDownloadAll();
             AutoDownloadAll = isAutoDownloadAll == AllowStatus.YES;
+            
+            // 重复下载策略
+            var repeatDownloadStrategy = SettingsManager.GetInstance().GetRepeatDownloadStrategy();
+            SelectedRepeatDownloadStrategy = RepeatDownloadStrategy.FirstOrDefault(t => t.RepeatDownloadStrategy == repeatDownloadStrategy);
 
             isOnNavigatedTo = false;
         }
@@ -218,6 +246,26 @@ namespace DownKyi.ViewModels.Settings
             bool isSucceed = SettingsManager.GetInstance().IsAutoDownloadAll(isAutoDownloadAll);
             PublishTip(isSucceed);
         }
+        
+        // 解析范围事件
+        private DelegateCommand<object> _repeatDownloadStrategyCommand;
+
+        public DelegateCommand<object> RepeatDownloadStrategyCommand => _repeatDownloadStrategyCommand ?? (_repeatDownloadStrategyCommand = new DelegateCommand<object>(ExecuteRepeatDownloadStrategyCommand));
+
+        /// <summary>
+        /// 解析范围事件
+        /// </summary>
+        /// <param name="parameter"></param>
+        private void ExecuteRepeatDownloadStrategyCommand(object parameter)
+        {
+            if (!(parameter is RepeatDownloadStrategyDisplay repeatDownloadStrategy))
+            {
+                return;
+            }
+
+            var isSucceed = SettingsManager.GetInstance().SetRepeatDownloadStrategy(repeatDownloadStrategy.RepeatDownloadStrategy);
+            PublishTip(isSucceed);
+        }
 
         #endregion
 

src/DownKyi/ViewModels/Settings/ViewNetworkViewModel.cs

@@ -371,16 +371,19 @@ namespace DownKyi.ViewModels.Settings
         }
 
         // 设置UserAgent事件
-        private DelegateCommand userAgentCommand;
-        public DelegateCommand UserAgentCommand => userAgentCommand ?? (userAgentCommand = new DelegateCommand(ExecuteUserAgentCommand));
+        private DelegateCommand<string> userAgentCommand;
+        public DelegateCommand<string> UserAgentCommand => userAgentCommand ?? (userAgentCommand = new DelegateCommand<string>(ExecuteUserAgentCommand));
 
         /// <summary>
         /// 设置UserAgent事件
         /// </summary>
-        private void ExecuteUserAgentCommand()
+        private void ExecuteUserAgentCommand(string ua)
         {
-            bool isSucceed = SettingsManager.GetInstance().SetUserAgent(UserAgent);
-            PublishTip(isSucceed);
+            if (ua != null)
+            {
+                bool isSucceed = SettingsManager.GetInstance().SetUserAgent(ua);
+                PublishTip(isSucceed);
+            }
         }
 
         // 下载器选择事件

src/DownKyi/Views/Settings/ViewBasic.xaml

@@ -112,7 +112,27 @@
                 Foreground="{DynamicResource BrushTextDark}"
                 IsChecked="{Binding AutoDownloadAll, Mode=TwoWay}"
                 Style="{StaticResource CheckBoxStyle}" />
+            <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
+                <TextBlock
+                    VerticalAlignment="Center"
+                    FontSize="12"
+                    Foreground="{DynamicResource BrushTextDark}"
+                    Text="{DynamicResource RepeatDownloadStrategy}" />
+                <ComboBox
+                    Name="NameRepeatDownloadStrategy"
+                    Width="120"
+                    VerticalContentAlignment="Center"
+                    DisplayMemberPath=" Name"
+                    ItemsSource="{Binding RepeatDownloadStrategy}"
+                    SelectedItem="{Binding SelectedRepeatDownloadStrategy}">
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding RepeatDownloadStrategyCommand}" CommandParameter="{Binding ElementName=NameRepeatDownloadStrategy, Path=SelectedItem}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
 
+                </ComboBox>
+            </StackPanel>
             <StackPanel Margin="10" />
         </StackPanel>
     </ScrollViewer>

src/nuget.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="DownKyiThirdParty" value="../third_party" />
+    </packageSources>
+</configuration>