plugin-jm-server 0.1.16__tar.gz → 0.1.18__tar.gz

{plugin_jm_server-0.1.16 → plugin_jm_server-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugin_jm_server
-Version: 0.1.16
+Version: 0.1.18
 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
@@ -81,6 +81,33 @@ server.run(
 )
 ```
 
+* 作为jmcomic的插件
+
+```yml
+# 配置文件
+plugins:
+  after_init: 
+#  after_album:
+    - plugin: jm_server
+      kwargs:
+        password: ''
+
+```
+
+```python
+# 代码
+from jmcomic import *
+
+op = create_option('op.yml')
+op.download_album(123)
+# 运行到这里，虽然主线程代码执行完毕，但程序不会退出，因为服务器线程还没有结束。
+# 控制台会输出提示信息如下（atexit时输出的）：
+# “主线程执行完毕，但插件jm_server的服务器线程仍运行中，可按下ctrl+c结束程序”
+# 此时需要你主动按下ctrl+c终止程序。
+
+# python 3.12 特别注意：需要插入下面这行代码，服务器才能继续处理请求
+op.wait_all_plugins_finish()
+```
 
 
 # 效果图（文件浏览、整章看图）

{plugin_jm_server-0.1.16 → plugin_jm_server-0.1.18}/README.md

@@ -55,6 +55,33 @@ server.run(
 )
 ```
 
+* 作为jmcomic的插件
+
+```yml
+# 配置文件
+plugins:
+  after_init: 
+#  after_album:
+    - plugin: jm_server
+      kwargs:
+        password: ''
+
+```
+
+```python
+# 代码
+from jmcomic import *
+
+op = create_option('op.yml')
+op.download_album(123)
+# 运行到这里，虽然主线程代码执行完毕，但程序不会退出，因为服务器线程还没有结束。
+# 控制台会输出提示信息如下（atexit时输出的）：
+# “主线程执行完毕，但插件jm_server的服务器线程仍运行中，可按下ctrl+c结束程序”
+# 此时需要你主动按下ctrl+c终止程序。
+
+# python 3.12 特别注意：需要插入下面这行代码，服务器才能继续处理请求
+op.wait_all_plugins_finish()
+```
 
 
 # 效果图（文件浏览、整章看图）

plugin_jm_server-0.1.18/src/plugin_jm_server/__init__.py

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

{plugin_jm_server-0.1.16 → plugin_jm_server-0.1.18}/src/plugin_jm_server/files.py

@@ -81,10 +81,11 @@ class FileManager:
                 continue
 
             size = self.file_size_format(size, the_type)
-            getctime = os.path.getctime(file_path)
+
             try:
+                getctime = os.path.getctime(file_path)
                 ctime = time.localtime(getctime)
-                time_str = "{}/{}/{}".format(ctime.tm_year, ctime.tm_mon, ctime.tm_mday)
+                time_str = time.strftime("%Y-%m-%d %H:%M:%S", ctime)
             except OSError:
                 continue
 
@@ -97,6 +98,7 @@ class FileManager:
             })
         self.current_path = path
 
+        files.sort(key=lambda it: it['ctime'], reverse=True)
         return files
 
     @staticmethod

{plugin_jm_server-0.1.16 → plugin_jm_server-0.1.18}/src/plugin_jm_server/static/css/index.css

