9.5.3

xplusky · Aug 26, 2021 · 5a9f859 · 5a9f859
1 parent 35ed351
commit 5a9f859
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/MoeLoaderP.Core/DownloadItem.cs b/MoeLoaderP.Core/DownloadItem.cs
@@ -293,6 +293,7 @@ public string FormatText(string format, MoeItem img, bool isFolder = false)
             sb.Replace("%tag", $"{tags}");
             sb.Replace("%title", img.Title ?? "no-title");
             sb.Replace("%uploader", img.Uploader ?? "no-uploader");
+            sb.Replace("%uploader_id", img.UploaderId ?? "no-uploader-id");
             sb.Replace("%date", img.DateString ?? "no-date");
             sb.Replace("%origin", OriginFileNameWithoutExtension);
             sb.Replace("%character", img.Character ?? "no-character");

diff --git a/MoeLoaderP.Core/Sites/EHentai.cs b/MoeLoaderP.Core/Sites/EHentai.cs
@@ -11,6 +11,11 @@ public class EHentai:MoeSite
         public override string HomeUrl => "https://e-hentai.org";
         public override string DisplayName => "e-hentai";
         public override string ShortName => "e-hentai";
+
+        public EHentai()
+        {
+
+        }
         public override Task<MoeItems> GetRealPageImagesAsync(SearchPara para, CancellationToken token)
         {
             throw new NotImplementedException();

diff --git a/MoeLoaderP.Wpf/App.xaml.cs b/MoeLoaderP.Wpf/App.xaml.cs
@@ -62,7 +62,16 @@ protected override void OnStartup(StartupEventArgs e)
             catch (Exception ex)
             {
                 Extend.Log(ex);
-                throw;
+                var result = MessageBox.Show("启动失败，是否尝试删除配置文件？", "错误", MessageBoxButton.YesNo, MessageBoxImage.Error);
+                if (result == MessageBoxResult.Yes)
+                {
+                    File.Delete(SettingJsonFilePath);
+                    Current.Shutdown();
+                }
+                else
+                {
+                    throw;
+                }
             }
         }
 

diff --git a/MoeLoaderP.Wpf/ControlParts/SettingsControl.xaml b/MoeLoaderP.Wpf/ControlParts/SettingsControl.xaml
@@ -188,6 +188,12 @@
                                 VerticalAlignment="Bottom"
                                 Content="作者"
                                 ToolTip="%uploader" Template="{DynamicResource MoeButtonControlTemplate}" Height="24" Width="50" Margin="2" />
+                            <Button
+                                x:Name="NameFormatAuthorIdButton"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Bottom"
+                                Content="作者ID"
+                                ToolTip="%uploader_id" Template="{DynamicResource MoeButtonControlTemplate}" Height="24" Width="50" Margin="2" />
                             <Button
                                 x:Name="NameFormatDiescButton"
                                 HorizontalAlignment="Left"

diff --git a/MoeLoaderP.Wpf/Properties/AssemblyInfo.cs b/MoeLoaderP.Wpf/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("9.5.2.0")]
-[assembly: AssemblyFileVersion("9.5.2.0")]
+[assembly: AssemblyVersion("9.5.3.0")]
+[assembly: AssemblyFileVersion("9.5.3.0")]
 [assembly: Guid("8745D9BE-87F2-4425-9748-AAA4BCC232A3")]