refactor with enumerate

WebCrawler/storyline.py

@@ -56,20 +56,19 @@ def getStoryline(number, title, sites: list=None):
                 return value
         return ''
     # 以下debug结果输出会写入日志，进程池中的则不会，只在标准输出中显示
-    cnt = len(apply_sites)
+    s = f'[!]Storyline{G_mode_txt[run_mode]}模式运行{len(apply_sites)}个进程总用时(含启动开销){time.time() - start_time:.3f}秒，结束于{time.strftime("%H:%M:%S")}'
-    s = f'[!]Storyline{G_mode_txt[run_mode]}模式运行{cnt}个进程总用时(含启动开销){time.time() - start_time:.3f}秒，结束于{time.strftime("%H:%M:%S")}'
     first = True
     sel = ''
-    for i in range(cnt):
+    for i, site in enumerate(apply_sites):
-        sl = len(result[i])if isinstance(result[i], str) else 0
+        sl = len(result[i]) if isinstance(result[i], str) else 0
         if sl and first:
-            s += f'，[选中{apply_sites[i]}字数:{sl}]'
+            s += f'，[选中{site}字数:{sl}]'
             first = False
             sel = result[i]
         elif sl:
-            s += f'，{apply_sites[i]}字数:{sl}'
+            s += f'，{site}字数:{sl}'
         else:
-            s += f'，{apply_sites[i]}:空'
+            s += f'，{site}:空'
     print(s)
     return sel
 
@@ -149,10 +148,10 @@ def getStoryline_58avgo(number, debug):
             raise ValueError("number not found")
         s = browser.page.select('div.resultcontent > ul > li.listItem > div.one-info-panel.one > a.ga_click')
         link = None
-        for i in range(len(s)):
+        for a in s:
-            title = s[i].h3.text.strip()
+            title = a.h3.text.strip()
             if re.search(number, title, re.I):
-                link = s[i]
+                link = a
                 break
         if link is None:
             raise ValueError("number not found")
@@ -184,11 +183,11 @@ def getStoryline_avno1(number, debug):  #获取剧情介绍 从avno1.cc取得
         if not result.ok:
             raise ValueError(f"get_html_by_form('{url}','{number}') failed")
         s = browser.page.select('div.type_movie > div > ul > li > div')
-        for i in range(len(s)):
+        for div in s:
-            title = s[i].a.h3.text.strip()
+            title = div.a.h3.text.strip()
             page_number = title[title.rfind(' '):].strip()
             if re.search(number, page_number, re.I):
-                return s[i]['data-description'].strip()
+                return div['data-description'].strip()
         raise ValueError(f"page number ->[{page_number}] not match")
     except Exception as e:
         if debug:
@@ -270,32 +269,29 @@ def amazon_select_one(a_titles, q_title, number, debug):
     sel = -1
     ratio = 0
     que_t = ''.join(c for c in q_title if not re.match(r'(P|S|Z).*', category(c), re.A))
-    for loc in range(len(a_titles)):
+    for tloc, title in enumerate(a_titles):
-        t = a_titles[loc]
+        if re.search(number, title, re.I): # 基本不带番号，但也有极个别有的，找到番号相同的直接通过
-        if re.search(number, t, re.I): # 基本不带番号，但也有极个别有的，找到番号相同的直接通过
+            return tloc
-            return loc
+        if not re.search('DVD|Blu-ray', title, re.I):
-        if not re.search('DVD|Blu-ray', t, re.I):
             continue
-        ama_t = str(re.sub('DVD|Blu-ray', "", t, re.I))
+        ama_t = str(re.sub('DVD|Blu-ray', "", title, re.I))
         ama_t = ''.join(c for c in ama_t if not re.match(r'(P|S|Z).*', category(c), re.A))
         findlen = 0
         lastpos = -1
-        cnt = len(ama_t)
+        for cloc, char in reversed(tuple(enumerate(ama_t))):
-        for c in reversed(ama_t):
+            pos = que_t.rfind(char)
-            cnt -= 1
-            pos = que_t.rfind(c)
             if lastpos >= 0:
-                pos_near = que_t[:lastpos].rfind(c)
+                pos_near = que_t[:lastpos].rfind(char)
                 if pos_near < 0:
                     findlen = 0
                     lastpos = -1
-                    ama_t = ama_t[:cnt+1]
+                    ama_t = ama_t[:cloc+1]
                 else:
                     pos = pos_near
             if pos < 0:
-                if category(c) == 'Nd':
+                if category(char) == 'Nd':
                     return -1
-                ama_t = ama_t[:cnt]
+                ama_t = ama_t[:cloc]
                 findlen = 0
                 lastpos = -1
                 continue
@@ -311,7 +307,7 @@ def amazon_select_one(a_titles, q_title, number, debug):
             return -1
         r = SequenceMatcher(None, ama_t, que_t).ratio()
         if r > ratio:
-            sel = loc
+            sel = tloc
             ratio = r
             save_t_ = ama_t
             if ratio > 0.999:

core.py

@@ -232,11 +232,11 @@ def extrafanart_download_threadpool(url_list, save_dir, number):
     extrafanart_dir = Path(save_dir) / conf.get_extrafanart()
     download_only_missing_images = conf.download_only_missing_images()
     mp_args = []
-    for i in range(len(url_list)):
+    for i, url in enumerate(url_list, start=1):
-        jpg_fullpath = extrafanart_dir /  f'extrafanart-{i+1}.jpg'
+        jpg_fullpath = extrafanart_dir /  f'extrafanart-{i}.jpg'
         if download_only_missing_images and not file_not_exist_or_empty(jpg_fullpath):
             continue
-        mp_args.append((url_list[i], jpg_fullpath))
+        mp_args.append((url, jpg_fullpath))
     if not len(mp_args):
         return
     extrafanart_dir.mkdir(parents=True, exist_ok=True)
@@ -246,11 +246,11 @@ def extrafanart_download_threadpool(url_list, save_dir, number):
     with ThreadPoolExecutor(parallel) as pool:
         result = list(pool.map(download_one_file, mp_args))
     failed = 0
-    for i in range(len(result)):
+    for i, r in enumerate(result, start=1):
-        if not result[i]:
+        if not r:
-            print(f'[-]Extrafanart {i+1} for [{number}] download failed!')
             failed += 1
-    if not all(result): # 非致命错误，电影不移入失败文件夹，将来可以用模式3补齐
+            print(f'[-]Extrafanart {i} for [{number}] download failed!')
+    if failed: # 非致命错误，电影不移入失败文件夹，将来可以用模式3补齐
         print(f"[-]Failed downloaded {failed}/{len(result)} extrafanart images for [{number}] to '{extrafanart_dir}', you may retry run mode 3 later.")
     else:
         print(f"[+]Successfully downloaded {len(result)} extrafanart to '{extrafanart_dir}'")