almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

[media-split] Simplify code

Browse Source 
Some parts can be written in a more straight-forward way. This also
fixes the issue with not raising error on adding to big file.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-06-01 14:06:25 +02:00
parent 79035ea7e6
commit e5454a23eb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pungi/media_split.py
View File

@ -73,13 +73,14 @@ class MediaSplitter(object):
name = os.path.normpath(name) name = os.path.normpath(name)
size = int(size) size = int(size)
old_size = self.file_sizes.get(name, None) old_size = self.file_sizes.get(name, None)
if old_size is None:
self.files.append(name) if old_size is not None and old_size != size:
self.file_sizes[name] = size
elif old_size != size:
raise ValueError("File size mismatch; file: %s; sizes: %s vs %s" % (name, old_size, size)) raise ValueError("File size mismatch; file: %s; sizes: %s vs %s" % (name, old_size, size))
elif size > self.media_size: if size > self.media_size:
raise ValueError("File is larger than media size: %s" % name) raise ValueError("File is larger than media size: %s" % name)
self.files.append(name)
self.file_sizes[name] = size
if sticky: if sticky:
self.sticky_files.add(name) self.sticky_files.add(name)
@ -127,16 +128,15 @@ class MediaSplitter(object):
disks = [] disks = []
disk = {} disk = {}
total_size_single = sticky_files_size # as it would be on single medium (sticky_files just once) # as it would be on single medium (sticky_files just once)
total_size_single = sticky_files_size
while all_files: while all_files:
name = all_files.pop(0) name = all_files.pop(0)
size = convert_file_size(self.file_sizes[name]) size = convert_file_size(self.file_sizes[name])
if not disks or disk["size"] + size > self.media_size: if not disks or disk["size"] + size > self.media_size:
disk = {"size": 0, "files": []} disk = {"size": sticky_files_size, "files": sticky_files[:]}
disks.append(disk) disks.append(disk)
disk["files"].extend(sticky_files)
disk["size"] += sticky_files_size
disk["files"].append(name) disk["files"].append(name)
disk["size"] += size disk["size"] += size