Commit #1019 allow up to 4 MiB piece sizes

This commit is contained in:
Andrew Resch 2009-10-04 19:15:35 +00:00
parent 384a828795
commit 0e532c7f4e
2 changed files with 15 additions and 4 deletions

View File

@ -111,13 +111,20 @@ class CreateTorrentDialog:
self.dialog.show() self.dialog.show()
def parse_piece_size_text(self, value):
psize, metric = value.split()
psize = int(psize) * 1024
if metric[0] == 'M':
psize *= 1024
return psize
def adjust_piece_size(self): def adjust_piece_size(self):
"""Adjusts the recommended piece based on the file/folder/path selected.""" """Adjusts the recommended piece based on the file/folder/path selected."""
size = self.files_treestore[0][2] size = self.files_treestore[0][2]
model = self.glade.get_widget("combo_piece_size").get_model() model = self.glade.get_widget("combo_piece_size").get_model()
psize = 0
for index,value in enumerate(model): for index,value in enumerate(model):
psize = int(value[0].split()[0]) * 1024 psize = self.parse_piece_size_text(value[0])
pieces = size / psize pieces = size / psize
if pieces < 2048 or (index + 1) == len(model): if pieces < 2048 or (index + 1) == len(model):
self.glade.get_widget("combo_piece_size").set_active(index) self.glade.get_widget("combo_piece_size").set_active(index)
@ -284,7 +291,8 @@ class CreateTorrentDialog:
webseeds.append(l) webseeds.append(l)
# Get the piece length in bytes # Get the piece length in bytes
combo = self.glade.get_widget("combo_piece_size") combo = self.glade.get_widget("combo_piece_size")
piece_length = int(combo.get_model()[combo.get_active()][0].split()[0]) * 1024 piece_length = \
self.parse_piece_size_text(combo.get_model()[combo.get_active()][0])
num_pieces = self.files_treestore[0][2] / piece_length num_pieces = self.files_treestore[0][2] / piece_length
author = self.glade.get_widget("entry_author").get_text() author = self.glade.get_widget("entry_author").get_text()

View File

@ -553,7 +553,10 @@
64 KiB 64 KiB
128 KiB 128 KiB
256 KiB 256 KiB
512 KiB</property> 512 KiB
1 MiB
2 MiB
4 MiB</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>