feat: no-server

Author: dfface

README.md

@@ -21,6 +21,7 @@ It now supports:
 * Code highlight.
 * Remember your last reading chapter.
 * Custom CSS: you can write your own CSS style to improve your reading experience, such as `.content{margin: 50px;}.content p{ font-size: 2rem; }`(All the main content is under the element with the class `content`).
+* Can be directly deployed on any web server such as Apache: use `--no-server` parameter.
 
 ## Usage
 
@@ -41,10 +42,14 @@ epub-browser *.epub
 # Open multiple books under the current path
 epub-browser .
 
+# Do not start the server; only generate static website files, which can be directly deployed on any web server such as Apache.
+epub-browser . --no-server
+
 # Specify the output directory of html files, or use tmp directory by default
 epub-browser book1.epub book2.epub --output-dir /path/to/output
 
-# Save the converted html files, will not clean the target tmp directory
+# Save the converted html files, will not clean the target tmp directory;
+# Note: These files are for inspection purposes only and cannot be directly deployed to a web server. To enable direct deployment, please use the --no-server parameter.
 epub-browser book1.epub --keep-files
 
 # Do not open the browser automatically

epub_browser/library.py

@@ -660,6 +660,30 @@ def create_library_home(self):
 """
         library_html += """<script>
         document.addEventListener('DOMContentLoaded', function() {
+            // 检查当前的基路径
+            base_path = window.location.pathname;
+            if (base_path !== "/") {
+                // 处理所有资源，都要加上基路径
+                addBasePath(base_path);
+            } else {
+            }
+
+            function addBasePath(basePath) {
+                // 处理所有链接、图片、脚本和样式表
+                const resources = document.querySelectorAll('a[href^="/"], img[src^="/"], script[src^="/"], link[rel="stylesheet"][href^="/"]');
+                resources.forEach(resource => {
+                    const src = resource.getAttribute('src');
+                    const href = resource.getAttribute('href');
+                    if (src && !src.startsWith('http') && !src.startsWith('//') && !src.startsWith(basePath)) {
+                        resource.setAttribute('src', basePath.substr(0, basePath.length - 1) + src);
+                    }
+                    if (href && !href.startsWith('http') && !href.startsWith('//') && !href.startsWith(basePath)) {
+                        resource.setAttribute('href', basePath.substr(0, basePath.length - 1) + href);
+                    }
+                });
+            }
+
+
             // 书籍目录锚点
             const allBookLinks = document.querySelectorAll('.book-card .book-link');
             allBookLinks.forEach(item => {
@@ -812,6 +836,30 @@ def create_library_home(self):
         with open(os.path.join(self.base_directory, 'index.html'), 'w', encoding='utf-8') as f:
             f.write(library_html)
 
+    def reorganize_files(self):
+        """按照 href 的格式组织目录"""
+        # 创建 book 目录
+        book_path = os.path.join(self.base_directory, "book")
+        if os.path.exists(book_path):
+            try:
+                shutil.rmtree(book_path)
+                os.mkdir(book_path)
+            except Exception as e:
+                print(f"book_path {book_path} exists, try to recreate failed, err: {e}")
+        else:
+            os.mkdir(book_path)
+        # 把所有书籍移动到对应目录
+        for book_hash, book_info in self.books.items():
+            old_path = book_info['web_dir']
+            old_temp_dir = book_info['temp_dir']
+            cur_path = os.path.join(book_path, book_hash)
+            try:
+                shutil.move(old_path, cur_path)
+                # 删除原来的 temp_dir 目录
+                shutil.rmtree(old_temp_dir)
+            except Exception as e:
+                print(f"move {old_path} to {cur_path} failed, err: {e}")
+    
     def cleanup(self):
         """清理所有文件"""
         if self.output_dir is not None:

epub_browser/main.py

@@ -19,9 +19,9 @@ def main():
     parser.add_argument('--port', '-p', type=int, default=8000, help='Web server port (default: 8000)')
     parser.add_argument('--no-browser', action='store_true', help='Do not automatically open browser')
     parser.add_argument('--output-dir', '-o', help='Output directory for converted books')
-    parser.add_argument('--keep-files', action='store_true', help='Keep converted files after server stops')
+    parser.add_argument('--keep-files', action='store_true', help='Keep converted files after server stops. To enable direct deployment, please use the --no-server parameter.')
     parser.add_argument('--log', action='store_true', help='Enable log messages')
-    parser.add_argument('--no-server', action='store_true', help='Do not start a server, just generate files')
+    parser.add_argument('--no-server', action='store_true', help='Do not start a server, just generate files which can be directly deployed on any web server such as Apache.')
 
     args = parser.parse_args()
 
@@ -51,10 +51,14 @@ def main():
 
     library.create_library_home()
 
-    # 创建服务器
+    # 仅生成文件
     if args.no_server:
+        # 重新组织文件格式
+        library.reorganize_files()
         print(f"Files generated in: {library.base_directory}")
         return
+    
+    # 创建服务器
     server_instance = EPUBServer(library, args.log)
     try:
         server_instance.start_server(

epub_browser/processor.py

@@ -965,12 +965,36 @@ def create_index_page(self):
     <p>EPUB Library &copy; {datetime.now().year} | Powered by <a href="https://github.com/dfface/epub-browser" target="_blank">epub-browser</a></p>
 </footer>
 """
-        index_html += """<script>
-    document.addEventListener('DOMContentLoaded', function() {
+        index_html += f"""<script>
+    document.addEventListener('DOMContentLoaded', function() {{
+        const book_hash = "{self.book_hash}";"""
+        index_html += """
         const path = window.location.pathname;  // 获取当前URL路径
         let pathParts = path.split('/');
         pathParts = pathParts.filter(item => item !== "");
-        const book_hash = pathParts[pathParts.length - 1];
+        
+        // 检查当前的基路径
+        if (!path.startsWith("/book/")) {
+            // 获取基路径
+            let basePath = "/" + pathParts[0] + "/";
+            // 处理所有资源，都要加上基路径
+            addBasePath(basePath);
+        }
+
+        function addBasePath(basePath) {
+            // 处理所有链接、图片、脚本和样式表
+            const resources = document.querySelectorAll('a[href^="/"], img[src^="/"], script[src^="/"], link[rel="stylesheet"][href^="/"]');
+            resources.forEach(resource => {
+                const src = resource.getAttribute('src');
+                const href = resource.getAttribute('href');
+                if (src && !src.startsWith('http') && !src.startsWith('//') && !src.startsWith(basePath)) {
+                    resource.setAttribute('src', basePath.substr(0, basePath.length - 1) + src);
+                }
+                if (href && !href.startsWith('http') && !href.startsWith('//') && !href.startsWith(basePath)) {
+                    resource.setAttribute('href', basePath.substr(0, basePath.length - 1) + href);
+                }
+            });
+        }
 
         // 书籍目录锚点删除
         const anchor = window.location.hash;
@@ -2240,6 +2264,33 @@ def create_chapter_template(self, content, style_links, chapter_index, chapter_t
         const book_hash = "{self.book_hash}";
 """
         chapter_html += """
+            const path = window.location.pathname;  // 获取当前URL路径
+            let pathParts = path.split('/');
+            pathParts = pathParts.filter(item => item !== "");
+
+            // 检查当前的基路径
+            if (!path.startsWith("/book/")) {
+                // 获取基路径
+                let basePath = "/" + pathParts[0] + "/"
+                // 处理所有资源，都要加上基路径
+                addBasePath(basePath);
+            }
+
+            function addBasePath(basePath) {
+                // 处理所有链接、图片、脚本和样式表
+                const resources = document.querySelectorAll('iframe[src^="/"], a[href^="/"], img[src^="/"], script[src^="/"], link[rel="stylesheet"][href^="/"]');
+                resources.forEach(resource => {
+                    const src = resource.getAttribute('src');
+                    const href = resource.getAttribute('href');
+                    if (src && !src.startsWith('http') && !src.startsWith('//') && !src.startsWith(basePath)) {
+                        resource.setAttribute('src', basePath.substr(0, basePath.length - 1) + src);
+                    }
+                    if (href && !href.startsWith('http') && !href.startsWith('//') && !href.startsWith(basePath)) {
+                        resource.setAttribute('href', basePath.substr(0, basePath.length - 1) + href);
+                    }
+                });
+            }
+
             // 自定义CSS功能
             const cssPanelToggle = document.getElementById('cssPanelToggle');
             const cssPanelContent = document.getElementById('cssPanelContent');
@@ -2494,8 +2545,6 @@ def create_chapter_template(self, content, style_links, chapter_index, chapter_t
             wrapAllTables();
 
             // 书籍目录锚点更新
-            const path = window.location.pathname;  // 获取当前URL路径
-            const pathParts = path.split('/');
             const lastPart = pathParts[pathParts.length - 1];
             var anchor = '';
             if (lastPart.startsWith('chapter_') && lastPart.endsWith('.html')) {

epub_browser/server.py

@@ -251,7 +251,7 @@ def create_handler(*args, **kwargs):
             print(f"Web server started: http://{actual_host}:{actual_port}")
             print(f"Available books ({len(self.library.books)}):")
             for book_hash, book_info in self.library.books.items():
-                print(f"  - {book_info['title']}: http://{actual_host}:{actual_port}/book/{book_hash}/")
+                print(f"  - {book_info['title']}: http://{actual_host}:{actual_port}book/{book_hash}/")
             print("Press Ctrl+C to stop the server\n")
 
             # 自动打开浏览器

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="epub-browser",  # 在PyPI上显示的项目名称
-    version="1.2.6",      # 初始版本号
+    version="1.2.7",      # 初始版本号
     author="dfface",   # 作者名
     author_email="dfface@sina.com",  # 作者邮箱
     keywords="epub reader html export browser convert calibre-web calibre kindle",