Automatic updates, other work-in-progress

Author: FrodeSolheim

.gitignore

@@ -25,6 +25,7 @@ fs-uae-launcher_*
 /Launcher-*
 /Launcher_*
 Lib
+/*.log
 *.mo
 /.mypy_cache/
 *.pot

Pipfile

@@ -23,6 +23,8 @@ pywin32-ctypes = "*"
 pyinstaller = "*"
 pefile = "*"
 macholib = "*"
+rx = "*"
+autologging = "*"
 
 [requires]
 python_version = "3.9"

Pipfile.lock

@@ -128,23 +128,28 @@ specific game requires, so it installs all of them. The following kickstart
 ROM images must be present in your file database:
 
 SHA-1: `11f9e62cf299f72184835b7b2a70a16333fc0d88`, known as:
-- Kickstart v1.2 r33.180 (1986-10)(Commodore)(A500-A1000-A2000)[!].rom
-- kick33180.A500
+- `Kickstart v1.2 r33.180 (1986-10)(Commodore)(A500-A1000-A2000)[!].rom`
+- `kick33180.A500`
+- `amiga-os-120.rom` (Amiga Forever)
 
 SHA-1: `891e9a547772fe0c6c19b610baf8bc4ea7fcb785`, known as:
-- Kickstart v1.3 r34.005 (1987-12)(Commodore)(A500-A1000-A2000-CDTV)[!].rom
-- kick34005.A500
+- `Kickstart v1.3 r34.005 (1987-12)(Commodore)(A500-A1000-A2000-CDTV)[!].rom`
+- `kick34005.A500`
+- `amiga-os-130.rom` (Amiga Forever)
 
 SHA-1: `e21545723fe8374e91342617604f1b3d703094f1`, known as:
-- Kickstart v3.1 r40.068 (1993-12)(Commodore)(A1200)[!].rom
-- kick40068.A1200
+- `Kickstart v3.1 r40.068 (1993-12)(Commodore)(A1200)[!].rom`
+- `kick40068.A1200`
+- `amiga-os-310-a1200.rom` (Amiga Forever)
 
 SHA-1: `5fe04842d04a489720f0f4bb0e46948199406f49`, known as:
-- Kickstart v3.1 r40.068 (1993-12)(Commodore)(A4000)[!].rom
-- kick40068.A4000
+- `Kickstart v3.1 r40.068 (1993-12)(Commodore)(A4000)[!].rom`
+- `kick40068.A4000`
+- `amiga-os-310-a4000.rom` (Amiga Forever)
 
 If you do not have these kickstart ROM files, then you get these as part of
-Amiga Forever (at least the Plus edition).
+Amiga Forever (at least the Plus edition). See
+https://www.amigaforever.com/kb/15-120 for more information about relevant kickstart files included in the Amiga Forever package.
 
 ## Saving games
 

docs/whdload-support.md

@@ -37,15 +37,23 @@ def split_version(version_string: str) -> List[str]:
     pattern = re.compile(
         "^([0-9]{1,4})(?:\.([0-9]{1,4}))?"
         "(?:\.([0-9]{1,4}))?(?:\.([0-9]{1,4}))?"
-        "(~?[a-z0-9\.]*)?(?:[-_]([0-9]+))?$"
+        "([-~]?[a-z0-9\.]*)?(?:[-_]([0-9]+))?$"
     )
     m = pattern.match(version_string)
     if m is None:
         raise ValueError(version_string + " is not a valid version number")
     return list(m.groups())
 
 
-class Version(object):
+class Version:
+    """
+    >>> Version("1.26.1.16-fs") == Version("1.26.1.16-fs")
+    True
+    >>> Version("1.26.1.16-fs") < Version("1.26.1.16-fs")
+    False
+    >>> Version("1.26.1.16-fs") > Version("1.26.1.16-fs")
+    False
+    """
     def __init__(self, version_string: str) -> None:
         self.string = version_string
         v = split_version(version_string)
@@ -77,12 +85,21 @@ def cmp_value(self):
             mod_cmp = "~~" + mod_cmp
         return self.val, mod_cmp, self.release
 
+    def __eq__(self, other) -> bool:
+        return self.cmp_value() == other.cmp_value()
+
     def __lt__(self, other: "Version") -> bool:
         return self.cmp_value() < other.cmp_value()
 
+    def __le__(self, other: "Version") -> bool:
+        return self.cmp_value() <= other.cmp_value()
+
     def __gt__(self, other: "Version") -> bool:
         return self.cmp_value() > other.cmp_value()
 
+    def __ge__(self, other: "Version") -> bool:
+        return self.cmp_value() >= other.cmp_value()
+
     def __str__(self) -> str:
         return self.string
 
@@ -141,6 +158,8 @@ def compare_versions(a: Union[Version, str], b: Union[Version, str]):
     1
     >>> compare_versions("1.22.2fs0", "1.22.2")
     1
+    >>> compare_versions("1.26.1.16-fs", "1.26.1.16-fs")
+    0
     """
     # >>> compare_versions("2.6.0beta1", "2.6.0beta1.1")
     # -1

fsbc/util.py

@@ -288,6 +288,10 @@ def custom_path(name):
     return path
 
 
+def getBaseDirectory():
+    return base_dir()
+
+
 @lru_cache()
 def base_dir():
     logger.debug("Find base directory")
@@ -349,6 +353,9 @@ def base_dir():
 
 @lru_cache()
 def development():
+    # FIXME: Document option
+    if "--development-mode=0" in sys.argv:
+        return False
     result = os.path.exists(os.path.join(executable_dir(), "setup.py"))
     logger.info("Development mode: %s", result)
     return result

fsboot/__init__.py

@@ -18,13 +18,13 @@ mkdir -p fsbuild/_dist
 
 cd fsbuild/_build
 
-if [ "$SYSTEM_OS" = "Windows" ]; then
-ARCHIVE=${PACKAGE_NAME_PRETTY}_${PACKAGE_VERSION}_${OS}_${ARCH}.zip
-zip -r ../_dist/$ARCHIVE ${PACKAGE_NAME_PRETTY}
-else
+# if [ "$SYSTEM_OS" = "Windows" ]; then
+# ARCHIVE=${PACKAGE_NAME_PRETTY}_${PACKAGE_VERSION}_${OS}_${ARCH}.zip
+# zip -r ../_dist/$ARCHIVE ${PACKAGE_NAME_PRETTY}
+# else
 ARCHIVE=${PACKAGE_NAME_PRETTY}_${PACKAGE_VERSION}_${OS}_${ARCH}.tar.xz
 tar cfJv ../_dist/$ARCHIVE ${PACKAGE_NAME_PRETTY}
-fi
+# fi
 
 echo -------------------------------------------------------------------------\
 -------

fsbuild/archive

@@ -0,0 +1,11 @@
+# FIXME: Use pluggable main loop implementation
+
+from typing import Callable
+
+
+class MainLoop:
+    @classmethod
+    def schedule(cls, action: Callable):
+        print("MainLoop.schedule", action)
+        from fsui import call_after
+        call_after(action)

fscore/mainloop.py

@@ -0,0 +1,196 @@
+from fscore.mainloop import MainLoop
+
+# from rx import Observable as BaseObservable
+import rx
+import rx.operators
+import rx.disposable
+
+amapOperator = rx.operators.map
+
+def mapOperator(*args):
+    return rx.operators.map(*args)
+
+# class Observable(BaseObservable):
+#     pass
+
+
+Observable = rx.Observable
+Disposable = rx.disposable.Disposable
+
+
+def isObservable(obj):
+    return hasattr(obj, "subscribe")
+
+
+class Disposer:
+    def __init__(self, *args):
+        self.disposables = args
+
+    def __call__(self):
+        print("Disposer.__call__")
+        for disposable in self.disposables:
+            print(disposable, "-> dispose()")
+            disposable.dispose()
+
+
+import logging
+
+from datetime import timedelta
+from typing import Any, Optional, Set
+
+from rx.core import typing
+from rx.disposable import CompositeDisposable, Disposable, SingleAssignmentDisposable
+
+from rx.scheduler.periodicscheduler import PeriodicScheduler
+
+
+log = logging.getLogger(__name__)
+
+
+# FIXME: Might also put this in fsui instead?
+
+class MainLoopScheduler(PeriodicScheduler):
+
+    def __init__(self):
+        super().__init__()
+        # elf._qtcore = qtcore
+        # FIXME
+        # timer_class: Any = self._qtcore.QTimer
+        # self._periodic_timers: Set[timer_class] = set()
+
+    def schedule(self,
+                 action: typing.ScheduledAction,
+                 state: Optional[typing.TState] = None
+                 ) -> typing.Disposable:
+        """Schedules an action to be executed.
+
+        Args:
+            action: Action to be executed.
+            state: [Optional] state to be given to the action function.
+
+        Returns:
+            The disposable object used to cancel the scheduled action
+            (best effort).
+        """
+        print("MainLoopScheduler.schedule")
+
+        # print("schedule_relative", duetime, action, state)
+        # msecs=1
+        # msecs = max(0, int(self.to_seconds(duetime) * 1000.0))
+        sad = SingleAssignmentDisposable()
+        is_disposed = False
+
+        def invoke_action() -> None:
+            print("invoke_action")
+            if not is_disposed:
+                sad.disposable = action(self, state)
+
+        # Use static method, let Qt C++ handle QTimer lifetime
+        # self._qtcore.QTimer.singleShot(msecs, invoke_action)
+        MainLoop.schedule(invoke_action)
+
+        def dispose() -> None:
+            nonlocal is_disposed
+            is_disposed = True
+
+        return CompositeDisposable(sad, Disposable(dispose))
+
+    def schedule_relative(self,
+                          duetime: typing.RelativeTime,
+                          action: typing.ScheduledAction,
+                          state: Optional[typing.TState] = None
+                          ) -> typing.Disposable:
+        """Schedules an action to be executed after duetime.
+
+        Args:
+            duetime: Relative time after which to execute the action.
+            action: Action to be executed.
+            state: [Optional] state to be given to the action function.
+
+        Returns:
+            The disposable object used to cancel the scheduled action
+            (best effort).
+        """
+        raise NotImplementedError
+        print("schedule_relative", duetime, action, state)
+        msecs=1
+        msecs = max(0, int(self.to_seconds(duetime) * 1000.0))
+        sad = SingleAssignmentDisposable()
+        is_disposed = False
+
+        def invoke_action() -> None:
+            print("invoke_action")
+            if not is_disposed:
+                sad.disposable = action(self, state)
+
+        log.debug("relative timeout: %sms", msecs)
+
+        # Use static method, let Qt C++ handle QTimer lifetime
+        self._qtcore.QTimer.singleShot(msecs, invoke_action)
+
+        def dispose() -> None:
+            nonlocal is_disposed
+            is_disposed = True
+
+        return CompositeDisposable(sad, Disposable(dispose))
+
+    def schedule_absolute(self,
+                          duetime: typing.AbsoluteTime,
+                          action: typing.ScheduledAction,
+                          state: Optional[typing.TState] = None
+                          ) -> typing.Disposable:
+        """Schedules an action to be executed at duetime.
+
+        Args:
+            duetime: Absolute time at which to execute the action.
+            action: Action to be executed.
+            state: [Optional] state to be given to the action function.
+
+        Returns:
+            The disposable object used to cancel the scheduled action
+            (best effort).
+        """
+        raise NotImplementedError
+
+        delta: timedelta = self.to_datetime(duetime) - self.now
+        return self.schedule_relative(delta, action, state=state)
+
+    def schedule_periodic(self,
+                          period: typing.RelativeTime,
+                          action: typing.ScheduledPeriodicAction,
+                          state: Optional[typing.TState] = None
+                          ) -> typing.Disposable:
+        """Schedules a periodic piece of work to be executed in the loop.
+
+       Args:
+            period: Period in seconds for running the work repeatedly.
+            action: Action to be executed.
+            state: [Optional] state to be given to the action function.
+
+        Returns:
+            The disposable object used to cancel the scheduled action
+            (best effort).
+        """
+        raise NotImplementedError
+        msecs = max(0, int(self.to_seconds(period) * 1000.0))
+        sad = SingleAssignmentDisposable()
+
+        def interval() -> None:
+            nonlocal state
+            state = action(state)
+
+        log.debug("periodic timeout: %sms", msecs)
+
+        timer = self._qtcore.QTimer()
+        timer.setSingleShot(not period)
+        timer.timeout.connect(interval)
+        timer.setInterval(msecs)
+        self._periodic_timers.add(timer)
+        timer.start()
+
+        def dispose() -> None:
+            timer.stop()
+            self._periodic_timers.remove(timer)
+            timer.deleteLater()
+
+        return CompositeDisposable(sad, Disposable(dispose))