plugin-jm-server 0.1.12__tar.gz → 0.1.14__tar.gz

{plugin_jm_server-0.1.12 → plugin_jm_server-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugin_jm_server
-Version: 0.1.12
+Version: 0.1.14
 Summary: plugin_jm_server, a plugin for jmcomic that can be used to view comics in a web browser.
 Home-page: https://github.com/hect0x7/plugin-jm-server
 Author: hect0x7

plugin_jm_server-0.1.14/src/plugin_jm_server/__init__.py

@@ -0,0 +1,3 @@
+__version__ = '0.1.14'
+
+from .app import *

{plugin_jm_server-0.1.12 → plugin_jm_server-0.1.14}/src/plugin_jm_server/app.py

@@ -20,6 +20,7 @@ class JmServer:
     def __init__(self,
                  default_path,
                  password,
+                 ip_whitelist=None,
                  current_path=None,
                  img_overwrite: Optional[dict] = None,
                  **extra,
@@ -49,8 +50,13 @@ class JmServer:
         self.password = password
         self.file_manager = FileManager(default_path, current_path)
         self.extra = extra
+        self.ip_whitelist = ip_whitelist
 
     def verify(self):
+        ip_whitelist = self.ip_whitelist
+        if ip_whitelist is not None and request.remote_addr not in ip_whitelist:
+            abort(404)
+
         """
         验证登录状态
         """

{plugin_jm_server-0.1.12 → plugin_jm_server-0.1.14}/src/plugin_jm_server/files.py

@@ -22,12 +22,18 @@ class FileManager:
     def get_jm_view_images(self, path):
         images_data = []
 
+        give_up_sort = False
+
         for f in self.files_of_dir_safe(path):
             if not self.is_image_file(f):
                 continue
             f = quote(f)
             name = common.of_file_name(f)
-            index = int(name[:name.index('.')])
+            try:
+                index = int(name[:name.index('.')])
+            except ValueError:
+                give_up_sort = True
+                index = None
 
             images_data.append({
                 'filename': name,
@@ -35,7 +41,8 @@ class FileManager:
                 'index': index,
             })
 
-        images_data.sort(key=lambda item: item['index'])
+        if give_up_sort is False:
+            images_data.sort(key=lambda item: item['index'])
 
         return images_data
 

{plugin_jm_server-0.1.12 → plugin_jm_server-0.1.14}/src/plugin_jm_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugin_jm_server
-Version: 0.1.12
+Version: 0.1.14
 Summary: plugin_jm_server, a plugin for jmcomic that can be used to view comics in a web browser.
 Home-page: https://github.com/hect0x7/plugin-jm-server
 Author: hect0x7

plugin_jm_server-0.1.12/src/plugin_jm_server/__init__.py

@@ -1,3 +0,0 @@
-__version__ = '0.1.12'
-
-from .app import *