diff --git a/.gitignore b/.gitignore index 44b16ed..b4493d6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ /.idea /__pycache /tmp_video +/tmp_audio /__pycache__ \ No newline at end of file diff --git a/main.py b/main.py index 55b79e0..38e0900 100755 --- a/main.py +++ b/main.py @@ -162,18 +162,14 @@ def uploadfile(caption,filename, mimetype): rmediajson = {"i": misskey_token} files = {'file': (filename, open(filename, "rb"), mimetype)} try: - trycount=0 mediapost = requests.post(misskey_instance+'/api/drive/files/create', timeout=10, data=rmediajson, files=files) except: - trycount = trycount + 1 - if trycount >= 3: - logging.info(f"服务器超时") - else: - mediapost = requests.post(misskey_instance+'/api/drive/files/create', timeout=10, data=rmediajson, files=files) + logging.info(f"上传失败") + break media_id_list=[] media_id_list.append(json.loads(mediapost.text)["id"]) rjson = {'text': caption, "localOnly": False, "visibility": misskey_visibility, - "fileIds": media_id_list, "viaMobile": False, "i": misskey_token} + "fileIds": media_id_list, "viaMobile": False, "i": misskey_token} logging.info(f"上传成功") return rjson