Add experimental macos support

.github/workflows/build_release.yml

@@ -57,6 +57,48 @@ jobs:
         tag_name: ${{ inputs.relname }}
         prerelease: ${{ inputs.prerelease }}
 
+  build-macos:
+    runs-on: macos-latest
+
+    env:
+      VERNAME: ${{ inputs.version }} 
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-python@v3
+      with:
+        python-version: '3.10'
+
+    - name: Setup 
+      run: |
+          brew install [email protected]
+          python3.10 -m pip install -U -r requirements.txt
+          python3.10 -m pip install -U -r requirements-build.txt
+
+    - name: Optionally set internal version separately
+      if: ${{ inputs.internalver != '' }}
+      run: |
+        echo "${{ inputs.internalver }}" > autoortho/.version
+
+    - name: Build
+      run: |
+        make osx_bin VERSION=${{ env.VERNAME }}
+
+    - name: Save artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: macosbin
+        path: autoortho_osx_*.bin
+
+    - name: Release
+      if: ${{ inputs.relname != '' }}
+      uses: softprops/action-gh-release@v1
+      with:
+        files: autoortho_osx_*.bin
+        tag_name: ${{ inputs.relname }}
+        prerelease: ${{ inputs.prerelease }}
+
 
   build-windows:
     runs-on: windows-latest

.github/workflows/test.yml

@@ -23,11 +23,30 @@ jobs:
         cd autoortho
         pytest --log-level=DEBUG -v test_getortho.py test_pydds.py test_downloader.py
 
+  test-macos:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-python@v3
+      with:
+        python-version: '3.10'
+
+    - name: Setup 
+      run: |
+          python3.10 -m pip install -U pytest  
+          python3.10 -m pip install -U -r requirements.txt
+
+    - name: Test
+      run: |
+        cd autoortho
+        pytest --log-level=DEBUG -v test_getortho.py test_pydds.py test_downloader.py
+
 
   test-windows:
     runs-on: windows-latest
 
-
     steps:
     - uses: actions/checkout@v3
 

Makefile

@@ -31,6 +31,22 @@ bin: autoortho/.version
 		--onefile \
 		./autoortho/__main__.py -o autoortho_lin.bin
 
