Auto-select web server port (for Ubuntu); --port option for PiPedalCo…

…nfig
rerdavies · Nov 24, 2024 · 8787073 · 8787073
1 parent 96df3ac
commit 8787073
Show file tree

Hide file tree

Showing 23 changed files with 244 additions and 94 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -11,7 +11,7 @@
                 "/usr/lib",
                 "~/src/vst3sdk"
             ],
-            "compilerPath": "/usr/bin/gcc",
+            "compilerPath": "/usr/bin/gcc-12",
             "cStandard": "c17",
             "cppStandard": "c++20",
             "intelliSenseMode": "linux-gcc-arm64",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -266,23 +266,20 @@
                 }
             ]
         },
-
-
         {
-            "name": "(gdb) processCopyrights Launch",
+            "name": "(gdb) pipedalconfigX",
             "type": "cppdbg",
             "request": "launch",
             // Resolved by CMake Tools:
-            "program": "${command:cmake.launchTargetPath}",
-            ///"args": [            "[lv2host_leak]" ],
-
-            "args": [
-                "--projectCopyright",
-                "debian/copyright",
-                "--output",
-                "/tmp/copyrights.txt",
-                "liblilv-0-0", "lv2-dev", "libsdbus-c++-dev", "librsvg2-2", "libpango-1.0-0", "libx11-6", "libxrandr2"
-
+            "program": "/home/robin/src/pipedal/build/src/pipedalconfig",
+            "args": [ 
+                "--nosudo", // run without sudo (which will fail because of perms, but allow us to debug deeper into install code.)
+                //"--get-current-port"
+                // "--uninstall"
+                //"--enable-p2p" , "CA", "PiPedalTest","12345678","14"
+                // "--alsa-devices"
+                "--prefix", "/usr",
+                "--install", "--port", "0"
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
@@ -296,8 +293,7 @@
                     "value": "detect_leaks=0"
 
                 },
-
-                {
+               {
                     "name": "OTHER_VALUE",
                     "value": "Something something"
                 }
@@ -312,18 +308,23 @@
                 }
             ]
         },
