v0.85

微修

layout_button.py

@@ -233,9 +233,9 @@ def create_mp4(self):
 
         def check():
             return_code = process.poll()
-            print('return_code', return_code)
+            # print('return_code', return_code)
             if return_code is None:
-                win.after(100, check)
+                win.after(1000, check)
                 return
 
             win.grab_release()

m3u8.py

@@ -56,10 +56,9 @@ def main(dir: str, video_url: str, cache):
             if time.time() - get_m3u8_url_last_time > 60:
                 temp_url = get_hinet_m3u8_url(proxies=proxies)
                 # temp_url = get_4gtv_m3u8_url(proxies=proxies)
-                if temp_url is None:
-                    pass
-                url = temp_url
-                get_m3u8_url_last_time = time.time()
+                if temp_url is not None:
+                    url = temp_url
+                    get_m3u8_url_last_time = time.time()
         if url is None:
             continue
 
@@ -135,6 +134,7 @@ def get_4gtv_m3u8_url(proxies: dict):
 
     except Exception as ex:
         print('M3u8Key 错误', ex)
+    return None
 
 
 # hinet的源
@@ -158,6 +158,7 @@ def get_hinet_m3u8_url(proxies: dict):
 
     except Exception as ex:
         print('M3u8Key 错误', ex)
+    return None
 
 
 def save_hls_m3u8_list_file():

main.py

@@ -21,7 +21,7 @@
 
 cache = my_cache.cache
 
-version: float = 0.84
+version: float = 0.85
 
 if __name__ == '__main__':
     freeze_support()

utils.py

@@ -1,9 +1,8 @@
 import hashlib
+import os
 import socket
 import subprocess
 from sys import platform
-import os
-import json
 from urllib.parse import urlparse
 
 from requests import get
@@ -85,7 +84,7 @@ def to_md5(string):
     return m.hexdigest()
 
 
-def popen_env()->dict:
+def popen_env() -> dict:
     env = os.environ.copy()
     env['PATH'] = '/usr/local/bin:' + env['PATH']
-    return env
+    return env