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

No longer duplicates human_readable_filesize functions. Closes #170

Browse Source
This commit is contained in:
Micah Lee 2015-05-14 14:40:55 -07:00
parent 5f2aa7272c
commit aab5ae31ab
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
onionshare_gui/file_selection.py
View File

@ -114,9 +114,9 @@ class FileList(QtGui.QListWidget):
icon = ip.icon(fileinfo) icon = ip.icon(fileinfo)
if os.path.isfile(filename): if os.path.isfile(filename):
size = self.human_readable_filesize(fileinfo.size()) size = helpers.human_readable_filesize(fileinfo.size())
else: else:
size = self.human_readable_filesize(helpers.dir_size(filename)) size = helpers.human_readable_filesize(helpers.dir_size(filename))
item_name = unicode('{0} ({1})'.format(basename, size)) item_name = unicode('{0} ({1})'.format(basename, size))
item = QtGui.QListWidgetItem(item_name) item = QtGui.QListWidgetItem(item_name)
item.setToolTip(QtCore.QString(size)) item.setToolTip(QtCore.QString(size))
@ -126,18 +126,6 @@ class FileList(QtGui.QListWidget):
self.files_updated.emit() self.files_updated.emit()
def human_readable_filesize(self, b):
thresh = 1024.0
if b < thresh:
return '{0} B'.format(b)
units = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB']
u = 0
b /= thresh
while b >= thresh:
b /= thresh
u += 1
return '{0} {1}'.format(round(b, 1), units[u])
class FileSelection(QtGui.QVBoxLayout): class FileSelection(QtGui.QVBoxLayout):
def __init__(self): def __init__(self):
@ -220,4 +208,3 @@ class FileSelection(QtGui.QVBoxLayout):
def get_num_files(self): def get_num_files(self):
return len(self.file_list.filenames) return len(self.file_list.filenames)