@@ -41,7 +41,7 @@ h3 {
 }
 
 .files-table {
-  width: 820px;
+  width: 1050px;
   border-collapse: collapse;
   border: 2px solid #fff;
   border-radius: 10px;
@@ -140,7 +140,7 @@ a:visited {
 .float-tablet {
   position: fixed;
   bottom: 40px;
-  right: 400px;
+  right: 100px;
   width: 200px;
   height: 150px;
   border-radius: 15px;
@@ -186,7 +186,6 @@ a:visited {
   box-sizing: border-box;
   bottom: 250px;
   right: 40px;
-  width: 560px;
   max-height: 226px;
   padding: 20px;
   border-radius: 15px;

plugin_jm_server-0.1.18/src/plugin_jm_server/static/js/common.js

@@ -0,0 +1,50 @@
+document.addEventListener('DOMContentLoaded', () => {
+    // 右侧菜单采用双击显示/隐藏
+    const element = document.querySelector('.menu-bolock');
+    document.addEventListener('dblclick', () => {
+        if (element.style.display === 'none') {
+            element.style.display = 'block';
+        } else {
+            element.style.display = 'none';
+        }
+    });
+
+    // 跳转到底部
+    document.getElementById('gobottom')
+        .addEventListener('click', () => {
+            window.scrollTo(0, document.body.scrollHeight);
+        });
+
+    // 选择页码跳转图片
+    document.getElementById('pageselect').addEventListener('change', function () {
+        let selectedValue = this.value;
+        if (selectedValue !== null) {
+            const divid = "page_" + selectedValue;
+            let element = document.getElementById(divid);
+            if (element) {
+                let settop = element.offsetTop - 28 - document.getElementById('Comic_Top_Nav').offsetHeight;
+                window.scrollTo(0, settop);
+            }
+            document.getElementById('pageselect').value = selectedValue;
+        }
+    });
+
+    window.addEventListener('scroll', function () {
+        let wsTop = window.scrollY
+        let pageDivs = document.querySelectorAll('div[id*="page_"]');
+        let toPage = pageDivs.length - 1;
+
+        for (let div of pageDivs) {
+            let divTop = div.offsetTop;
+            if (divTop > wsTop) {
+                toPage = parseInt(div.getAttribute("data-page"));
+                break
+            }
+        }
+
+        console.log('toPage:', toPage)
+        document.getElementById('pageselect').value = toPage;
+    });
+
+
+});

{plugin_jm_server-0.1.16 → plugin_jm_server-0.1.18}/src/plugin_jm_server/templates/index.html

@@ -71,6 +71,21 @@
         <input type="submit">
     </form>
 
+
+    <section class="flash-tablet" style="">
+        <div class="inner-container">
+{#            <div class="drivers-container">#}
+{#                根目录：#}
+{#                {% for driver in data.drivers %}#}
+{#                <a href="javascript:" location="{{ driver }}" style="color:black">{{ driver }}</a>#}
+{#                {% endfor %}#}
+{#                <h3 class="currentPath">当前路径：<span>{{ data.currentPath }}</span></h3>#}
+{#            </div>#}
+            <button class="to-lastPath" onclick="goBack()">&nbsp;←&nbsp;&nbsp;上级目录</button>
+            <button id="to-top">返回顶部</button>
+        </div>
+    </section>
+
     <section class="float-tablet">
         <button>
             <h4><a href="/upload_file">上 传 文 件</a></h4>
@@ -79,19 +94,6 @@
             <h4><a href="/logout">注&nbsp;&nbsp;&nbsp;&nbsp;销</a></h4>
         </button>
     </section>
-    <section class="flash-tablet" style="">
-        <div class="inner-container">
-            <div class="drivers-container">
-                根目录：
-                {% for driver in data.drivers %}
-                <a href="javascript:" location="{{ driver }}" style="color:black">{{ driver }}</a>
-                {% endfor %}
-                <h3 class="currentPath">当前路径：<span>{{ data.currentPath }}</span></h3>
-            </div>
-            <button class="to-lastPath" onclick="goBack()">&nbsp;←&nbsp;&nbsp;上级目录</button>
-            <button id="to-top">返回顶部</button>
-        </div>
-    </section>
 </div>
 </body>
 

{plugin_jm_server-0.1.16 → plugin_jm_server-0.1.18}/src/plugin_jm_server/templates/jm_view.html

@@ -9,10 +9,10 @@
     <link href="../static/css/bootstrap.css" rel="stylesheet">
     <script src="../static/js/jquery-3.7.1.min.js"></script>
     <script src="../static/js/jquery.album-0.2.js"></script>
+    <script src="../static/js/common.js"></script>
     <link rel="stylesheet" href="../static/css/index.css">
     <link rel="stylesheet" href="../static/css/all.min.css">
     <link rel="stylesheet" href="../static/css/style_photo.css">
-    <script src="../static/js/common.js"></script>
     <style>
       img {
         width: 100%;
@@ -25,6 +25,8 @@
 <body>
 
 <div class="container">
+    <div id="Comic_Top_Nav">
+    </div>
     <div class="row">
         <div style="padding:0">
             <div class="panel panel-default">
@@ -44,7 +46,10 @@
                             </div>
                         #}
                         {% for image in data.images %}
-                            <div class="center scramble-page" id="{{ image.filename }}" >
+                            <div class="center scramble-page"
+                                 id="page_{{ loop.index0 }}"
+                                 data-page="{{ loop.index0 }}"
+                            >
                                 <img src="{{ image.data_original }}"
                                      data-original="{{ image.data_original }}"
                                      class="lazy_img img-responsive-mw lazy-loaded"
@@ -104,6 +109,16 @@
         <li>
             <a id="gobottom" href="javascript:void(0)"><i class="far fa-caret-square-up"></i><span>跳到最后</span></a>
         </li>
+        <div>
+            <!--suppress HtmlFormInputWithoutLabel -->
+            <select id="pageselect">
+                {% for image in data.images %}
+                    <option value="{{ loop.index0 }}">
+                        {{ loop.index }}/{{ loop.length }}
+                    </option>
+                {% endfor %}
+            </select>
+        </div>
     </ul>
 </div>
 

{plugin_jm_server-0.1.16 → plugin_jm_server-0.1.18}/src/plugin_jm_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugin_jm_server
-Version: 0.1.16
+Version: 0.1.18
 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
@@ -81,6 +81,33 @@ server.run(
 )
 ```
 
+* 作为jmcomic的插件
+
+```yml
+# 配置文件
+plugins:
+  after_init: 
+#  after_album:
+    - plugin: jm_server
+      kwargs:
+        password: ''
+
+```
+
+```python
+# 代码
+from jmcomic import *
+
+op = create_option('op.yml')
+op.download_album(123)
+# 运行到这里，虽然主线程代码执行完毕，但程序不会退出，因为服务器线程还没有结束。
+# 控制台会输出提示信息如下（atexit时输出的）：
+# “主线程执行完毕，但插件jm_server的服务器线程仍运行中，可按下ctrl+c结束程序”
+# 此时需要你主动按下ctrl+c终止程序。
+
+# python 3.12 特别注意：需要插入下面这行代码，服务器才能继续处理请求
+op.wait_all_plugins_finish()
+```
 
 
 # 效果图（文件浏览、整章看图）

plugin_jm_server-0.1.16/src/plugin_jm_server/__init__.py

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

plugin_jm_server-0.1.16/src/plugin_jm_server/static/js/common.js

@@ -1,16 +0,0 @@
-document.addEventListener('DOMContentLoaded', () => {
-    const element = document.querySelector('.menu-bolock');
-    document.addEventListener('dblclick', () => {
-        if (element.style.display === 'none') {
-            element.style.display = 'block';
-        } else {
-            element.style.display = 'none';
-        }
-    });
-
-//     id=gobottom，对这个元素实现跳转到页面最底部
-    const bottom = document.getElementById('gobottom');
-    bottom.addEventListener('click', () => {
-        window.scrollTo(0, document.body.scrollHeight);
-    });
-});