From a7301d1de9d814aba91d934a8e009173536f06f3 Mon Sep 17 00:00:00 2001
From: ZYFDroid <zyfdroid@qq.com>
Date: Thu, 24 Feb 2022 17:17:38 +0800
Subject: [PATCH] Fix crash when load resource pack without meta.json Limit
 resource pack network access

---
 EPUBium Desktop/EPUBium Desktop.csproj     |   4 ++--
 EPUBium Desktop/Form1.cs                   |  14 +++++++++++--
 EPUBium Desktop/FrmChangeResource.cs       |  22 ++++++++++++++-------
 EPUBium Desktop/Properties/AssemblyInfo.cs |   4 ++--
 EPUBium Desktop/htdocs.pak                 | Bin 1297381 -> 1389002 bytes
 EPUBium Desktop/htdocs/index.html          |  12 +++++++----
 6 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/EPUBium Desktop/EPUBium Desktop.csproj b/EPUBium Desktop/EPUBium Desktop.csproj
index ed00cdf..fb40e38 100644
--- a/EPUBium Desktop/EPUBium Desktop.csproj	
+++ b/EPUBium Desktop/EPUBium Desktop.csproj	
@@ -50,13 +50,13 @@
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>embedded</DebugType>
+    <DebugType>none</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>
diff --git a/EPUBium Desktop/Form1.cs b/EPUBium Desktop/Form1.cs
index 6b0093f..c5340b9 100644
--- a/EPUBium Desktop/Form1.cs	
+++ b/EPUBium Desktop/Form1.cs	
@@ -123,17 +123,27 @@ void initWebView2()
             webView.DocumentTitleChanged += WebView_DocumentTitleChanged;
             webView.Settings.IsPinchZoomEnabled = false;
             webView.Settings.IsSwipeNavigationEnabled = false;
-            webView.AddWebResourceRequestedFilter("http://epub.zyf-internal.com/*", CoreWebView2WebResourceContext.All);
+            webView.AddWebResourceRequestedFilter("*", CoreWebView2WebResourceContext.All);
             resourceHandler = new ResourceHandler(webView.Environment);
             webView.WebResourceRequested += WebView_WebResourceRequested;
+            webView.FrameNavigationStarting += WebView_FrameNavigationStarting;
         }
+
+        private void WebView_FrameNavigationStarting(object sender, CoreWebView2NavigationStartingEventArgs e)
+        {
+            if (!e.Uri.StartsWith(urlbase))
+            {
+                e.Cancel = true;
+            }
+        }
+
         const string urlbase = "http://epub.zyf-internal.com";
         private void WebView_WebResourceRequested(object sender, CoreWebView2WebResourceRequestedEventArgs e)
         {
             e.Response = handleRequest(e.Request);
             e.GetDeferral().Complete();
         }
-
+        
         public CoreWebView2WebResourceResponse handleRequest(CoreWebView2WebResourceRequest request)
         {
             if (request.Uri.StartsWith(urlbase))
diff --git a/EPUBium Desktop/FrmChangeResource.cs b/EPUBium Desktop/FrmChangeResource.cs
index f3c6438..5f79f8d 100644
--- a/EPUBium Desktop/FrmChangeResource.cs	
+++ b/EPUBium Desktop/FrmChangeResource.cs	
@@ -86,8 +86,14 @@ void loadData()
                                         resPackInfo.metadata = new ResPackMeta();
                                     }
                                 }
-                                resPackInfo.metadata.safeValue(file);
                             }
+                            else
+                            {
+                                resPackInfo.metadata = new ResPackMeta();
+                                
+                            }
+
+                            resPackInfo.metadata.safeValue(file);
                         }
                         catch { }
                     }
@@ -122,21 +128,23 @@ class ResPackMeta
 
             public void safeValue(string filename)
             {
-                name = name.Trim() == "" ? null : name;
-                description = description.Trim() == "" ? null : description;
-                author = author.Trim() == "" ? null : author;
-                version = name.Trim() == "" ? null : version;
-                link = name.Trim() == "" ? null : link;
-
                 name = name ?? Path.GetFileName(filename);
                 description = description ?? "";
                 author = author ?? "";
                 version = version ?? "";
                 link = link ?? "";
+
+                name = name.Trim() == "" ? Path.GetFileName(filename) : name;
+
+
             }
 
             public override string ToString()
             {
+                if(version == "" || author == "")
+                {
+                    return $"{name}\r\n \r\n ";
+                }
                 return $"{name} v{version}\r\n{description}\r\n作者：{author}";
             }
         }
