Fix crash when load resource pack without meta.json

Limit resource pack network access
ZYFDroid · Feb 24, 2022 · a7301d1 · a7301d1
1 parent fc29b98
commit a7301d1
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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();
                 }
             });
         }