gryf/fs-uae-wrapper
1
0
Fork 0
mirror of https://github.com/gryf/fs-uae-wrapper.git synced 2026-01-04 04:44:17 +01:00
Code Issues Projects Releases Wiki Activity

Make archive name and archiver for savestate optional.

Browse Source
This commit is contained in:
gryf
2024-09-11 21:23:49 +02:00
parent 60139d1728
commit 148d28dac2
6 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
fs_uae_wrapper/base.py
View File

@@ -237,9 +237,9 @@ class Base(object):
return True
if 'wrapper_archiver' not in self.all_options:
logging.error("Configuration lacks of required "
"`wrapper_archiver' option.")
return False
logging.warning("Configuration lacks of optional "
"`wrapper_archiver' option, fall back to 7z")
self.all_options['wrapper_archiver'] = "7z"
if not path.which(self.all_options['wrapper_archiver']):
logging.error("Cannot find archiver `%s'.",
@@ -295,8 +295,30 @@ class ArchiveBase(Base):
validation_result = super(ArchiveBase, self)._validate_options()
if 'wrapper_archive' not in self.all_options:
sys.stderr.write("Configuration lacks of required "
"`wrapper_archive' option.\n")
validation_result = False
logging.warning("Configuration lacks of optional `wrapper_archive'"
" option.\n")
wrapper_archive = self._get_wrapper_archive_name()
if wrapper_archive is None:
logging.error("Configuration lacks of optional "
"`wrapper_archive', cannot deduct the name by "
"configuration file name.\n")
validation_result = False
self.all_options['wrapper_archive'] = wrapper_archive
return validation_result
def _get_wrapper_archive_name(self):
"""
Return full path to the archive name using configuration file
basename and appending one of the expected archive extensions.
"""
basename = os.path.splitext(self.conf_file)[0]
file_list = os.listdir('.')
for fname in file_list:
for ext in ('.7z', '.lha', '.lzx', '.zip', '.rar', '.tar', '.tgz',
'.tar.gz', '.tar.bz2', '.tar.xz'):
if ((basename + ext).lower() == fname.lower() and
basename == os.path.splitext(fname)[0]):
return fname
return None