Merge branch 'development'

Author: tokeeto

.github/workflows/python-app.yml

@@ -5,6 +5,27 @@ on:
         branches: ["main"]
 
 jobs:
+    build-macos-intel:
+        runs-on: macos-15-intel
+        steps:
+            - uses: actions/checkout@v3
+            - name: Set up Python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: "3.11"
+            - name: Install uv
+              uses: astral-sh/setup-uv@v6
+            - name: Install the project
+              run: uv sync
+            - name: Install pyinstaller
+              run: uv add --dev pyinstaller
+            - name: Compile
+              run: uv run --dev pyinstaller ShoggothStandalone.spec
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: shoggoth-mac-intel
+                  path: dist/
+
     build-macos:
         runs-on: macos-latest
         steps:

.gitignore

@@ -7,3 +7,4 @@
 *.sublime-workspace
 uv.lock
 /assets/
+shoggoth.ini

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shoggoth"
-version = "0.0.28"
+version = "0.0.29"
 authors = [{ name = "Toke Ivø", email = "[email protected]" }]
 description = "A card creator for Arkham Horror: The Card Game"
 readme = "README.md"

shoggoth/editor.py

@@ -82,7 +82,7 @@ def load_html(self):
         self.ids.code_input.text = self.guide.get_html()
 
     def get_page(self, page):
-        img = self.guide.get_page(page)
+        img = self.guide.get_page(page, html=self.ids.code_input.text)
         texture = CoreImage(img, ext='jpeg').texture
         shoggoth.app.root.ids.card_preview.set_card_images(texture, None)
 

shoggoth/guide.py

@@ -4,17 +4,30 @@
 import subprocess
 from subprocess import PIPE
 
-PRINCE_DIR = '/home/toke/Downloads/prince-16.1-linux-generic-x86_64/lib/prince'
-PRINCE_CMD = './bin/prince'
-
 
 class Guide:
-    def __init__(self, path, name, id, project):
+    def __init__(self, path, name, id, project, prince_cmd=None, prince_dir=None):
         self.path = path
         self.name = name
         self.id = id
         self.project = project
         self._html = None
+        self._prince_cmd = prince_cmd
+        self._prince_dir = prince_dir
+
+    @property
+    def prince_dir(self):
+        if self._prince_dir is None:
+            import shoggoth
+            return shoggoth.app.config.get('Shoggoth', 'prince_dir') or None
+        return self._prince_dir
+
+    @property
+    def prince_cmd(self):
+        if self._prince_cmd is None:
+            import shoggoth
+            return shoggoth.app.config.get('Shoggoth', 'prince_cmd')
+        return self._prince_cmd
 
     @property
     def target_path(self):
@@ -26,10 +39,21 @@ def get_html(self):
                 self._html = file.read()
         return self._html
 
-    def get_page(self, page):
-        print('get page', [PRINCE_CMD, self.path, '-o', str(self.target_path)])
-        p = subprocess.call([PRINCE_CMD, self.path, '-o', str(self.target_path)], cwd=PRINCE_DIR)
-        pdf = pymupdf.open(self.target_path)
+    def get_page(self, page, html: str = ''):
+        if not html:
+            p = subprocess.call([self.prince_cmd, self.path, '-o', str(self.target_path)], cwd=self.prince_dir)
+            pdf = pymupdf.open(self.target_path)
+        else:
+            p = subprocess.run(
+                [self.prince_cmd, '-', '-o', '-'],
+                cwd=self.prince_dir,
+                input=html.encode(),
+                stdout=subprocess.PIPE,
+            )
+            data = p.stdout
+            print('got data of len', len(data))
+            pdf = pymupdf.open(stream=data)
+
         image = pdf[page].get_pixmap().pil_image()
 
         buffer = BytesIO()
@@ -38,9 +62,7 @@ def get_page(self, page):
         return buffer
 
     def render_to_file(self):
-        with open(self.target_path, "w+b") as result_file:
-            # convert HTML to PDF
-            subprocess.call([PRINCE_CMD, str(self.path), str(result_file)], cwd=PRINCE_DIR)
+        subprocess.run([self.prince_cmd, self.path, '-o', str(self.target_path)], cwd=self.prince_dir)
 
 
 # todo:

shoggoth/main.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 import threading
+import json
 from tokenize import String
 import shoggoth
 from time import time
@@ -12,6 +13,7 @@
     Config.set('kivy', 'log_enable', '0')
     Config.set('graphics', 'width', '800')
     Config.set('graphics', 'height', '600')
+    Config.set('kivy', 'exit_on_escape', 0)
     Config.write()
 
 from kivy.app import App  # noqa: E402
@@ -149,7 +151,8 @@ def on_selected_node(self):
             app.show_card(self.tree.selected_node.element)
         elif self.tree.selected_node.element_type == 'guide':
             app.show_guide(self.tree.selected_node.element)
-        self.selected_item = self.tree.selected_node.element
+        if self.tree.selected_node.element:
+            self.selected_item = self.tree.selected_node.element
 
     def refresh(self, *args):
         opens = set()
@@ -327,6 +330,56 @@ def build(self):
 
         return self.root
 
