From b84bc65f766951f42b1a30ff128f0ef2cb170c04 Mon Sep 17 00:00:00 2001
From: Joshua Richardson <joshua@richardson.tech>
Date: Mon, 29 Jun 2020 13:09:05 +0100
Subject: [PATCH] Appimage changes

---
 build/build_initial_release.sh |  5 ++---
 src/main/python/main.py        | 12 +++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/build_initial_release.sh b/build/build_initial_release.sh
index 66b3d98..5d7b82d 100755
--- a/build/build_initial_release.sh
+++ b/build/build_initial_release.sh
@@ -2,17 +2,16 @@
 # This is intended to be executed inside an fbs-created Ubuntu VM
 # run `fbs buildvm ubuntu` and `fbs runvm ubuntu`, then invoke this script
 
-pip install -r requirements.txt
 tar -xvf zlib-1.2.9.tar.gz
 cd zlib-1.2.9
 sudo -s
 ./configure; make; make install
 cd /lib/x86_64-linux-gnu
 ln -s -f /usr/local/lib/libz.so.1.2.9/lib libz.so.1
-cd ~/cadmus
 rm -rf zlib-1.2.9
+cd ~/cadmus
 
-cd ..
+pip install -r requirements.txt
 fbs freeze
 cp src/main/python/librnnoise_ladspa.so target/cadmus
 fbs installer
\ No newline at end of file
diff --git a/src/main/python/main.py b/src/main/python/main.py
index 37b08d2..e33c8e0 100644
--- a/src/main/python/main.py
+++ b/src/main/python/main.py
@@ -3,6 +3,7 @@
 from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QSystemTrayIcon, QMenu, QAction
 from fbs_runtime.application_context.PyQt5 import ApplicationContext
+from shutil import copyfile
 import contextlib
 import os
 import pulsectl
@@ -26,11 +27,16 @@ def cli_command(command):
 
 
 def load_modules(mic_name):
-    print(mic_name)
+    cadmus_cache_path = os.path.join(os.environ['HOME'], '.cache', 'cadmus')
+    if not os.path.exists(cadmus_cache_path):
+        os.makedirs(cadmus_cache_path)
+
+    cadmus_lib_path = os.path.join(cadmus_cache_path, "librnnoise_ladspa.so")
+    copyfile(os.path.abspath("librnnoise_ladspa.so"), cadmus_lib_path)
+
     pulse.module_load('module-null-sink', 'sink_name=%s' % 'mic_denoised_out')
     pulse.module_load('module-ladspa-sink',
-                      'sink_name=mic_raw_in sink_master=mic_denoised_out label=noise_suppressor_mono plugin=%s' % os.path.abspath(
-                          "librnnoise_ladspa.so"))
+                      'sink_name=mic_raw_in sink_master=mic_denoised_out label=noise_suppressor_mono plugin=%s' % cadmus_lib_path)
 
     pulse.module_load('module-loopback',
                       'latency_msec=1 source=%s sink=mic_raw_in channels=1' % mic_name)