diff --git a/.DS_Store b/.DS_Store index 685e7f7..4fa2140 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app.py b/app.py index 3e8ac81..aa058bd 100644 --- a/app.py +++ b/app.py @@ -17,6 +17,7 @@ import os import subprocess import json +import time from flask import Flask, render_template, request app = Flask(__name__) @@ -26,10 +27,10 @@ app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER -BEARER_TOKEN = '' +BEARER_TOKEN = os.environ.get('MEMOS_BEARER_TOKEN') HEADERS = {'Authorization': 'Bearer ' + BEARER_TOKEN} SAVE_PATH = os.path.join(app.config['UPLOAD_FOLDER'], '') - +IMAGE_COUTER = 'download.jpg' def upload_memos(pic_url): save_path, image_name = download_pic_request(pic_url) @@ -38,6 +39,9 @@ def upload_memos(pic_url): r_list = get_memos_with_id(31) print(r_list) pic_id = post_memo_blob(save_path) + if not pic_id: + print('upload to memos failed.') + return None memo_pic_url = 'https://memos.henryhe.cn/o/r/' r_list.append(pic_id) print(r_list) @@ -61,8 +65,10 @@ def cwebp_convert_pic(name): return result_path def download_pic_request(pic_url): - url = pic_url.split('?')[0] - image_name = pic_url.split('/')[4].split('?')[0] + # url = pic_url.split('?')[0] + # image_name = pic_url.split('/')[4].split('?')[0] + url = pic_url + image_name = str((int)(time.time())) + '_' + IMAGE_COUTER response = requests.get(url) if response.status_code == 200: with open(SAVE_PATH + '/' + image_name, 'wb') as f: @@ -80,6 +86,7 @@ def post_memo_blob(filepath): # filepath: '/Users/henryhe/t.webp' files = {'file': open(filepath, 'rb')} final_resp = requests.post('https://memos.henryhe.cn/api/v1/resource/blob', files=files, headers=HEADERS) + print(final_resp.json()) # 获取id pic_id = final_resp.json().get('id') return pic_id diff --git a/blog_oss.py b/blog_oss.py index e5cd639..479d798 100644 --- a/blog_oss.py +++ b/blog_oss.py @@ -13,6 +13,7 @@ # 再调用 memo接口 携带资源生成PicGO memo. +from DrissionPage import WebPage import requests import os import subprocess @@ -58,14 +59,6 @@ def download_pic(pic_url): page.download(pic_url, SAVE_PATH) return SAVE_PATH + '/' + image_name, image_name -def download_pic_request(pic_url): - image_name = pic_url.split('/')[4].split('?')[0] - response = requests.get(pic_url) - if response.status_code == 200: - with open(SAVE_PATH + '/' + image_name, 'wb') as f: - f.write(response.content) - - def get_memos_with_id(id): response = requests.get('https://memos.henryhe.cn/api/v1/memo/' + str(id), headers=HEADERS) # print(response.json().get('resourceList')) diff --git a/uploads/1241175-3ffb9015aa085bdd.png.webp b/uploads/1241175-3ffb9015aa085bdd.png.webp deleted file mode 100644 index b6fc554..0000000 Binary files a/uploads/1241175-3ffb9015aa085bdd.png.webp and /dev/null differ