add configurable download buffer

Nandaka · Nandaka · commit 7a82fd9016b8 · 2023-01-02T19:33:53.000+08:00
diff --git a/PixivConfig.py b/PixivConfig.py
@@ -217,6 +217,7 @@ class PixivConfig():
         ConfigItem("DownloadControl", "postProcessingCmd", ""),
         ConfigItem("DownloadControl", "extensionFilter", ""),
         ConfigItem("DownloadControl", "aiDisplayFewer", False),
+        ConfigItem("DownloadControl", "downloadBuffer", 512, restriction=lambda x: int(x) > 0),
     ]
 
     def __init__(self):
diff --git a/PixivConstant.py b/PixivConstant.py
@@ -26,8 +26,6 @@
 
 HTML_TEMPLATE = '<!DOCTYPE html> <html lang="ja"> <head> <title>%artistName% - %imageTitle%</title> <meta charset="utf-8"> <style type="text/css"> *{margin:0px; padding:0px; max-width:100%; overflow:auto;} body{text-align:center; background-color:#f3f5f8;} h1, h2, h5, p{text-align:left;} h1, h2, h5, p{padding-left:4%; padding-right:4%;} p{word-break:break-word; padding-top:0.5em; padding-bottom:0.5em;} span{padding:0px;} .title{margin-top:2rem; margin-bottom:2rem;} a{margin:auto;} .root{max-width:1280px; margin:auto; background-color:#ffffff;} .caption{display:grid;} .non-article.main, .non-article.images{position:fixed; overflow-y:scroll; background-color:#ffffff;} .non-article.main{top:0px; left:0px; height:100%; width:360px;} .non-article.images{top:0px; left:360px; height:100%;} @media screen and (max-aspect-ratio:4/5){.non-article.main{height:25%; width:100%;} .non-article.images{top:25%; left:0px; height:75%; width:100%;}} </style> </head> <body> <div class="root"> <div class="main"> %coverImage% <div class="title"> <h1>%imageTitle%</h1> <h5>%worksDate%</h5> </div> %body_text(article)% %text(non-article)% </div> %images(non-article)% </div> </body> </html>'
 
-BUFFER_SIZE = 512 * 1024
-
 DOWNLOAD_PIXIV = "Pixiv"
 DOWNLOAD_FANBOX = "Fanbox"
 DOWNLOAD_SKETCH = "Sketch"
diff --git a/PixivHelper.py b/PixivHelper.py
@@ -758,6 +758,8 @@ def makeSubdirs(filename):
 def download_image(url, filename, res, file_size, overwrite):
     ''' Actual download, return the downloaded filesize and saved filename.'''
     start_time = datetime.now()
+    global _config
+    BUFFER_SIZE = _config.downloadBuffer * 1024
 
     # try to save to the given filename + .pixiv extension if possible
     try:
@@ -779,10 +781,8 @@ def download_image(url, filename, res, file_size, overwrite):
     curr = 0
     msg_len = 0
     try:
-        # read the first 4kb for ui refresh
-        save.write(res.read(4096))
         while True:
-            save.write(res.read(PixivConstant.BUFFER_SIZE))
+            save.write(res.read(BUFFER_SIZE))
             curr = save.tell()
             msg_len = print_progress(curr, file_size, msg_len)
 

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@ class PixivConfig():`
`217`	`217`	`ConfigItem("DownloadControl", "postProcessingCmd", ""),`
`218`	`218`	`ConfigItem("DownloadControl", "extensionFilter", ""),`
`219`	`219`	`ConfigItem("DownloadControl", "aiDisplayFewer", False),`
	`220`	`+ ConfigItem("DownloadControl", "downloadBuffer", 512, restriction=lambda x: int(x) > 0),`
`220`	`221`	`]`
`221`	`222`
`222`	`223`	`def __init__(self):`