+    def build_config(self, config):
+        config.setdefaults('Shoggoth', {
+            'prince_cmd': 'prince',
+            'prince_dir': '',
+            'strange_eons': '',
+            'java': 'java',
+        })
+
+    def build_settings(self, settings):
+        data = [
+            {
+                "type": "title",
+                "title": "External applications",
+            },
+            { 
+                "type": "string",
+                "title": "Prince command",
+                "desc": "Command to run prince",
+                "section": "Shoggoth",
+                "key": "prince_cmd",
+            },
+            {
+                "type": "path",
+                "title": "Prince location",
+                "desc": "Location of the Prince directory, if not installed system wide.",
+                "section": "Shoggoth",
+                "key": "prince_dir",
+            },
+            {
+                "type": "path",
+                "title": "Strange Eons",
+                "desc": "Location of the Strange Eons jar file. For use with importing SE projects.",
+                "section": "Shoggoth",
+                "key": "strange_eons",
+            },
+            {
+                "type": "string",
+                "title": "Java command",
+                "desc": "Command to run java. Used in conjunction with Strange Eons.",
+                "section": "Shoggoth",
+                "key": "java",
+            },
+        ]
+
+        settings.add_json_panel(
+            'Shoggoth',
+            self.config,
+            data=json.dumps(data)
+        )
+
     def goto_project(self, project_id):
         self.current_project = Project.load(project_id)
         self.root.ids.file_browser.project = self.current_project

shoggoth/shoggoth.kv

@@ -168,18 +168,6 @@
     size_hint: .6, .3
     BoxLayout:
         orientation: 'vertical'
-        BoxLayout:
-            orientation: 'horizontal'
-            Label:
-                text: 'Path to Strange Eons jar file'
-            TextInput:
-                size_hint_x: 0.6
-                id: jar_path
-                size_hint_y: None
-            Button:
-                size_hint_x: 0.2
-                text: 'Browse'
-                on_release: ui.browse_file(target=jar_path)
         BoxLayout:
             orientation: 'horizontal'
             Label:
@@ -205,7 +193,7 @@
                 text: 'Browse'
                 on_release: ui.browse_folder(target=new_path)
         Label:
-            text: "Once it starts, it will take a while (~30 seconds) with no response. Then Shoggoth will close. This is expected for now."
+            text: "Once it starts, it will take a while (~30 seconds) with no response. Then Shoggoth will close. Then the new project file will be available in the output folder. This is expected for now."
         BoxLayout:
             orientation: 'horizontal'
             Button:
@@ -438,6 +426,10 @@
                 disabled: not app.current_project
                 on_release: ui.ExportPopup().open()
             ContextMenuDivider:
+            ContextMenuTextItem:
+                text: 'Settings'
+                on_release: app.open_settings()
+            ContextMenuDivider:
             ContextMenuTextItem:
                 text: 'Exit'
                 on_release: app.stop()
@@ -730,7 +722,7 @@
         TextInput:
             value: '1'
             id: page_count
-            on_text: root.get_page(int(self.text)) if int(self.text) else root.get_page(0)
+            on_text: root.get_page(int(self.text)) if self.text else root.get_page(0)
 
 <ProjectEditor>:
     orientation: 'vertical'

shoggoth/strange_eons.py

@@ -2,10 +2,13 @@
 import jpype.imports
 from shoggoth.files import asset_dir
 
-def run_conversion(jar_path, project_path, output_path):
+def run_conversion(java_path, jar_path, project_path, output_path):
+    if not jar_path:
+        raise Exception("Path to Strange Eons jar file not set. Press F1 and change the settings. This needs to be the .jar file - other versions won't work.")
+
     # start the JVM to make further imports available
     jpype.startJVM(
-        jpype.getDefaultJVMPath(),
+        java_path or jpype.getDefaultJVMPath(),
         f'-javaagent:{jar_path}',
         classpath=[f'{jar_path}'],
     )

shoggoth/tool.py

@@ -10,7 +10,7 @@ def version_is_up_to_date() -> bool:
     if not (asset_dir/'version.txt').exists():
         return False
     with (asset_dir/'version.txt').open('r') as f:
-        if not f.read().startswith('0.3.3'):
+        if not f.read().startswith('0.4.0'):
             return False
     return True
 
@@ -35,7 +35,7 @@ def run():
     if not asset_dir.is_dir() or not version_is_up_to_date():
         print("Asset pack not found. Downloading assets...")
         # download assets
-        url = 'https://www.dropbox.com/scl/fi/qv5ei158rqoem3gs6cd9k/assets-0-3-3.zip?rlkey=4l3ms5tmkir20zpifnurheze6&st=7uwnnbh9&dl=1'
+        url = 'https://www.dropbox.com/scl/fi/htwenk0k3vxxr4bl69b4z/assets-0-4-0.zip?rlkey=30ch88hivad2j6g08xfxehs4h&st=g9libbot&dl=1'
         filehandle, _ = urllib.request.urlretrieve(url)
         with zipfile.ZipFile(filehandle, 'r') as file:
             file.extractall(root_dir)

shoggoth/ui.py

@@ -152,10 +152,12 @@ def submit(self):
         from shoggoth import strange_eons
 
         project_path = self.ids.se_path.text
-        jar_path = self.ids.jar_path.text
+        jar_path = shoggoth.app.config.get('Shoggoth', 'strange_eons')
+        java_path = shoggoth.app.config.get('Shoggoth', 'java')
         output_path = self.ids.new_path.text
 
-        threading.Thread(target=strange_eons.run_conversion, args=(jar_path, project_path, output_path)).start()
+        threading.Thread(target=strange_eons.run_conversion, args=(java_path, jar_path, project_path, output_path)).start()
+
 
 class Thumbnail(ButtonBehavior, Image):
     card_id = StringProperty("")