修复标题中特殊字符的处理 #2

Novel.cs

@@ -397,13 +397,16 @@ public bool isVipChapter(int chptindx)
             return vipChapters.IndexOf(chptindx) != -1;
         }
 
+        Regex legalPath = new Regex(@"[|:?\\/*'<>]|\.+(?:$)");
         public void saveChapter(Chapter chpt, bool split)
         {
             string savepath;
+            var legalName = legalPath.Replace(this.name, "_", -1);
             if (split)
-                savepath = this.savePath + "\\" + this.name + "-" + chpt.chapterIndex.ToString("D3") + ".txt";
+                savepath = this.savePath + "\\" + legalName + "-" + chpt.chapterIndex.ToString("D3") + ".txt";
             else
-                savepath = this.savePath + "\\" + this.name + ".txt";
+                savepath = this.savePath + "\\" + legalName + ".txt";
+
             FileStream fs = new FileStream(savepath, FileMode.Append, FileAccess.Write);
             StreamWriter sw = new StreamWriter(fs);
             sw.WriteLine(chpt.ToString() + "\r\n");
@@ -414,7 +417,8 @@ public void saveChapter(Chapter chpt, bool split)
         }
         private void saveProgress(int chpt)
         {
-            string savepath = this.savePath + "\\" + this.name + ".jjget";
+            var legalName = legalPath.Replace(this.name, "_", -1);
+            string savepath = this.savePath + "\\" + legalName + ".jjget";
             FileStream fs = new FileStream(savepath, FileMode.Create, FileAccess.Write);
             StreamWriter sw = new StreamWriter(fs);
             sw.Write(chpt.ToString());

Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@
 [assembly: AssemblyTitle("jjget")]
 [assembly: AssemblyDescription("晋江下载器")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("fffonion (https://yooooo.us)")]
+[assembly: AssemblyCompany("fffonion (https://github.com/fffonion/JJGet/issues)")]
 [assembly: AssemblyProduct("jjget")]
 [assembly: AssemblyCopyright("GPLv3")]
 [assembly: AssemblyTrademark("")]
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2")]
-[assembly: AssemblyFileVersion("1.2.2")]
+[assembly: AssemblyVersion("1.2.4")]
+[assembly: AssemblyFileVersion("1.2.4")]

jjget.csproj

@@ -148,12 +148,11 @@
     <Error Condition="!Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="ILMerge" Version="3.0.17" />
+    <PackageReference Include="ILMerge" Version="3.0.29" />
   </ItemGroup>
-
   <Target Name="ILMerge">
     <!-- the ILMergePath property points to the location of ILMerge.exe console application -->
-    <Exec Command="$(ILMergeConsolePath) bin\SingleFile\jjget.exe  /out:jjget.exe bin\SingleFile\HtmlAgilityPack.dll bin\SingleFile\Newtonsoft.Json.dll" />
+    <Exec Command="$(ILMergeConsolePath) bin\Release\jjget.exe  /out:jjget.exe bin\Release\HtmlAgilityPack.dll bin\Release\Newtonsoft.Json.dll" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.