From 8395ac42d05d8ab6733394f3dd172a22751ecfee Mon Sep 17 00:00:00 2001
From: beeanyew <beeanyew@gmail.com>
Date: Thu, 20 May 2021 20:34:14 +0200
Subject: [PATCH] Maybe make A314 emulation launch Python scripts automatically

---
 a314/a314.cc              | 7 ++++---
 a314/files_pi/a314d.conf  | 7 +++++++
 a314/files_pi/a314fs.conf | 2 +-
 a314/files_pi/a314fs.py   | 4 ++--
 a314/files_pi/picmd.py    | 4 ++--
 default.cfg               | 2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 a314/files_pi/a314d.conf

diff --git a/a314/a314.cc b/a314/a314.cc
index a0eb9e5..555396f 100644
--- a/a314/a314.cc
+++ b/a314/a314.cc
@@ -221,14 +221,15 @@ struct OnDemandStart
 
 std::vector<OnDemandStart> on_demand_services;
 
-std::string a314_config_file = "/etc/opt/a314/a314d.conf";
-std::string home_env = "HOME=/home/pi";
+std::string a314_config_file = "./a314/files_pi/a314d.conf";
+std::string home_env = "HOME=./";
 
 static void load_config_file(const char *filename)
 {
     FILE *f = fopen(filename, "rt");
-    if (f == nullptr)
+    if (f == nullptr) {
         return;
+    }
 
     char line[256];
     std::vector<char *> parts;
diff --git a/a314/files_pi/a314d.conf b/a314/files_pi/a314d.conf
new file mode 100644
index 0000000..ffe60df
--- /dev/null
+++ b/a314/files_pi/a314d.conf
@@ -0,0 +1,7 @@
+a314fs		python3	./a314/files_pi/a314fs.py
+picmd		python3	./a314/files_pi/picmd.py
+piaudio		python3	./a314/files_pi/piaudio.py
+remotewb	python3	./a314/files_pi/remotewb.py
+remote-mouse	python3	./a314/files_pi/remote-mouse.py
+videoplayer	python3	./a314/files_pi/videoplayer.py
+ethernet	python3	./a314/files_pi/ethernet.py
diff --git a/a314/files_pi/a314fs.conf b/a314/files_pi/a314fs.conf
index 6361277..2468989 100644
--- a/a314/files_pi/a314fs.conf
+++ b/a314/files_pi/a314fs.conf
@@ -2,7 +2,7 @@
   "devices": {
     "PI0": {
       "volume": "PiDisk",
-      "path": "/home/pi/a314shared"
+      "path": "./a314/files_pi/a314shared"
     }
   }
 }
diff --git a/a314/files_pi/a314fs.py b/a314/files_pi/a314fs.py
index 75e0a27..185caa0 100755
--- a/a314/files_pi/a314fs.py
+++ b/a314/files_pi/a314fs.py
@@ -17,9 +17,9 @@ logging.basicConfig(format = '%(levelname)s, %(asctime)s, %(name)s, line %(linen
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
-CONFIG_FILE_PATH = './a314fs.conf'
+CONFIG_FILE_PATH = 'a314_files_pi/a314fs.conf'
 
-SHARED_DIRECTORY = '/home/pi/a314shared'
+SHARED_DIRECTORY = 'data/a314shared'
 METAFILE_EXTENSION = ':a314'
 
 with open(CONFIG_FILE_PATH, encoding='utf-8') as f:
diff --git a/a314/files_pi/picmd.py b/a314/files_pi/picmd.py
index c0bf69e..c67ce45 100755
--- a/a314/files_pi/picmd.py
+++ b/a314/files_pi/picmd.py
@@ -21,8 +21,8 @@ logging.basicConfig(format = '%(levelname)s, %(asctime)s, %(name)s, line %(linen
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
-FS_CFG_FILE = './files_pi/a314fs.conf'
-PICMD_CFG_FILE = './files_pi/picmd.conf'
+FS_CFG_FILE = 'a314/files_pi/a314fs.conf'
+PICMD_CFG_FILE = 'a314/files_pi/picmd.conf'
 
 volume_paths = {}
 search_path = ''
diff --git a/default.cfg b/default.cfg
index b8f46a2..e624922 100644
--- a/default.cfg
+++ b/default.cfg
@@ -46,7 +46,7 @@ setvar piscsi6 platforms/amiga/pistorm.hdf
 #setvar pi-net
 
 # Uncomment and edit to set a custom config filename for the A314 emulation
-#setvar a314_conf /etc/opt/a314/a314d.conf
+#setvar a314_conf ./a314/files_pi/a314d.conf
 # Uncomment to enable A314 emulation
 #setvar a314
 
-- 
2.39.2