fix #219

miyouzi · Nov 8, 2022 · 244b577 · 244b577
1 parent b21dfdb
commit 244b577
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Config.py b/Config.py
@@ -21,7 +21,7 @@
 sn_list_path = os.path.join(working_dir, 'sn_list.txt')
 cookie_path = os.path.join(working_dir, 'cookie.txt')
 logs_dir = os.path.join(working_dir, 'logs')
-aniGamerPlus_version = 'v24.4'
+aniGamerPlus_version = 'v24.5'
 latest_config_version = 17.2
 latest_database_version = 2.0
 cookie = None

diff --git a/README.md b/README.md
@@ -407,32 +407,28 @@ sqlite3資料庫, 可以使用 [SQLite Expert](http://www.sqliteexpert.com/) 等
 參數:
 ```
 >python3 aniGamerPlus.py -h
-當前aniGamerPlus版本: v24.0
-usage: aniGamerPlus.py [-h] [--sn SN]
-                       [--resolution {360,480,540,576,720,1080}]
-                       [--download_mode {single,latest,largest-sn,multi,all,range,list,sn-list,sn-range}]
-                       [--thread_limit THREAD_LIMIT] [--current_path]
-                       [--episodes EPISODES] [--no_classify]
-                       [--information_only] [--user_command] [--danmu] [--my_anime]
+當前aniGamerPlus版本: v24.4
+usage: aniGamerPlus.py [-h] [--sn SN] [--resolution {360,480,540,576,720,1080}] [--download_mode {single,latest,largest-sn,multi,all,range,list,sn-list,sn-range,db}]
+                       [--thread_limit THREAD_LIMIT] [--current_path] [--episodes EPISODES] [--no_classify] [--user_command] [--information_only] [--danmu] [--my_anime]
 
 optional arguments:
   -h, --help            show this help message and exit
   --sn SN, -s SN        視頻sn碼(數字)
   --resolution {360,480,540,576,720,1080}, -r {360,480,540,576,720,1080}
                         指定下載清晰度(數字)
-  --download_mode {single,latest,largest-sn,multi,all,range,list,sn-list,sn-range}, -m {single,latest,largest-sn,multi,all,range,list,sn-list,sn-range}
+  --download_mode {single,latest,largest-sn,multi,all,range,list,sn-list,sn-range,db}, -m {single,latest,largest-sn,multi,all,range,list,sn-list,sn-range,db}
                         下載模式
   --thread_limit THREAD_LIMIT, -t THREAD_LIMIT
                         最高并發下載數(數字)
   --current_path, -c    下載到當前工作目錄
   --episodes EPISODES, -e EPISODES
                         僅下載指定劇集
   --no_classify, -n     不建立番劇資料夾
-  --information_only, -i
-                        僅查詢資訊
   --user_command, -u    所有下載完成后執行用戶命令
-  --danmu, -d           以 `.ass` 下載彈幕
-  --my_anime            匯出「我的動畫」至 `my_anime.txt`，和 sn_list 所需的格式相同
+  --information_only, -i
+                        僅查詢資訊，可搭配 -d 更新彈幕
+  --danmu, -d           以 .ass 下載彈幕
+  --my_anime            匯出「我的動畫」至my_anime.txt
 ```
 
  - **-s** 接要下載視頻的sn碼,不可空
@@ -458,6 +454,8 @@ optional arguments:
     - **sn-list** 讀取 sn_list 中的指定sn進行下載, sn後面的模式設定會被忽略，僅下載單個sn, 並會將任務狀態記錄在資料庫中. **此模式無法通過```-r```參數指定解析度**
 
     - **sn-range** 下載此番据指定sn範圍的劇集, 對於劇集名稱不是正整數的番劇, 可以用此模式
+
+    - **db** 更新資料庫中所有動畫的彈幕
 
  - **-t** 接最大并發下載數, 可空, 空則讀取**config.json**中的定義
 

diff --git a/aniGamerPlus.py b/aniGamerPlus.py
@@ -65,6 +65,7 @@ def build_anime(sn):
         err_print(sn, '抓取異常', '異常詳情:\n'+traceback.format_exc(), status=1, display=False)
     return anime
 
+
 def read_db_all():
     db_locker.acquire()
     conn = sqlite3.connect(db_path)
@@ -424,7 +425,8 @@ def __download_only(sn, dl_resolution='', dl_save_dir='', realtime_show_file_siz
                 err_print(sn, '下載異常', '異常詳情:\n'+traceback.format_exc(), status=1, display=False)
                 anime.video_size = 0
 
-    thread_limiter.release()
+    download_cd = threading.Thread(target=download_cd_counter)
+    download_cd.start()
 
 
 def __get_info_only(sn):