+autoortho_osx.bin: autoortho/.version
+	#python3.10 -m nuitka --verbose --verbose-output=nuitka.log 
+	python3 -m nuitka --verbose --verbose-output=nuitka.log \
+		--macos-app-icon=autoortho/imgs/ao-icon.ico \
+		--enable-plugin=eventlet \
+		--enable-plugin=tk-inter \
+		--tcl-library-dir=/usr/local/lib/tcl8.6 \
+		--tk-library-dir=/usr/local/lib/tk8.6 \
+		--include-data-file=./autoortho/.version*=. \
+		--include-data-file=./autoortho/templates/*.html=templates/ \
+		--include-data-file=./autoortho/lib/darwin_arm/*.dylib=lib/darwin_arm/ \
+		--include-data-file=./autoortho/aoimage/*.dylib=aoimage/ \
+		--include-data-dir=./autoortho/imgs=imgs \
+		--onefile \
+		./autoortho/__main__.py -o autoortho_osx.bin
+
 _autoortho_win.exe: autoortho/.version
 	python3 -m nuitka --verbose --verbose-output=nuitka.log \
 		--mingw64 \
@@ -65,6 +81,10 @@ __main__.dist: autoortho/.version
 		--disable-console \
 		./autoortho/__main__.py -o autoortho_win.exe
 
+osx_bin: autoortho_osx_$(VERSION).bin
+autoortho_osx_$(VERSION).bin: autoortho_osx.bin
+	mv autoortho_osx.bin $@
+
 win_exe: AutoOrtho_win_$(VERSION).exe
 AutoOrtho_win_$(VERSION).exe: __main__.dist
 	cp autoortho/imgs/ao-icon.ico .

autoortho/aoimage/AoImage.py

@@ -149,6 +149,8 @@ def open(filename):
     _aoi_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),'aoimage.so')
 elif platform.system().lower() == 'windows':
     _aoi_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),'aoimage.dll')
+elif platform.system().lower() == 'darwin':
+    _aoi_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),'aoimage.dylib')
 else:
     log.error("System is not supported")
     exit()

autoortho/aoimage/Makefile.osx

@@ -0,0 +1,42 @@
+.SUFFIXES: .obj
+
+TARGET=main
+JPGT=/opt/libjpeg-turbo/lib64/
+#JPGT=/opt/homebrew/opt/jpeg-turbo/lib
+
+HEADERS=$(wildcard *.h)
+OBJECTS=aoimage.o
+
+
+CC=gcc
+LD=gcc
+
+CFLAGS+=-O2 -arch arm64 -arch x86_64 -Wall -fPIC -fdiagnostics-color -fvisibility=hidden -I/opt/libjpeg-turbo/include/ \
+	$(DEFINES)
+
+LDFLAGS=-shared -rdynamic -nodefaultlibs -arch arm64 -arch x86_64 -lpthread
+#LIBS=-lturbojpeg
+# Statically linked with libjpeg-turbo-3.0.1
+LIBS=$(JPGT)/libturbojpeg.a
+#LIBS=-L$(JPGT) -lturbojpeg
+
+#CFLAGS+=-O2 -Wall -fPIC -fdiagnostics-color -fvisibility=hidden \
+	 $(DEFINES)
+#
+#LDFLAGS=-shared -rdynamic -nodefaultlibs  -lpthread
+#LIBS=-L$(JPGT) -lturbojpeg
+
+all: $(TARGET)
+
+.c.o: $(HEADERS)
+	$(CC) $(CFLAGS) -c $<
+
+main: main.c aoimage.dylib $(HEADERS)
+	$(CC) $(CFLAGS) -o main \
+	main.c aoimage.c  $(LIBS)
+
+aoimage.dylib: $(OBJECTS)
+	$(LD) -o aoimage.dylib $(LDFLAGS) $(OBJECTS) $(LIBS)
+
+clean:
+	rm -f $(OBJECTS) $(TARGET) aoimage.dylib

autoortho/autoortho.py

@@ -140,6 +140,14 @@ def diagnose(CFG):
                 log.warning(f"    Maptype: {maptype} FAILED!")
                 failed = True
 
+    log.info(f"Checking DDS file compression:")
+    dds_compressor = CFG.pydds.compressor.upper()
+    if dds_compressor != "ISPC" and platform.system().lower() == 'darwin':
+        log.warning(f"    {dds_compressor} FAILED! Not supported on MacOS, use ISPC instead!")
+        failed = True
+    else:
+        log.info(f"    {dds_compressor} OK!")
+
     log.info("------------------------------------")
     if failed:
         log.warning("***************")

autoortho/autoortho_fuse.py

@@ -25,8 +25,8 @@
 import logging
 log = logging.getLogger(__name__)
 
-#from fuse import FUSE, FuseOSError, Operations, fuse_get_context
-from refuse.high import FUSE, FuseOSError, Operations, fuse_get_context, fuse_exit, _libfuse
+#from fuse import FUSE, FuseOSError, Operations, fuse_get_context, _libfuse
+from refuse.high import FUSE, FuseOSError, Operations, fuse_get_context,  _libfuse
 
 import getortho
 
@@ -283,7 +283,7 @@ def statfs(self, path):
             # return dict((key, getattr(st, key)) for key in ('f_bavail', 'f_bfree',
             #     'f_blocks', 'f_bsize', 'f_favail', 'f_ffree', 'f_files', 'f_flag',
             #     'f_frsize', 'f_namemax'))
-        elif platform.system() == 'Linux':
+        else:
             stv = os.statvfs(full_path)
             #log.info(stv)
             return dict((key, getattr(stv, key)) for key in ('f_bavail', 'f_bfree',
@@ -506,3 +506,16 @@ def run(ao, mountpoint, nothreads=False):
         #direct_io=True
     )
     log.info(f"FUSE: Exiting mount {mountpoint}")
+
+
+if __name__ == '__main__':
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument('root')
+    parser.add_argument('mount')
+    args = parser.parse_args()
+
+    logging.basicConfig(level=logging.DEBUG)
+    ao = AutoOrtho(args.root)
+
+    fuse = FUSE(ao, args.mount, foreground=True, allow_other=True)

autoortho/flighttrack.py

@@ -5,6 +5,7 @@
 import json
 import socket
 import threading
+import platform
 from aoconfig import CFG
 import logging
 log = logging.getLogger(__name__)
@@ -23,6 +24,11 @@
 app.config['SECRET_KEY'] = 'secret!'
 socketio = SocketIO(app)
 
+if platform.system().lower() == 'darwin':
+    local_host = '127.0.0.1'
+else:
+    local_host = '0.0.0.0'
+
 
 class FlightTracker(object):
 
@@ -192,13 +198,13 @@ def metrics():
 def run():
     #app.run(host='0.0.0.0', port=CFG.flightdata.webui_port, debug=CFG.general.debug, threaded=True, use_reloader=False)
     log.info("Start flighttracker...")
-    socketio.run(app, host='0.0.0.0', port=int(CFG.flightdata.webui_port))
-    log.info("Exiting flighttracker ...") 
+    socketio.run(app, host=local_host, port=int(CFG.flightdata.webui_port))
+    log.info("Exiting flighttracker ...")
 
 def main():
     ft.start()
     try:
-        app.run(host='0.0.0.0', debug=False, threaded=True, use_reloader=False)
+        app.run(host=local_host, debug=False, threaded=True, use_reloader=False)
     except KeyboardInterrupt:
         print("Shutdown requested.")
     finally:

autoortho/pydds.py

@@ -29,11 +29,19 @@
     print("Windows detected")
     _stb_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),'lib','windows','stb_dxt.dll')
     _ispc_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),'lib','windows','ispc_texcomp.dll')
+elif platform.system().lower() == 'darwin':
+    # Note, issues with STB so disabled for macos
+    # _stb_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),'lib','darwin_arm','libstbdxt.dylib')
+    _ispc_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),'lib','darwin_arm','libispc_texcomp.dylib')
 else:
     print("System is not supported")
     exit()
 
-_stb = CDLL(_stb_path)
+if platform.system().lower() == 'darwin':
+    _stb = None
+else:
+    _stb = CDLL(_stb_path)
+
 _ispc = CDLL(_ispc_path)
 
 DDSD_CAPS = 0x00000001          # dwCaps/dwCaps2 is enabled. 

requirements-build.in

@@ -1,3 +1,4 @@
 nuitka==1.6.6
 zstandard
 ordered-set
+imageio

requirements-build.txt

@@ -4,12 +4,18 @@
 #
 #    pip-compile requirements-build.in
 #
+imageio==2.31.5
+    # via -r requirements-build.in
 nuitka==1.6.6
     # via -r requirements-build.in
+numpy==1.26.1
+    # via imageio
 ordered-set==4.1.0
     # via
     #   -r requirements-build.in
     #   nuitka
+pillow==10.1.0
+    # via imageio
 zstandard==0.21.0
     # via
     #   -r requirements-build.in