Merge pull request #190 from 68cdrBxM8YdoJ/fix-update-check

Use github's release api for version checking

AV_Data_Capture.py

@@ -13,18 +13,21 @@ from configparser import ConfigParser
 import argparse
 
 
-def UpdateCheck_Notice(htmlcode,version):
+def check_update(current_version):
-    if UpdateCheckSwitch() == '1':
+    if UpdateCheckSwitch() == "1":
-        html = json.loads(str(htmlcode))
+        data = json.loads(get_html("https://api.github.com/repos/yoshiko2/AV_Data_Capture/releases/latest"))
 
-        if not version == html['version']:
+        remote_version = data["tag_name"]
-            line1 = '* New update ' + html['version'] + ' *'
+        download_url = data["html_url"]
-            print('[*]' + line1.center(54))
+
-            print('[*]' + '↓ Download ↓'.center(54))
+        if current_version != remote_version:
-            print('[*] ' + html['download'])
+            line1 = "* New update " + remote_version + " *"
-            print('[*]======================================================')
+            print("[*]" + line1.center(54))
+            print("[*]" + "↓ Download ↓".center(54))
+            print("[*] " + download_url)
+            print("[*]======================================================")
     else:
-        print('[+]Update Check disabled!')
+        print("[+]Update Check disabled!")
 
 def argparse_get_file():
     parser = argparse.ArgumentParser()
@@ -101,12 +104,11 @@ if __name__ == '__main__':
     escape_folder = config['escape']['folders']  # 多级目录刮削需要排除的目录
     escape_folder = re.split('[,，]', escape_folder)
     version_print = 'Version ' + version
-    htmlcode = get_html('https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/update_check.json')
     print('[*]================== AV Data Capture ===================')
     print('[*]' + version_print.center(54))
     print('[*]======================================================')
 
-    UpdateCheck_Notice(htmlcode,version)
+    check_update(version)
     CreatFailedFolder(failed_folder)
     os.chdir(os.getcwd())
     movie_list = movie_lists('.', escape_folder)

update_check.json

@@ -1,5 +0,0 @@
-{
-	"version": "3.0",
-	"version_show": "3.0",
-	"download": "https://github.com/yoshiko2/AV_Data_Capture/releases"
-}