diff --git a/EPUBium Desktop/Properties/AssemblyInfo.cs b/EPUBium Desktop/Properties/AssemblyInfo.cs
index 8c5cfc3..90610e1 100644
--- a/EPUBium Desktop/Properties/AssemblyInfo.cs	
+++ b/EPUBium Desktop/Properties/AssemblyInfo.cs	
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.0.1")]
+[assembly: AssemblyFileVersion("3.0.0.1")]
diff --git a/EPUBium Desktop/htdocs.pak b/EPUBium Desktop/htdocs.pak
index 3e17b1caf34b2042382752aa767399a9031b68bb..a061a9dd3797d73d54866946d408528840c437f1 100644
GIT binary patch
delta 21645
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
J-`)b>{vU3-4u}8%

delta 753
zcmZ9K-)oXl7{`5&Kju1{zmD&87sXifLT%cR)hb9vKXz5_4WXcUV|25cFm}@@ZBS&?
zjru}ojBRRDreZaDai?ZV1ryp>to{OPweBLis~|c@olx(~=kR^M-{*Na=kRXqc)wsz
zqy(<IqvdtFig&p(u)9SeVU{j~!1SKpxp`jR(A`9rNBi~StGq&-h@=~)O*$D>0H!Ci
zR%t@qRWy976q=pkni_A%kxLqz`}VJqnIEcm3JI$O<EL3D35jfLnq{dmndRPetl4an
z49h-NBTZ(1HMeG!9zDsl^6_VudLAuYXzfO`s%hrk(oynx??}>-(gVOw|E9b~N8Sll
z!l4RB0Tek!K|&Q}pPFVQRaI^YRD`F@DoPtgO=+j>BU5JRI>xFp0@T{+MEv3wTw%tw
zApA7K49_|&vUXJ!QaUJ|6b(g7(NXk7RW-bxVO?*}qI(u5gzM;?PV;sAl2==(<Z3-K
zS*-{62hn}iaF@wX3razhHsXkg%=lvr-M}krP=Rm9&>)!>(TR5aeirgLRDwqATSNoc
zuz)-bFYpxV@a7`Y;_oSlNPYqR<l5|RlYeOSk0{JvB=Q961$BoMnbSu`AEPVmYDqDL
z4gxhRe#o2r;y}7jw9R!8-7*?uS4#pp6z1yr4^ury?B{u|ry1TTBOh_~@^Se8v1<Li
z9SnEjP6vO8OXA}WepGHwA~BjW;-rH=1qw@e*TJ6yAJTZx$qU>h4m<e~@H>aMo%|WF
Z`4XEB^9PJdm5e?%`T~tiwpB*->o3@z3RM6A

diff --git a/EPUBium Desktop/htdocs/index.html b/EPUBium Desktop/htdocs/index.html
index 8b98a0a..e86a549 100644
--- a/EPUBium Desktop/htdocs/index.html	
+++ b/EPUBium Desktop/htdocs/index.html	
@@ -113,11 +113,15 @@
         });
         
         $(function (){
+            loadFolderList();
+            loadAll();
+        })
+
+        function loadFolderList(){
             $.ajax({url:"/api/folders",success:function (result) {
                 menuController.folders = JSON.parse(result);
             }});
-            loadAll();
-        })
+        }
 
         function loadFolder(folder){
             $.ajax({url:"/api/folder/"+folder.UUID,success:function (result) {
@@ -180,12 +184,12 @@
                     unblockloading();
                     toast(result);
                     loadAll();
-                    loadFolder();
+                    loadFolderList();
                 },
                 err:function(a,b,c){
                     toast("扫描出错");
                     loadAll();
-                    loadFolder();
+                    loadFolderList();
                 }
             });
         }