distroscript 0.2.0__tar.gz → 0.2.1__tar.gz

{distroscript-0.2.0 → distroscript-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distroscript
-Version: 0.2.0
+Version: 0.2.1
 Summary: Generate Bash installation scripts from a declarative YAML config for multiple Linux distros
 Project-URL: Homepage, https://github.com/RaniAgus/distroscript
 Project-URL: Repository, https://github.com/RaniAgus/distroscript
@@ -416,14 +416,16 @@ obsidian:
     icon_name: obsidian
     mime_types:
       - x-scheme-handler/obsidian
+      - type: text/markdown
+        default: true
 ```
 
 AppImages are downloaded to `$HOME/.local/bin/`, a desktop entry is created in
 `$HOME/.local/share/applications/`, and icons are extracted automatically when `icon_name` is specified.
 
-When `mime_types` is provided, the desktop entry advertises those MIME types and the generated script
-registers the AppImage as their default handler. URL scheme handlers such as `x-scheme-handler/obsidian`
-automatically add `%u` to the generated `Exec` command.
+When `mime_types` is provided, the desktop entry advertises those MIME types. If `default` is not set, only scheme
+handler strings register the AppImage as their default handler, other MIME types will not be set as default unless
+`default: true` is explicitly specified.
 
 > [!NOTE]
 > AppImage packages require the `url` field. The `name`, `icon_name`, `categories`, and `mime_types` fields are optional.

{distroscript-0.2.0 → distroscript-0.2.1}/README.md

@@ -372,14 +372,16 @@ obsidian:
     icon_name: obsidian
     mime_types:
       - x-scheme-handler/obsidian
+      - type: text/markdown
+        default: true
 ```
 
 AppImages are downloaded to `$HOME/.local/bin/`, a desktop entry is created in
 `$HOME/.local/share/applications/`, and icons are extracted automatically when `icon_name` is specified.
 
-When `mime_types` is provided, the desktop entry advertises those MIME types and the generated script
-registers the AppImage as their default handler. URL scheme handlers such as `x-scheme-handler/obsidian`
-automatically add `%u` to the generated `Exec` command.
+When `mime_types` is provided, the desktop entry advertises those MIME types. If `default` is not set, only scheme
+handler strings register the AppImage as their default handler, other MIME types will not be set as default unless
+`default: true` is explicitly specified.
 
 > [!NOTE]
 > AppImage packages require the `url` field. The `name`, `icon_name`, `categories`, and `mime_types` fields are optional.

{distroscript-0.2.0 → distroscript-0.2.1}/src/distroscript.py

@@ -16,10 +16,10 @@ import json
 from jsonschema import validate, ValidationError
 import os
 import sys
-from typing import ClassVar, Generic, TypeVar
+from typing import ClassVar, Generic, TypeVar, TypedDict
 import yaml
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 def main(args: argparse.Namespace) -> None:
     """
@@ -189,6 +189,11 @@ PLATFORMS = {
 
 T = TypeVar('T', bound='Package')
 
+
+class MimeType(TypedDict):
+    type: str
+    default: bool
+
 @dataclass(frozen=True)
 class Package(ABC, Generic[T]):
     factories: ClassVar[dict[str, type[Package]]] = {}
@@ -863,7 +868,20 @@ class AppImagePackage(Package, type='appimage'):
     def create(cls, name: str, item: dict, platform: Platform) -> list[Package]:
         url = item.get('url')
         icon_name = item.get('icon_name')
-        mime_types = item.get('mime_types', [])
+        mime_types: list[MimeType] = []
+        for mime_type in item.get('mime_types', []):
+            if isinstance(mime_type, str):
+                mime_types.append({
+                    'type': mime_type,
+                    'default': mime_type.startswith('x-scheme-handler/'),
+                })
+            else:
+                mime_type_name = mime_type.get('type')
+                mime_types.append({
+                    'type': mime_type_name,
+                    'default': mime_type.get('default', mime_type_name.startswith('x-scheme-handler/')),
+                })
+        mime_type_names = [mime_type['type'] for mime_type in mime_types]
 
         if not url:
             raise RuntimeError(f"AppImagePackage requires 'url' field.")
@@ -881,15 +899,6 @@ class AppImagePackage(Package, type='appimage'):
         categories = item.get('categories', 'Application')
         if isinstance(categories, str):
             categories = [categories]
-        has_scheme_handler = any(
-            mime_type.startswith('x-scheme-handler/')
-            for mime_type in mime_types
-        )
-        exec_command = (
-            f"sh -c '\"{destination}\" \"$1\"' sh %u"
-            if has_scheme_handler
-            else f'sh -c "{destination}"'
-        )
 
         # Desktop file creation
         desktop_entry = []
@@ -901,9 +910,9 @@ class AppImagePackage(Package, type='appimage'):
         desktop_entry.append(f'Categories={";".join(categories)};')
         if icon_name:
             desktop_entry.append(f'Icon={icon_name}')
-        if mime_types:
-            desktop_entry.append(f'MimeType={";".join(mime_types)};')
-        desktop_entry.append(f'Exec={exec_command}')
+        if mime_type_names:
+            desktop_entry.append(f'MimeType={";".join(mime_type_names)};')
+        desktop_entry.append(f'Exec=sh -c \'"{destination}" "$1"\' sh %u')
         desktop_entry.append('')
 
         post_install.append(
@@ -914,15 +923,13 @@ class AppImagePackage(Package, type='appimage'):
             )
         )
 
-        if mime_types:
-            post_install.append(
-                ShellCommand(
-                    command='\n'.join(
-                        f'xdg-mime default {desktop_file} {mime_type}'
-                        for mime_type in mime_types
+        for mime_type in mime_types:
+            if mime_type.get('default', False):
+                post_install.append(
+                    ShellCommand(
+                        command=f'xdg-mime default {desktop_file} {mime_type["type"]}'
                     )
                 )
-            )
 
         # Icon extraction if icon_name is provided
         if icon_name:

{distroscript-0.2.0 → distroscript-0.2.1}/src/schema.json

@@ -547,7 +547,24 @@
         "mime_types": {
           "type": "array",
           "items": {
-            "type": "string"
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "object",
+                "required": ["type"],
+                "properties": {
+                  "type": {
+                    "type": "string"
+                  },
+                  "default": {
+                    "type": "boolean"
+                  }
+                },
+                "additionalProperties": false
+              }
+            ]
           }
         },
         "depends_on": {

{distroscript-0.2.0 → distroscript-0.2.1}/tests/inputs/17-appimage.yml

@@ -19,3 +19,8 @@ obsidian:
     name: Obsidian
     mime_types:
       - x-scheme-handler/obsidian
+      - application/x-obsidian-vault
+      - type: text/markdown
+        default: true
+      - type: x-scheme-handler/obsidian-dev
+        default: false

{distroscript-0.2.0 → distroscript-0.2.1}/tests/outputs/fedora/17-appimage.sh

@@ -29,7 +29,7 @@ Type=Application
 Terminal=false
 Categories=Game;Emulator;
 Icon=org.duckstation.DuckStation
-Exec=sh -c "$HOME/.local/bin/DuckStation.AppImage"
+Exec=sh -c '"$HOME/.local/bin/DuckStation.AppImage" "$1"' sh %u
 EOF
 
 (
@@ -52,8 +52,10 @@ StartupNotify=true
 Type=Application
 Terminal=false
 Categories=Application;
-MimeType=x-scheme-handler/obsidian;
+MimeType=x-scheme-handler/obsidian;application/x-obsidian-vault;text/markdown;x-scheme-handler/obsidian-dev;
 Exec=sh -c '"$HOME/.local/bin/Obsidian.AppImage" "$1"' sh %u
 EOF
 
 xdg-mime default Obsidian.desktop x-scheme-handler/obsidian
+
+xdg-mime default Obsidian.desktop text/markdown

{distroscript-0.2.0 → distroscript-0.2.1}/tests/outputs/ubuntu/17-appimage.sh

@@ -29,7 +29,7 @@ Type=Application
 Terminal=false
 Categories=Game;Emulator;
 Icon=org.duckstation.DuckStation
-Exec=sh -c "$HOME/.local/bin/DuckStation.AppImage"
+Exec=sh -c '"$HOME/.local/bin/DuckStation.AppImage" "$1"' sh %u
 EOF
 
 (
@@ -52,8 +52,10 @@ StartupNotify=true
 Type=Application
 Terminal=false
 Categories=Application;
-MimeType=x-scheme-handler/obsidian;
+MimeType=x-scheme-handler/obsidian;application/x-obsidian-vault;text/markdown;x-scheme-handler/obsidian-dev;
 Exec=sh -c '"$HOME/.local/bin/Obsidian.AppImage" "$1"' sh %u
 EOF
 
 xdg-mime default Obsidian.desktop x-scheme-handler/obsidian
+
+xdg-mime default Obsidian.desktop text/markdown