Fix #273 : downdir() downloads to a wrong directory structure.

houtianze · Jan 10, 2017 · 5bb3abd · 5bb3abd
1 parent 2dc460e
commit 5bb3abd
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,6 @@ nosetests.xml
 #.idea/
 #.idea/workspace.xml
 #*.rst
-bypy/test/testdir/
+bypy/test/**/*.bin
 bypy/test/downdir/
 bypy/test/sharedir/
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,6 @@
 ### Version History:
 
+- 1.3.6: Fix downdir downloads to a wrong directory structure
 - 1.3.5: Fix aria2 unable to resume download
 - 1.3.4: Add --select-fastest-mirror, --config-dir command line arguments; Swith to wheel dist format
 - 1.3.3: Fix the upload failure when slices expired

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,6 +1,7 @@
 Version History:
 ~~~~~~~~~~~~~~~~
 
+-  1.3.6: Fix downdir downloads to a wrong directory structure
 -  1.3.5: Fix aria2 unable to resume download
 -  1.3.4: Add --select-fastest-mirror, --config-dir command line
    arguments; Swith to wheel dist format

diff --git a/bypy/bypy.py b/bypy/bypy.py
@@ -1927,16 +1927,17 @@ def __prepare_local_dir(self, localdir):
 	def __proceed_downdir(self, remotepath, dirjs, filejs, args):
 		result = const.ENoError
 		rootrpath, localpath = args
-		rlen = len(remotepath) + 1 # '+ 1' for the trailing '/', it bites.
-		rootlen = len(rootrpath) + 1 # ditto
+		#rlen = len(remotepath) + 1
+		rootlen = len(rootrpath) + 1 # '+ 1' for the trailing '/', it bites.
 
 		result = self.__prepare_local_dir(localpath)
 		if result != const.ENoError:
 			perr("Fail to create prepare local directory '{}' for downloading, ABORT".format(localpath))
 			return result
 
 		for dirj in dirjs:
-			reldir = dirj['path'][rlen:]
+			rdir = dirj['path']
+			reldir = rdir[rootlen:]
 			#ldir = os.path.join(localpath, reldir)
 			ldir = joinpath(localpath, reldir)
 			result = self.__prepare_local_dir(ldir)

diff --git a/bypy/const.py b/bypy/const.py
@@ -12,7 +12,7 @@
 
 # https://packaging.python.org/single_source_version/
 __title__ = 'bypy'
-__version__ = '1.3.5'
+__version__ = '1.3.6'
 __author__ = 'Hou Tianze'
 __license__ = 'MIT'
 __desc__ ='Python client for Baidu Yun (Personal Cloud Storage) 百度云/百度网盘 Python 客户端'

diff --git a/bypy/printer_console.py b/bypy/printer_console.py
@@ -68,7 +68,7 @@ def pprgr(finish, total, start_time = None, existing = 0,
 		segth = seg
 		percent = 100
 		current_batch_percent = 0
-	else:
+
 	eta = ''
 	now = time.time()
 	if start_time is not None and current_batch_percent > 5 and finish > 0:

diff --git a/bypy/test/testdir/subdir/subsubdir/aaa.txt b/bypy/test/testdir/subdir/subsubdir/aaa.txt
@@ -0,0 +1 @@
+File in a sub sub directory