plugin-jm-server 0.1.20__tar.gz → 0.1.22__tar.gz

{plugin_jm_server-0.1.20 → plugin_jm_server-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugin_jm_server
-Version: 0.1.20
+Version: 0.1.22
 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.22/src/plugin_jm_server/__init__.py

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

{plugin_jm_server-0.1.20 → plugin_jm_server-0.1.22}/src/plugin_jm_server/app.py

@@ -1,3 +1,4 @@
+import threading
 from urllib.parse import quote
 from html import unescape
 import os
@@ -5,7 +6,7 @@ import re
 from typing import Optional
 
 import common
-from flask import Flask, abort
+from flask import Flask, abort, Response, stream_with_context
 from flask import render_template, send_from_directory
 from flask import request, session, redirect, flash
 
@@ -21,6 +22,7 @@ class JmServer:
     def __init__(self,
                  default_path,
                  password,
+                 jm_option=None,
                  ip_whitelist=None,
                  current_path=None,
                  img_overwrite: Optional[dict] = None,
@@ -52,6 +54,20 @@ class JmServer:
         self.file_manager = FileManager(default_path, current_path)
         self.extra = extra
         self.ip_whitelist = ip_whitelist
+        self.jm_option = jm_option
+        if jm_option is not None:
+            import queue
+            self.jm_log_msg_queue = queue.Queue()
+            self.__hook_jm_logging()
+
+    def __hook_jm_logging(self):
+        import jmcomic
+        def executor_log(topic: str, msg: str):
+            from common import format_ts, current_thread
+            msg = '[{}] [{}]:【{}】{}\n'.format(format_ts(), current_thread().name, topic, msg)
+            self.jm_log_msg_queue.put(msg)
+
+        jmcomic.JmModuleConfig.EXECUTOR_LOG = executor_log
 
     def verify(self):
         ip_whitelist = self.ip_whitelist
@@ -253,6 +269,51 @@ class JmServer:
         else:
             return redirect('/login')
 
+    def stream(self):
+        album_id = request.args.get('id', None)
+        end = f'-- END [{album_id}] --'
+
+        # 开线程调用download_album
+        threading.Thread(target=self.invoke_jmcomic_download_album, args=(album_id, end)).start()
+
+        @stream_with_context
+        def yield_download_msg():
+            while True:
+                msg = self.jm_log_msg_queue.get()
+                if msg == end:
+                    break
+                yield msg
+
+        # noinspection PyCallingNonCallable
+        return Response(yield_download_msg(), mimetype="text/event-stream", headers={
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            'X-Accel-Buffering': 'no',
+            'Connection': 'keep-alive'
+        })
+
+    def invoke_jmcomic_download_album(self, album_id, end):
+        try:
+            import jmcomic
+        except ImportError:
+            self.jm_log_msg_queue.put('未安装 jmcomic')
+            self.jm_log_msg_queue.put(end)
+            return
+
+        try:
+
+            if self.jm_option is None:
+                self.jm_log_msg_queue.put('未配置option，使用默认值 (jmcomic.JmOption.default())')
+                op = jmcomic.JmOption.default()
+            else:
+                op = self.jm_option
+
+            op.download_album(album_id)
+        except Exception as e:
+            self.jm_log_msg_queue.put(f'下载失败: {e}')
+        finally:
+            self.jm_log_msg_queue.put(end)
+
     def run(self, **kwargs):
         kwargs.setdefault('port', self.DEFAULT_PORT)
         # 添加路由
@@ -263,7 +324,7 @@ class JmServer:
         self.app.add_url_rule('/logout', 'logout', self.logout, methods=['GET', 'POST'])
         self.app.add_url_rule("/download_file/<filename>", 'file_content', self.file_content)
         self.app.add_url_rule("/upload_file", 'upload', self.upload, methods=['GET', 'POST'])
-
+        self.app.add_url_rule("/stream", 'stream', self.stream, methods=['GET', 'POST'])
         # 监听在所有 IP 地址上
         self.app.run(**kwargs)
 

{plugin_jm_server-0.1.20 → plugin_jm_server-0.1.22}/src/plugin_jm_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugin_jm_server
-Version: 0.1.20
+Version: 0.1.22
 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.20/src/plugin_jm_server/__init__.py

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