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

Setting assets paths in base class

Browse Source
This commit is contained in:
gryf
2017-01-03 18:49:18 +01:00
parent 1d35436dee
commit 0b831e5b10
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs_uae_wrapper/archive.py
View File

@@ -40,7 +40,6 @@ class Archive(base.Base):
if not super(Archive, self).run():
return False
self._set_assets_paths()
if not self._extract():
return False

20
fs_uae_wrapper/base.py
View File

@@ -47,6 +47,8 @@ class Base(object):
self.dir = tempfile.mkdtemp()
self._set_assets_paths()
return True
def clean(self):
@@ -91,15 +93,17 @@ class Base(object):
conf_base = os.path.basename(self.conf_file)
conf_base = os.path.splitext(conf_base)[0]
arch = self.all_options['wrapper_archive']
if os.path.isabs(arch):
self.arch_filepath = arch
else:
self.arch_filepath = os.path.join(conf_abs_dir, arch)
arch = self.all_options.get('wrapper_archive')
if arch:
if os.path.isabs(arch):
self.arch_filepath = arch
else:
self.arch_filepath = os.path.join(conf_abs_dir, arch)
# set optional save_state
arch_ext = utils.get_arch_ext(self.all_options['wrapper_archiver'])
self.save_filename = os.path.join(conf_abs_dir, conf_base + '_save' +
arch_ext)
arch_ext = utils.get_arch_ext(self.all_options.get('wrapper_archiver'))
if arch_ext:
self.save_filename = os.path.join(conf_abs_dir, conf_base +
'_save' + arch_ext)
def _copy_conf(self):
"""copy provided configuration as Config.fs-uae"""

1
fs_uae_wrapper/cd32.py
View File

@@ -34,7 +34,6 @@ class CD32(base.Base):
if not self._validate_options():
return False
self._set_assets_paths()
if not self._extract():
return False