iarv/pyMC_Repeater
1
0
Fork 1
mirror of https://github.com/rightup/pyMC_Repeater.git synced 2026-05-07 05:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update file paths for radio settings and presets to use config-based directory

Browse Source
This commit is contained in:
Lloyd
2026-01-09 12:14:38 +00:00
parent 0baddc1416
commit d7a886d0e5
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manage.sh
+4 -4
View File
@@ -242,8 +242,8 @@ install_repeater() {
cp "$SCRIPT_DIR/README.md" "$INSTALL_DIR/"
cp "$SCRIPT_DIR/manage.sh" "$INSTALL_DIR/" 2>/dev/null || true
cp "$SCRIPT_DIR/pymc-repeater.service" "$INSTALL_DIR/" 2>/dev/null || true
cp "$SCRIPT_DIR/radio-settings.json" "$INSTALL_DIR/" 2>/dev/null || true
cp "$SCRIPT_DIR/radio-presets.json" "$INSTALL_DIR/" 2>/dev/null || true
cp "$SCRIPT_DIR/radio-settings.json" /var/lib/pymc_repeater/ 2>/dev/null || true
cp "$SCRIPT_DIR/radio-presets.json" /var/lib/pymc_repeater/ 2>/dev/null || true
echo "45"; echo "# Installing configuration..."
cp "$SCRIPT_DIR/config.yaml.example" "$CONFIG_DIR/config.yaml.example"
@@ -413,8 +413,8 @@ upgrade_repeater() {
cp pyproject.toml "$INSTALL_DIR/" 2>/dev/null || true
cp README.md "$INSTALL_DIR/" 2>/dev/null || true
cp pymc-repeater.service /etc/systemd/system/ 2>/dev/null || true
cp radio-settings.json "$INSTALL_DIR/" 2>/dev/null || true
cp radio-presets.json "$INSTALL_DIR/" 2>/dev/null || true
cp radio-settings.json /var/lib/pymc_repeater/ 2>/dev/null || true
cp radio-presets.json /var/lib/pymc_repeater/ 2>/dev/null || true
echo " ✓ Files updated"
echo "[5/9] Validating and updating configuration..."
repeater/web/api_endpoints.py
+9 -6
View File
@@ -3,6 +3,7 @@ import logging
import os
import time
from datetime import datetime
from pathlib import Path
from typing import Callable, Optional
import cherrypy
from repeater import __version__
@@ -260,11 +261,12 @@ class APIEndpoints:
try:
import json
# Check installed location first, then development location
installed_path = '/usr/share/pymc_repeater/radio-settings.json'
# Check config-based location first, then development location
config_dir = Path(self.config.get("storage_dir", "/var/lib/pymc_repeater"))
installed_path = config_dir / 'radio-settings.json'
dev_path = os.path.join(os.path.dirname(__file__), '..', '..', 'radio-settings.json')
hardware_file = installed_path if os.path.exists(installed_path) else dev_path
hardware_file = str(installed_path) if installed_path.exists() else dev_path
if not os.path.exists(hardware_file):
logger.error(f"Hardware file not found. Tried: {installed_path}, {dev_path}")
@@ -298,11 +300,12 @@ class APIEndpoints:
try:
import json
# Check installed location first, then development location
installed_path = '/usr/share/pymc_repeater/radio-presets.json'
# Check config-based location first, then development location
config_dir = Path(self.config.get("storage_dir", "/var/lib/pymc_repeater"))
installed_path = config_dir / 'radio-presets.json'
dev_path = os.path.join(os.path.dirname(__file__), '..', '..', 'radio-presets.json')
presets_file = installed_path if os.path.exists(installed_path) else dev_path
presets_file = str(installed_path) if installed_path.exists() else dev_path
if not os.path.exists(presets_file):
logger.error(f"Presets file not found. Tried: {installed_path}, {dev_path}")