Merge remote-tracking branch 'origin/master'

pull/1344/head
gedoor 3 years ago
commit 99d12e5ce2
  1. 5
      .github/scripts/lzy_web.py
  2. 1
      .github/workflows/test.yml

@ -56,15 +56,14 @@ def upload_file(file_dir, folder_id):
"name": file_name, "name": file_name,
} }
files = {'upload_file': (file_name, open(file_dir, "rb"), 'application/octet-stream')} files = {'upload_file': (file_name, open(file_dir, "rb"), 'application/octet-stream')}
res = requests.post(url_upload, data=post_data, files=files, headers=headers, cookies=cookie, timeout=120, res = requests.post(url_upload, data=post_data, files=files, headers=headers, cookies=cookie, timeout=120).json()
verify=True).json()
log(f"{file_dir} -> {res['info']}") log(f"{file_dir} -> {res['info']}")
return res['zt'] == 1 return res['zt'] == 1
# 上传文件夹内的文件 # 上传文件夹内的文件
def upload_folder(folder_dir, folder_id): def upload_folder(folder_dir, folder_id):
file_list = os.listdir(folder_dir) file_list = sorted(os.listdir(folder_dir), reverse=True)
for file in file_list: for file in file_list:
path = os.path.join(folder_dir, file) path = os.path.join(folder_dir, file)
if os.path.isfile(path): if os.path.isfile(path):

@ -109,6 +109,7 @@ jobs:
- working-directory: apk/ - working-directory: apk/
run: mv */*.apk . ;rm -rf */ run: mv */*.apk . ;rm -rf */
- name: Upload To Lanzou - name: Upload To Lanzou
continue-on-error: true
run: | run: |
path="$GITHUB_WORKSPACE/apk/" path="$GITHUB_WORKSPACE/apk/"
python3 $GITHUB_WORKSPACE/.github/scripts/lzy_web.py "$path" "$LANZOU_FOLDER_ID" python3 $GITHUB_WORKSPACE/.github/scripts/lzy_web.py "$path" "$LANZOU_FOLDER_ID"

Loading…
Cancel
Save