Version 1.5.1

kz26 · Nov 3, 2016 · c913298 · c913298
1 parent b4607bc
commit c913298
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.5.1
+-----
+* Fix filename clobbering when filename contains parent path string (issue #2)
+
 1.5.0
 -----
 * Allow both file and directory names to be specified for output_path (PR #1, @mahkitah)

diff --git a/docs/cli.rst b/docs/cli.rst
@@ -37,7 +37,7 @@ available in your system path.
 	  --md5                 Add per-file MD5 hashes
 	  --verbose, -v         verbose mode
 
-	dottorrent/1.5.0 (https://github.com/kz26/dottorrent)
+	dottorrent/1.5.1 (https://github.com/kz26/dottorrent)
 
 
 

diff --git a/dottorrent/__init__.py b/dottorrent/__init__.py
@@ -265,8 +265,7 @@ def generate(self, callback=None):
                 if self.include_md5:
                     fx['md5sum'] = x[2]['md5sum']
                 fx['path'] = [y.encode()
-                              for y in x[0].replace(self.path, '', 1)[1:]
-                              .split(os.sep)]
+                              for y in x[0].split(os.sep)[1:]]
                 data['info']['files'].append(fx)
             data['info']['name'] = self.path.split(os.sep)[-1].encode()
         data['info']['pieces'] = bytes(self._pieces)

diff --git a/dottorrent/version.py b/dottorrent/version.py
@@ -1 +1 @@
-__version__ = '1.5.0'
+__version__ = '1.5.1'