Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-09-23 14:04:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixed OSX filename-related issues

Browse source
This commit is contained in:
Micah Lee 2014-09-25 11:42:29 -07:00
parent 10a53cad48
commit b035330805
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
onionshare/helpers.py
View file

@ -110,7 +110,7 @@ class ZipWriter(object):
self.z.write(filename, os.path.basename(filename), zipfile.ZIP_DEFLATED) self.z.write(filename, os.path.basename(filename), zipfile.ZIP_DEFLATED)
def add_dir(self, filename): def add_dir(self, filename):
dir_to_strip = os.path.dirname(filename)+'/' dir_to_strip = os.path.dirname(filename.rstrip('/'))+'/'
for dirpath, dirnames, filenames in os.walk(filename): for dirpath, dirnames, filenames in os.walk(filename):
for f in filenames: for f in filenames:
full_filename = os.path.join(dirpath, f) full_filename = os.path.join(dirpath, f)

2
onionshare/web.py
View file

@ -36,7 +36,7 @@ def set_file_info(filenames):
for filename in filenames: for filename in filenames:
info = { info = {
'filename': filename, 'filename': filename,
'basename': os.path.basename(filename) 'basename': os.path.basename(filename.rstrip('/'))
} }
if os.path.isfile(filename): if os.path.isfile(filename):
info['size'] = os.path.getsize(filename) info['size'] = os.path.getsize(filename)