raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '30rc1-fixes-part2' into 'master'

Browse Source 
Various bugfixes

Closes #916 and #944

See merge request openlp/openlp!387
This commit is contained in:
Tim Bentley 2022-02-01 11:11:52 +00:00
commit 79714f0b73
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/servicemanager.py
View File

@ -591,6 +591,8 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
if os.path.splitext(filename)[1] not in ['.png', '.jpg']: if os.path.splitext(filename)[1] not in ['.png', '.jpg']:
continue continue
filename_path = Path(thumbnail_path) / Path(filename) filename_path = Path(thumbnail_path) / Path(filename)
if not filename_path.exists():
continue
# Create a thumbnail path in the zip/service file # Create a thumbnail path in the zip/service file
service_path = filename_path.relative_to(thumbnail_path_parent) service_path = filename_path.relative_to(thumbnail_path_parent)
write_list.append((filename_path, service_path)) write_list.append((filename_path, service_path))
@ -600,6 +602,8 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
for frame in item['service_item'].get_frames(): for frame in item['service_item'].get_frames():
if 'thumbnail' in frame: if 'thumbnail' in frame:
filename_path = Path(thumbnail_path) / Path(frame['thumbnail']) filename_path = Path(thumbnail_path) / Path(frame['thumbnail'])
if not filename_path.exists():
continue
# Create a thumbnail path in the zip/service file # Create a thumbnail path in the zip/service file
service_path = filename_path.relative_to(thumbnail_path_parent) service_path = filename_path.relative_to(thumbnail_path_parent)
path_from_tuple = (filename_path, service_path) path_from_tuple = (filename_path, service_path)
@ -665,7 +669,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
self.main_window.display_progress_bar(1000) self.main_window.display_progress_bar(1000)
try: try:
with NamedTemporaryFile(dir=str(file_path.parent), prefix='.') as temp_file, \ with NamedTemporaryFile(dir=str(file_path.parent), prefix='.') as temp_file, \
zipfile.ZipFile(temp_file, 'w') as zip_file: zipfile.ZipFile(temp_file, 'w', zipfile.ZIP_DEFLATED) as zip_file:
# First we add service contents.. # First we add service contents..
zip_file.writestr('service_data.osj', service_content) zip_file.writestr('service_data.osj', service_content)
self.main_window.increment_progress_bar(service_content_size / total_size * 1000) self.main_window.increment_progress_bar(service_content_size / total_size * 1000)