增加对超过5次采集的图片的处理

Author: Pingze-github

README.md

@@ -1,6 +1,12 @@
 # HuabanBatchUpload
 花瓣网图片批量上传工具
 
+## 功能说明
+这是一个用于向花瓣网批量上传图片的程序。
++ 多线程并发，可以快速上传大量文件
++ 自动传输错误重试
++ 自动图片处理，避免因“图片已经采集超过5次”而上传失败
+
 ## 使用方法 1
 1. 下载代码到本地
 2. 在dist目录中打开命令窗口
@@ -10,3 +16,4 @@
 1. 下载代码到本地
 2. 双击打开 /dist/main.exe，按提示操作即可。
 
+

dist/library.zip

@@ -94,4 +94,11 @@ def post(url,data="",files="",cookies="",headers="",timeout=3,max_try=5):
     return requests.post(url, data=data, files=files, cookies=cookies, headers=headers)
 
 def getHeaders():
-    return {'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36'}
+    return {'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36'}
+
+def decode(str):
+    try :
+        uni = str.decode('utf-8')
+    except:
+        uni = str.decode('gbk')
+    return uni

dist/main.exe

@@ -0,0 +1,11 @@
+# coding=u8
+
+import random
+
+def recreate(imgPath):
+    with open(imgPath, 'rb') as f1:
+        bin = f1.read()
+    bin = bytearray(bin)
+    bin = bin[:-2] + str(random.randint(0,9)) + str(random.randint(0,9))
+    with open(imgPath, 'wb') as f2:
+        f2.write(bin)

lib/lib.py

@@ -3,9 +3,9 @@
 # project: HuabanBatchUpload
 # author: Pingze-github @ Github
 
-import os
-from lib import *
 import time
+from lib import *
+import recreateImg
 
 # global variable
 cookies = {}
@@ -64,7 +64,9 @@ def upload(filepath, board_title, pinname=None, lock=None, tname=None):
     url = "http://huaban.com/pins/"
     res = post(url, data=data, cookies=cookies, headers=headers) # 添加图片文件到画板
     if('<i class="error">' in res.text):
-        printWithLock(u'[{}] 上传失败: 图片 "{}" 已经被采集超过5次'.format(time.asctime()[11:19], filename), lock);
+        printWithLock(u'[{}] 上传失败: 图片 "{}" 已经被采集超过5次，准备处理图片后重试...'.format(time.asctime()[11:19], filename), lock);
+        recreateImg.recreate(filepath)
+        upload(filepath, board_title, pinname, lock, tname)
     elif json_parse(res.text)!=None:
         data = json_parse(res.text)
         printWithLock (u'[{}] 上传成功: 图片 "{}" 到画板 "{}"'.format(time.asctime()[11:19], filename, board_title), lock);

lib/recreateImg.py

@@ -8,16 +8,17 @@
 from lib.batch import batchUpload
 from lib.auth import getCookie
 from lib.auth import testCookie
-from lib.lib import json_parse, json_stringify
+from lib.lib import json_parse, json_stringify, decode
 import lib.inputPre as inputPre
 
+
 # TODO 处理图片来避免因过多采集而上传失败
 
 def main():
     account = '' # 账户名
     password = '' # 密码
-    dirpath = '' # 要上传的图片所在目录
     boardName = '' # 要上传到的画板名
+    dirpath = '' # 要上传的图片所在目录
     if len(sys.argv) < 2:
         paramMap = inputPre.get([
             {'key': 'account', 'name': u'账户名'},
@@ -27,17 +28,19 @@ def main():
         ])
         account = paramMap['account']
         password = paramMap['password']
-        dirpath = paramMap['dirpath']
         boardName = paramMap['boardname']
+        dirpath = paramMap['dirpath']
     # 优先接受命令行参数
     if len(sys.argv) >= 2:
         account = sys.argv[1]
     if len(sys.argv) >= 3:
         password = sys.argv[2]
     if len(sys.argv) >= 4:
         boardName = sys.argv[3]
+        boardName = decode(boardName)
     if len(sys.argv) >= 5:
         dirpath = sys.argv[4]
+        dirpath = decode(dirpath)
     if not account or not password:
         print(u'未设定账密')
         return