调整逻辑,增大池,过滤小于10k的 png

Dockerfile

@@ -15,7 +15,6 @@ RUN sed -i 's/security.ubuntu/mirrors.aliyun/g' /etc/apt/sources.list && \
     rm -rf /var/lib/apt/lists/* && \
     pip3 install flask requests
 
-MAINTAINER v2
 RUN git clone https://gitee.com/ider001/api-pdf2htmlex.git
 
 EXPOSE 5000

README.md

@@ -3,3 +3,69 @@
 run.py  api 服务
 
 pdf2htmlEX 替代原有的 bin 程序
+
+
+
+./pdf2htmlEX --embed-outline 0 --embed-css 1 --embed-font 0 --embed-external-font 0 --embed-image 1 --embed-javascript 0 --external-hint-tool ttfautohint --no-drm 0 --dest-dir ./tmp
+
+
+```
+sage: pdf2htmlEX [options] <input.pdf> [<output.html>]
+  -f,--first-page <int>         first page to convert (default: 1)
+  -l,--last-page <int>          last page to convert (default: 2147483647)
+  --zoom <fp>                   zoom ratio
+  --fit-width <fp>              fit width to <fp> pixels
+  --fit-height <fp>             fit height to <fp> pixels
+  --use-cropbox <int>           use CropBox instead of MediaBox (default: 1)
+  --hdpi <fp>                   horizontal resolution for graphics in DPI (default: 144)
+  --vdpi <fp>                   vertical resolution for graphics in DPI (default: 144)
+  --embed <string>              specify which elements should be embedded into output
+  --embed-css <int>             embed CSS files into output (default: 1)
+  --embed-font <int>            embed font files into output (default: 1)
+  --embed-image <int>           embed image files into output (default: 1)
+  --embed-javascript <int>      embed JavaScript files into output (default: 1)
+  --embed-outline <int>         embed outlines into output (default: 1)
+  --split-pages <int>           split pages into separate files (default: 0)
+  --dest-dir <string>           specify destination directory (default: ".")
+  --css-filename <string>       filename of the generated css file (default: "")
+  --page-filename <string>      filename template for split pages  (default: "")
+  --outline-filename <string>   filename of the generated outline file (default: "")
+  --process-nontext <int>       render graphics in addition to text (default: 1)
+  --process-outline <int>       show outline in HTML (default: 1)
+  --process-annotation <int>    show annotation in HTML (default: 0)
+--process-form <int>          include text fields and radio buttons (default: 0)
+--printing <int>              enable printing support (default: 1)
+--fallback <int>              output in fallback mode (default: 0)
+--tmp-file-size-limit <int>   Maximum size (in KB) used by temporary files, -1 for no limit. (default: -1)
+--embed-external-font <int>   embed local match for external fonts (default: 1)
+--font-format <string>        suffix for embedded font files (ttf,otf,woff,svg) (default: "woff")
+--decompose-ligature <int>    decompose ligatures, such as fi -> fi (default: 0)
+--auto-hint <int>             use fontforge autohint on fonts without hints (default: 0)
+--external-hint-tool <string> external tool for hinting fonts (overrides --auto-hint) (default: "")
+--stretch-narrow-glyph <int>  stretch narrow glyphs instead of padding them (default: 0)
+--squeeze-wide-glyph <int>    shrink wide glyphs instead of truncating them (default: 1)
+--override-fstype <int>       clear the fstype bits in TTF/OTF fonts (default: 0)
+--process-type3 <int>         convert Type 3 fonts for web (experimental) (default: 0)
+--heps <fp>                   horizontal threshold for merging text, in pixels (default: 1)
+--veps <fp>                   vertical threshold for merging text, in pixels (default: 1)
+--space-threshold <fp>        word break threshold (threshold * em) (default: 0.125)
+--font-size-multiplier <fp>   a value greater than 1 increases the rendering accuracy (default: 4)
+--space-as-offset <int>       treat space characters as offsets (default: 0)
+--tounicode <int>             how to handle ToUnicode CMaps (0=auto, 1=force, -1=ignore) (default: 0)
+--optimize-text <int>         try to reduce the number of HTML elements used for text (default: 0)
+--correct-text-visibility <int> try to detect texts covered by other graphics and properly arrange them (default: 0)
+--bg-format <string>          specify background image format (default: "png")
+--svg-node-count-limit <int>  if node count in a svg background image exceeds this limit, fall back this page to bitmap background; negative value means no limit. (default: -1)
+--svg-embed-bitmap <int>      1: embed bitmaps in svg background; 0: dump bitmaps to external files if possible. (default: 1)
+-o,--owner-password <string>  owner password (for encrypted files)
+-u,--user-password <string>   user password (for encrypted files)
+--no-drm <int>                override document DRM settings (default: 0)
+--clean-tmp <int>             remove temporary files after conversion (default: 1)
+--tmp-dir <string>            specify the location of temporary directory. (default: "/tmp")
+--data-dir <string>           specify data directory (default: "/usr/local/share/pdf2htmlEX")
+--poppler-data-dir <string>   specify poppler data directory (default: "")
+--debug <int>                 print debugging information (default: 0)
+--proof <int>                 texts are drawn on both text layer and background for proof. (default: 0)
+-v,--version                  print copyright and version info
+-h,--help                     print usage information
+```

pdf2htmlEX

@@ -7,7 +7,7 @@ import zipfile
 import tempfile
 import subprocess
 
-api_urls = ['http://localhost:5000/pdf2htmlEX','http://192.168.1.220:5000/pdf2htmlEX']
+api_urls = ['http://localhost:5000/pdf2htmlEX','http://lambdax.cn:5000/pdf2htmlEX']
 BIN = "/usr/local/bin/pdf2htmlEX"
 
 def remote_convert(src, dst, argv):

run.py

@@ -14,8 +14,8 @@
 
 app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
 app.config['COUNT'] = 0
-app.config['executor_large'] = ThreadPoolExecutor(max_workers=1)
-app.config['executor_small'] = ThreadPoolExecutor(max_workers=5)
+app.config['executor_large'] = ThreadPoolExecutor(max_workers=3)
+app.config['executor_small'] = ThreadPoolExecutor(max_workers=10)
 app.config['executor_file'] = ThreadPoolExecutor(max_workers=5)
 
 app.config['SESSION_TYPE'] = 'filesystem'
@@ -81,11 +81,12 @@ def pdf2htmlEX(pdf_path,command):
     with zipfile.ZipFile(fp, 'w') as myzip:
         for obj in os.walk(folder_path):
             for file_name in obj[2]:
-                # 不要 png
-                if file_name.endswith('.png'):
-                    continue
-
+
                 file_path = obj[0] + os.sep + file_name
+                #  png 过滤
+                if file_name.endswith('.png') and os.path.getsize(file_path) < 10 * 1024:
+                    continue
+
                 myzip.write(file_path,arcname=file_path.replace(folder_path,'').lstrip('/'))
     app.config['executor_file'].submit(shutil.rmtree, folder_path)
     fp.seek(0)