mmrelay 1.0.5__tar.gz → 1.0.6__tar.gz

{mmrelay-1.0.5/src/mmrelay.egg-info → mmrelay-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mmrelay
-Version: 1.0.5
+Version: 1.0.6
 Summary: Bridge between Meshtastic mesh networks and Matrix chat rooms
 Home-page: https://github.com/geoffwhittington/meshtastic-matrix-relay
 Author: Geoff Whittington, Jeremiah K., and contributors
@@ -25,6 +25,7 @@ Requires-Dist: schedule==1.2.2
 Requires-Dist: platformdirs==4.3.7
 Requires-Dist: py-staticmaps>=0.4.0
 Requires-Dist: rich==14.0.0
+Requires-Dist: setuptools==80.3.1
 Dynamic: license-file
 
 # M<>M Relay

{mmrelay-1.0.5 → mmrelay-1.0.6}/requirements.txt

@@ -9,3 +9,4 @@ schedule==1.2.2
 platformdirs==4.3.7
 py-staticmaps>=0.4.0
 rich==14.0.0
+setuptools==80.3.1

{mmrelay-1.0.5 → mmrelay-1.0.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mmrelay
-version = 1.0.5
+version = 1.0.6
 author = Geoff Whittington, Jeremiah K., and contributors
 author_email = jeremiahk@gmx.com
 description = Bridge between Meshtastic mesh networks and Matrix chat rooms
@@ -33,6 +33,8 @@ install_requires =
 	platformdirs==4.3.7
 	py-staticmaps>=0.4.0
 	rich==14.0.0
+	setuptools==80.3.1
+include_package_data = True
 
 [options.packages.find]
 where = src

{mmrelay-1.0.5 → mmrelay-1.0.6}/src/mmrelay/setup_utils.py

@@ -91,42 +91,82 @@ def get_template_service_path():
         str: The path to the template service file, or None if not found.
     """
     # Try to find the service template file
-    # First, check in the package directory (where it should be after installation)
     package_dir = os.path.dirname(__file__)
-    template_path = os.path.join(
-        os.path.dirname(os.path.dirname(package_dir)), "tools", "mmrelay.service"
-    )
-
-    # If not found, try the repository root (for development)
-    if not os.path.exists(template_path):
-        repo_root = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        template_path = os.path.join(repo_root, "tools", "mmrelay.service")
-
-    # If still not found, try the current directory (fallback)
-    if not os.path.exists(template_path):
-        template_path = os.path.join(os.getcwd(), "tools", "mmrelay.service")
 
-    if not os.path.exists(template_path):
-        return None
-
-    return template_path
+    # Try to find the service template file in various locations
+    template_paths = [
+        # Check in the package directory (where it should be after installation)
+        os.path.join(package_dir, "mmrelay.service"),
+        # Check in a tools subdirectory of the package
+        os.path.join(package_dir, "tools", "mmrelay.service"),
+        # Check in the data files location (where it should be after installation)
+        os.path.join(sys.prefix, "share", "mmrelay", "mmrelay.service"),
+        os.path.join(sys.prefix, "share", "mmrelay", "tools", "mmrelay.service"),
+        # Check in the user site-packages location
+        os.path.join(os.path.expanduser("~"), ".local", "share", "mmrelay", "mmrelay.service"),
+        os.path.join(os.path.expanduser("~"), ".local", "share", "mmrelay", "tools", "mmrelay.service"),
+        # Check one level up from the package directory
+        os.path.join(os.path.dirname(package_dir), "tools", "mmrelay.service"),
+        # Check two levels up from the package directory (for development)
+        os.path.join(os.path.dirname(os.path.dirname(package_dir)), "tools", "mmrelay.service"),
+        # Check in the repository root (for development)
+        os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "tools", "mmrelay.service"),
+        # Check in the current directory (fallback)
+        os.path.join(os.getcwd(), "tools", "mmrelay.service")
+    ]
+
+    # Try each path until we find one that exists
+    for path in template_paths:
+        if os.path.exists(path):
+            return path
+
+    # If we get here, we couldn't find the template
+    # Debug output to help diagnose issues
+    print("Debug: Could not find mmrelay.service in any of these locations:")
+    for path in template_paths:
+        print(f"  - {path}")
+
+    # If we get here, we couldn't find the template
+    return None
 
 
 def get_template_service_content():
     """Get the content of the template service file.
 
     Returns:
-        str: The content of the template service file, or None if not found.
+        str: The content of the template service file, or a default template if not found.
     """
     template_path = get_template_service_path()
-    if not template_path:
-        return None
-
-    # Read the template
-    with open(template_path, "r") as f:
-        service_template = f.read()
-
-    return service_template
+    if template_path:
+        # Read the template from file
+        try:
+            with open(template_path, "r") as f:
+                service_template = f.read()
+            return service_template
+        except Exception as e:
+            print(f"Error reading service template file: {e}")
+
+    # If we couldn't find or read the template file, use a default template
+    print("Using default service template")
+    return """[Unit]
+Description=A Meshtastic <=> Matrix Relay
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=idle
+# The mmrelay binary can be installed via pipx or pip
+ExecStart=%h/.local/bin/mmrelay --config %h/.mmrelay/config.yaml --logfile %h/.mmrelay/logs/mmrelay.log
+WorkingDirectory=%h/.mmrelay
+Restart=on-failure
+RestartSec=10
+Environment=PYTHONUNBUFFERED=1
+# Ensure both pipx and pip environments are properly loaded
+Environment=PATH=%h/.local/bin:%h/.local/pipx/venvs/mmrelay/bin:/usr/local/bin:/usr/bin:/bin
+
+[Install]
+WantedBy=default.target
+"""
 
 
 def is_service_enabled():

{mmrelay-1.0.5 → mmrelay-1.0.6/src/mmrelay.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mmrelay
-Version: 1.0.5
+Version: 1.0.6
 Summary: Bridge between Meshtastic mesh networks and Matrix chat rooms
 Home-page: https://github.com/geoffwhittington/meshtastic-matrix-relay
 Author: Geoff Whittington, Jeremiah K., and contributors
@@ -25,6 +25,7 @@ Requires-Dist: schedule==1.2.2
 Requires-Dist: platformdirs==4.3.7
 Requires-Dist: py-staticmaps>=0.4.0
 Requires-Dist: rich==14.0.0
+Requires-Dist: setuptools==80.3.1
 Dynamic: license-file
 
 # M<>M Relay

{mmrelay-1.0.5 → mmrelay-1.0.6}/src/mmrelay.egg-info/requires.txt

@@ -9,3 +9,4 @@ schedule==1.2.2
 platformdirs==4.3.7
 py-staticmaps>=0.4.0
 rich==14.0.0
+setuptools==80.3.1