From cd0ec23438ad78efdbdc74f5093cbf7d9aaf812f Mon Sep 17 00:00:00 2001
From: chliny <chliny11@gmail.com>
Date: Fri, 27 Sep 2013 14:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B7=BB=E5=8A=A0BT=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E4=BB=8D=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0BT?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README    |  2 ++
 xfdown.py | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 43368b7..31ff274 100644
--- a/README
+++ b/README
@@ -7,3 +7,5 @@ http://lixian.qq.com/
 可实现多线程，断点续传等特性
 
 12 12 29 修复腾讯改版后无法登陆，和登陆验证referer
+
+13 09 27 支持添加BT任务，但仍无法实现将BT文件信息上传，因此离线服务器已有的资源能够秒下，但其他种子会出现下载失败需要在网页上添加。
diff --git a/xfdown.py b/xfdown.py
index 652edf2..4a0b1ea 100755
--- a/xfdown.py
+++ b/xfdown.py
@@ -376,14 +376,17 @@ def __addtask(self):
             btfilename = "#".join(btfilenames)
             btfilesize = "#".join(btsizes)
 
-            fileinfo = open(url,'rb').read()
+            fileinfo = open(url).read()
+            #fileinfo = self.__toUnicode(fileinfo).encode("utf8")
+            #print fileinfo
             data1={"name":"myfile",
                    "Content-Disposition":"form-data",
                    "filename":filename,
                    "Content-Type":"application/x-bittorrent",
                     "myfile":fileinfo,
                   }
-            #print data1
+            data1={"myfile":fileinfo}
+
             data2={"cmd":"add_bt_task",
                    #多个文件名以#隔开
                   "filename":btfilename,
@@ -398,7 +401,7 @@ def __addtask(self):
 
             urlv1="http://lixian.qq.com/handler/bt_handler.php?cmd=readinfo"
             istr = self.__request(urlv1,data1)
-            #print istr
+            print istr
             
             urlv2="http://lixian.qq.com/handler/xfjson2012.php"
             istr = self.__request(urlv2,data2)
@@ -422,7 +425,10 @@ def __toUnicode(self,word):
         try:
             word = word.decode("utf8")
         except:
-            word = word.decode("GBK")
+            try:
+                word = word.decode("GBK")
+            except:
+                word = word.decode("latin")
 
         return word