From 9fea76633219e12c74d2e9f58aa7ed6ebd02c221 Mon Sep 17 00:00:00 2001
From: lock <srleo@qq.com>
Date: Sun, 2 Jun 2019 00:42:31 +0800
Subject: [PATCH] =?UTF-8?q?v0.85=20=E5=BE=AE=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout_button.py | 4 ++--
 m3u8.py          | 9 +++++----
 main.py          | 2 +-
 utils.py         | 7 +++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/layout_button.py b/layout_button.py
index 17f7467..1f3f953 100644
--- a/layout_button.py
+++ b/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()
diff --git a/m3u8.py b/m3u8.py
index 266b27a..d4bb6d8 100644
--- a/m3u8.py
+++ b/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():
diff --git a/main.py b/main.py
index b1686a1..34b9f0d 100644
--- a/main.py
+++ b/main.py
@@ -21,7 +21,7 @@
 
 cache = my_cache.cache
 
-version: float = 0.84
+version: float = 0.85
 
 if __name__ == '__main__':
     freeze_support()
diff --git a/utils.py b/utils.py
index fec0e8c..e0b5813 100644
--- a/utils.py
+++ b/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
\ No newline at end of file
+    return env