Merge pull request #1 from wwwpf/master

fix

download.py

@@ -14,9 +14,10 @@
 
 @logging_wrap
 def download_media(url, dir, file_name):
+    result = False
     s = "\rdownloading %s -> %05.2f%% "
     chunk_size = 1024
-    with closing(requests.get(url, stream=True)) as r:
+    with requests.get(url, stream=True, timeout=30) as r:
         extension = "jpg"
         if "content-type" in r.headers:
             content_type = r.headers["content-type"]
@@ -36,7 +37,9 @@ def download_media(url, dir, file_name):
                 current_len += len(data)
                 percent = 100 * current_len / total_len
                 print(s % (url, percent), end="")
-    print("\n%s is downloaded" % url)
+        result = True
+        print("\n%s is downloaded" % url)
+    return result
 
 
 @logging_wrap
@@ -115,7 +118,7 @@ def download(self):
 
                     download_dir = temp[1]
                     id = temp[2]
-                    download_media(url, download_dir, id)
-                    fupdate.write("%s\n" % url)
-                    fupdate.flush()
+                    if download_media(url, download_dir, id):
+                        fupdate.write("%s\n" % url)
+                        fupdate.flush()
         print("downloading done")

tools.py

@@ -31,6 +31,10 @@ def get_json_data_from_response(resp_text):
 
 
 def purge_file_name(file_name):
+    temp = file_name
+    file_name = ""
+    for c in temp:
+        file_name += "_" if c.isspace() else c
     escape_chars = "/\\:*?\"<>|"
     for c in escape_chars:
         file_name = file_name.replace(c, "%%%X" % ord(c))