Fix error in upload progress updating (houtianze#260); Add in aria2 downloading retry (houtianze#263)

houtianze · houtianze · commit 76037cde7992 · 2016-06-13T21:02:26.000+08:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,6 @@
 ### Version History:
 
+- 1.2.20: Fix an error in upload resuming; Add in retries for aria2
 - 1.2.19: Add in aria2 download support
 - 1.2.18: Add in upload resuming using slices; Fix Unicode issue with py2_jsondump(); Fix the pypi setup package
 - 1.2.17: Fix UnicodeEncodeError on redirect; Add in retry on urllib3 TimeOutError
diff --git a/bypy.py b/bypy.py
@@ -44,7 +44,7 @@
 from __future__ import division
 
 ### special variables that say about this module
-__version__ = '1.2.19'
+__version__ = '1.2.20'
 
 ### return (error) codes
 # they are put at the top because:
@@ -2366,7 +2366,7 @@ def __update_progress_entry(self, fullpath):
 
 	def __delete_progress_entry(self, fullpath):
 		progress = jsonload(ProgressPath)
-		progress.remove(fullpath)
+		del progress[fullpath]
 		jsondump(progress, ProgressPath)
 
 	def __upload_file_slices(self, localpath, remotepath, ondup = 'overwrite'):
@@ -2820,7 +2820,9 @@ def __down_aria2c(self, remotefile, localfile):
 		self.pd("call: {}".format(cmd))
 		ret = subprocess.call(cmd, shell = True)
 		self.pd("aria2c exited with status: {}".format(ret))
-		# TODO: map return codes to our internal errors
+		# TODO: a finer map return codes to our internal errors
+		if ret != ENoError:
+			ret == ERequestFailed
 		return ret
 
 	# requirment: self.__remote_json is already gotten