+
+
         {
-            "name": "(gdb) pipedalconfig",
+            "name": "(gdb) processCopyrights Launch",
             "type": "cppdbg",
             "request": "launch",
             // Resolved by CMake Tools:
             "program": "${command:cmake.launchTargetPath}",
-            "args": [ 
-                "--nosudo", // run without sudo (which will fail because of perms, but allow us to debug deeper into install code.)
-                //"--get-current-port"
-                // "--uninstall"
-                //"--enable-p2p" , "CA", "PiPedalTest","12345678","14"
-                "--alsa-devices"
+            ///"args": [            "[lv2host_leak]" ],
+
+            "args": [
+                "--projectCopyright",
+                "debian/copyright",
+                "--output",
+                "/tmp/copyrights.txt",
+                "liblilv-0-0", "lv2-dev", "libsdbus-c++-dev", "librsvg2-2", "libpango-1.0-0", "libx11-6", "libxrandr2"
+
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
@@ -337,7 +338,8 @@
                     "value": "detect_leaks=0"
 
                 },
-               {
+
+                {
                     "name": "OTHER_VALUE",
                     "value": "Something something"
                 }

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -110,5 +110,6 @@
         "pipedalshutdownd",
         "pipedaltest",
         "ToobAmp"
-    ]
+    ],
+    "C_Cpp.default.compilerPath": "/usr/bin/g++-13"
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -98,7 +98,7 @@ endif()
 
 set(CPACK_GENERATOR "DEB")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Robin E. R. Davies<rerdavies@gmail.com>") # required
-set(CPACK_PACKAGE_VENDOR "Robin Davies")
+set(CPACK_PACKAGE_VENDOR "Robin E. R. Davies")
 set(CPACK_PACKAGE_DESCRIPTION "IoT guitar effect pedal for Raspberry Pi, with phone-friendly web interface.")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IoT guitar effect pedal for Raspberry Pi")
 set(CPACK_DEBIAN_PACKAGE_SECTION sound)

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2021-2024 Robin Davies
+Copyright 2021-2024 Robin E. R. Davies
 
 Permission is hereby granted, free of charge, to any person obtaining 
 a copy of this software and associated documentation files (the "Software"), 

diff --git a/NetworkManagerP2P/src/main.cpp b/NetworkManagerP2P/src/main.cpp
@@ -17,7 +17,7 @@ using namespace std;
 static void PrintHelp()
 {
     cout << "nm-pipedal-p2p - P2P Manager for NetworkManager network stack." << endl
-         << "Copyright (c) 2024 Robin Davies." << endl
+         << "Copyright (c) 2024 Robin E. R. Davies." << endl
          << endl
          << "Provides P2P connections on LINUX distributions that use NetworkManager." << endl
          << endl

diff --git a/NetworkManagerP2P/src/ss.hpp b/NetworkManagerP2P/src/ss.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Robin Davies
+// Copyright (c) 2022 Robin E. R. Davies
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

diff --git a/PiPedalCommon/src/HtmlHelper.cpp b/PiPedalCommon/src/HtmlHelper.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Robin Davies
+// Copyright (c) 2022 Robin E. R. Davies
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

diff --git a/PiPedalCommon/src/Lv2Log.cpp b/PiPedalCommon/src/Lv2Log.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Robin Davies
+// Copyright (c) 2022 Robin E. R. Davies
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

diff --git a/PiPedalCommon/src/NetLinkChannelInfo.cpp b/PiPedalCommon/src/NetLinkChannelInfo.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2007, 2008	Johannes Berg
 Copyright (c) 2007		Andy Lutomirski
 Copyright (c) 2007		Mike Kershaw
 Copyright (c) 2008		Luis R. Rodriguez
-Copyright (c) 2024      Robin Davies
+Copyright (c) 2024      Robin E. R. Davies
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/PiPedalCommon/src/NetLinkChannelInfo.cpp.bak b/PiPedalCommon/src/NetLinkChannelInfo.cpp.bak
@@ -3,7 +3,7 @@ Copyright (c) 2007, 2008	Johannes Berg
 Copyright (c) 2007		Andy Lutomirski
 Copyright (c) 2007		Mike Kershaw
 Copyright (c) 2008		Luis R. Rodriguez
-Copyright (c) 2024      Robin Davies
+Copyright (c) 2024      Robin E. R. Davies
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/PiPedalCommon/src/json.cpp b/PiPedalCommon/src/json.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Robin Davies
+// Copyright (c) 2022 Robin E. R. Davies
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

diff --git a/debian/copyright b/debian/copyright
@@ -1,24 +1,24 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pipedal
-Upstream-Contact: Robin Davies <rerdavies@gmail.com>
+Upstream-Contact: Robin E. R. Davies <rerdavies@gmail.com>
 Source: https://www.example.com/software/project
 
 Files: *
-Copyright: 2021, Robin Davies
+Copyright: 2021, Robin E. R. Davies
 License: Expat
 
 Files: src/*
-Copyright: 2021, Robin Davies
+Copyright: 2021, Robin E. R. Davies
 License: Expat
 
 
 Files: react/src
-Copyright: 2020, Robin Davies.
+Copyright: 2020, Robin E. R. Davies.
 License: Expat
 
 Files: src/Lv2EventBufferWriter.hpp
 Copyright: 2008-2014, David Robillard <d@drobilla.net>
-    2021, Robin Davies
+    2021, Robin E. R. Davies
 License: ISC and Expat
 
 Files: react/node_modules/@babel/*

diff --git a/debian/fill.copyright.blanks.yml b/debian/fill.copyright.blanks.yml
@@ -1,11 +1,11 @@
 ---
 /:
   license: Expat
-  copyright: 2021, Robin Davies.
+  copyright: 2021, Robin E. R. Davies.
 
 src/react/:
   license: Expat
-  copyright: 2021, Robin Davies.
+  copyright: 2021, Robin E. R. Davies.
 
 react/node_modules/webpack/:
   license: Expat

diff --git a/docs/LicensePiPedal.md b/docs/LicensePiPedal.md
@@ -1,4 +1,4 @@
-Copyright 2021-2024 Robin Davies
+Copyright 2021-2024 Robin E. R. Davies
 
 Permission is hereby granted, free of charge, to any person obtaining 
 a copy of this software and associated documentation files (the "Software"), 

diff --git a/docs/LicenseToobAmp.md b/docs/LicenseToobAmp.md
@@ -1,4 +1,4 @@
-Copyright 2021-2023 Robin Davies
+Copyright 2021-2023 Robin E. R. Davies
 
 Permission is hereby granted, free of charge, to any person obtaining 
 a copy of this software and associated documentation files (the "Software"), 

diff --git a/react/src/PiPedalModel.tsx b/react/src/PiPedalModel.tsx
@@ -1014,7 +1014,7 @@ export class PiPedalModel //implements PiPedalModel
         try { 
             await this.webSocket.connect();
         } catch (error) {
-            this.setError("Failed to connect to server. (" + getErrorMessage(error));
+            this.setError("Failed to connect to server. " + getErrorMessage(error) );
             return false;
 
         }

diff --git a/react/src/PiPedalSocket.tsx b/react/src/PiPedalSocket.tsx
@@ -281,7 +281,7 @@ class PiPedalSocket {
                 ws.onerror = (evt: Event) => {
                     ws.onclose = null;
                     ws.onerror = null;
-                    reject("Failed to connect.");
+                    reject("Connection not accepted.");
                 };
                 ws.onopen = (event: Event) => {
                     ws.onerror = self.handleError.bind(self);
@@ -290,7 +290,7 @@ class PiPedalSocket {
                     resolve(ws);
                 };
             } catch (e: any){
-                reject("Failed to connect. " + e.toString());
+                reject("Failed to connect: " + e.toString());
             };
         });
 }

diff --git a/src/AvahiService.cpp b/src/AvahiService.cpp
@@ -181,6 +181,7 @@ void AvahiService::EntryGroupCallback(AvahiEntryGroup *g, AvahiEntryGroupState s
         char *n = avahi_alternative_service_name(avahiNameString);
         avahi_free(avahiNameString);
         avahiNameString = n;
+        this->serviceName = n;
         Lv2Log::warning(SS("Service name collision, renaming service to '" << avahiNameString << "'\n"));
         /* And recreate the services */
         create_group(avahi_entry_group_get_client(g));