Fix user provided whdload options

README.rst

@@ -331,8 +331,6 @@ Options used:
 * ``wrapper_archive`` (optional) path to the whdload archive, defaults to same
   name as configuration file with some detected archive extension. Note, that
   name is case sensitive
-* ``wrapper_archiver`` (optional) archiver to use for storage save state -
-  default ``7z``.
 
 This module is solely used with whdload distributed games (not just whdload
 slave files, but whole games, which can be found on several places on the
@@ -365,7 +363,7 @@ where the minimum dependences are:
 - `WHDLoad`_ 18.9
 - `SetPatch`_ 43.6
 
-and the ``S/startup-sequence`` should at east contain:
+and the ``S/startup-sequence`` should at least contain:
 
 .. code::
 
@@ -509,7 +507,7 @@ And execution is as usual:
 
 Now, similar to the archive module, it will create temporary directory, unpack
 base image there, unpack WHDLoad game archive, search for slave file, and
-preapre ``s:whdload-startup``, and finally pass all the configuration to
+prepare ``s:whdload-startup``, and finally pass all the configuration to
 fs-uae.
 
 

fs_uae_wrapper/whdload.py

@@ -114,10 +114,10 @@ class Wrapper(base.ArchiveBase):
         # find proper way to handle slave
         # 1. check if there are user provided params
         contents = f"cd {slave_path}\n"
-        if self.fsuae_options.get('wrapper_whdload_options'):
+        if self.all_options.get('wrapper_whdload_options'):
             contents = (f"{contents}"
                         f"C:whdload "
-                        f"{self.fsuae_options['wrapper_whdload_options']} "
+                        f"{self.all_options['wrapper_whdload_options']} "
                         f"Slave={slave_fname}\n")
         else:
             # no params, find if kgiconload is available

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 61.0"]
+requires = ["setuptools >= 61.0", "wheel", "setuptools-git-versioning"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -10,7 +10,7 @@ description = "Automate archives support and state saves for fs-uae"
 readme = "README.rst"
 requires-python = ">=3.8"
 keywords = ["uae", "fs-uae", "amiga", "emulator", "wrapper"]
-version = "0.10.0"
+dynamic = ["version"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
@@ -34,11 +34,14 @@ Homepage = "https://github.com/gryf/fs-uae-wrapper"
 fs-uae-wrapper = "fs_uae_wrapper.wrapper:run"
 
 [tool.setuptools]
-py-modules = ["fs_uae_wrapper"]
+packages = ["fs_uae_wrapper"]
 
 [tool.distutils.bdist_wheel]
 universal = true
 
+[tool.setuptools-git-versioning]
+enabled = true
+
 [tool.ruff.lint]
 select = [
     "F",   # pyflakes

tests/test_whdload.py

@@ -225,7 +225,7 @@ class TestWHDLoad(TestCase):
         listdir.return_value = contents
         wrapper = whdload.Wrapper('Config.fs-uae', utils.CmdOption(), {})
         whdl_opts = 'Preload SplashDelay=0 MMU PAL'
-        wrapper.fsuae_options['wrapper_whdload_options'] = whdl_opts
+        wrapper.all_options['wrapper_whdload_options'] = whdl_opts
         with mock.patch('builtins.open', _open):
             self.assertTrue(wrapper._find_slave())
         handle = _open()