Update remote info

the1812 · Oct 1, 2020 · c89d462 · c89d462
1 parent 5619a25
commit c89d462
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 21 deletions.
diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json
@@ -18,7 +18,9 @@
     "2345 2019.6.cer",
     "2345 256.2019.6.cer",
     "2345 browser 2020.06.cer",
-    "2345 browser 256.2020.06.cer"
+    "2345 browser 256.2020.06.cer",
+    "2345 browser 2020.10.cer",
+    "2345 browser 256.2020.10.cer"
   ],
   "6789": [
     "6789.cer",
@@ -37,7 +39,8 @@
   ],
   "Baofeng": [
     "baofeng.cer",
-    "baofeng 256.cer"
+    "baofeng 256.cer",
+    "baofeng 2020.10.cer"
   ],
   "DongfangToutiao": [
     "donfang toutiao.cer",
@@ -140,7 +143,9 @@
     "sogou 2019.8.cer",
     "sogou 256.2019.8.cer",
     "sogou 2019.10.cer",
-    "sogou 256.2019.10.cer"
+    "sogou 256.2019.10.cer",
+    "sogou 2020.10.cer",
+    "sogou 256.2020.10.cer"
   ],
   "Sohu": [
     "sohu.cer",

diff --git a/src/MalwarePatch/Assets/malware-remote-info.json b/src/MalwarePatch/Assets/malware-remote-info.json
@@ -37,14 +37,10 @@
     "match": []
   },
   "Baofeng": {
-    "fixed": [],
-    "match": [
-      {
-        "url": "http://home.baofeng.com/",
-        "regex": "<a(.*?)href=\"(.*?)\"(.*?)>立即下载",
-        "group": 2
-      }
-    ]
+    "fixed": [
+      "http://dl.baofeng.com/baofeng5/bf5_new.exe"
+    ],
+    "match": []
   },
   "DongfangToutiao": {
     "fixed": [
@@ -56,8 +52,8 @@
     "fixed": [],
     "match": [
       {
-        "url": "http://www.160.com/",
-        "regex": "href=\"(http[s]?://file1.updrv.com/soft/.*/DriveTheLife.*\\.exe)",
+        "url": "https://qd.160.com/",
+        "regex": "href=\"(https://file1.updrv.com/.+?DriveTheLife.+?\.exe)",
         "group": 1
       }
     ]
@@ -98,8 +94,8 @@
       },
       {
         "url": "https://www.liebao.cn/",
-        "regex": "href=\"(http[s]?://dl.liebao.cn/.*KSbrowser.*\.exe)\"",
-        "group": 1
+        "regex": "http://dl.liebao.cn/.+?KSbrowser.+?\.exe",
+        "group": 0
       },
       {
         "url": "http://www.wps.cn/",

diff --git a/src/MalwarePatch/Languages/MainLanguage.cs b/src/MalwarePatch/Languages/MainLanguage.cs
@@ -34,7 +34,7 @@ public enum Keys
             AllowProgramDescription,
         }
         internal static DateTime LastModifiedTime => File.GetLastWriteTime(Process.GetCurrentProcess().MainModule.FileName);
-        internal const int UpdateMonth = 6;
+        internal const int UpdateMonth = 10;
         internal static string UpdateTime
         {
             get

diff --git a/src/MalwarePatch/MalwarePatch.csproj b/src/MalwarePatch/MalwarePatch.csproj
@@ -216,7 +216,8 @@
   <PropertyGroup>
     <PostBuildEvent>"$(ProjectDir)BuildTools/InsertIcons.exe" "$(TargetPath)" "$(ProjectDir)AppIcons"
 if $(ConfigurationName) == Release (
-  xcopy /Y /F "$(TargetPath)" "$(SolutionDir)../$(TargetFileName)"
+  xcopy /Y /F /Q "$(TargetPath)" "$(SolutionDir)../$(TargetName).pkg*"
+  xcopy /Y /F /Q "$(TargetPath)" "$(SolutionDir)../$(TargetFileName)*"
 )</PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions />

diff --git a/src/MalwarePatch/Models/Updater.cs b/src/MalwarePatch/Models/Updater.cs
@@ -42,7 +42,7 @@ public Task<FileInfo> DownloadUpdate()
             {
                 File.Delete(UpdateFileName);
             }
-            var downloadLink = "https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.exe";
+            var downloadLink = "https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.pkg";
             // var downloadLink = "https://github.com/the1812/malware-patch/raw/master/mwp.exe";
             // var downloadLink = GoogleDrive.GetDirectLinkFromId(UpdateId);
             var info = new DownloadInfo(downloadLink)

diff --git a/src/MalwarePatch/Properties/AssemblyInfo.cs b/src/MalwarePatch/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.4.0")]
-[assembly: AssemblyFileVersion("2.9.4.0")]
+[assembly: AssemblyVersion("2.9.5.0")]
+[assembly: AssemblyFileVersion("2.9.5.0")]
diff --git a/src/MalwarePatch/UpdateID.txt b/src/MalwarePatch/UpdateID.txt
@@ -6,4 +6,4 @@ Version Github = https://github.com/the1812/malware-patch/raw/preview/mwp-ver.tx
 Program Github = https://github.com/the1812/malware-patch/raw/preview/mwp.exe
 
 Version jsDelivr = https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp-ver.txt
-Program jsDelivr = https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.exe
+Program jsDelivr = https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.pkg