v1.1.23 Packaging error for ToobAmp plugins..

.vscode/launch.json

@@ -223,7 +223,8 @@
             // Resolved by CMake Tools:
             "program": "${command:cmake.launchTargetPath}",
             "args": [ 
-                "--uninstall"
+                "--get-current-port"
+                // "--uninstall"
                 //"--enable-p2p" , "--nopkexec"
                 //,"CA", "PiPedalTest","12345678","1"
             ],

CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(pipedal 
-    VERSION 1.1.22
+    VERSION 1.1.23
     DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
     HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
 )
-set (DISPLAY_VERSION "v1.1.22")
+set (DISPLAY_VERSION "v1.1.23")
 
 set (CMAKE_INSTALL_PREFIX "/usr/")
 

README.md

@@ -1,7 +1,7 @@
 
 <img src='docs/GithubBanner.png' width="100%" /><br/>
 
-Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.1.22</a> 
+Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.1.23</a> 
 
 Website: [https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
 

debian/control

@@ -9,6 +9,6 @@ Package: pipedal
 Pre-Depends: hostapd;authbind;dnsmasq
 Priority: optional
 Section: sound
-Version: 1.1.22
+Version: 1.1.23
 Installed-Size: 15147
 

docs/Installing.md

@@ -13,14 +13,14 @@ page_icon: img/Install4.jpg
 
 Download the most recent Debian (.deb) package for your platform:
 
-- [Ubuntu/Raspberry Pi OS (64-bit) v1.1.22](https://github.com/rerdavies/pipedal/releases/download/v1.1.22/pipedal_1.1.22_arm64.deb)
+- [Ubuntu/Raspberry Pi OS (64-bit) v1.1.23](https://github.com/rerdavies/pipedal/releases/download/v1.1.23/pipedal_1.1.23_arm64.deb)
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install ./pipedal_1.1.22_arm64.deb
+  sudo apt-get install ./pipedal_1.1.23_arm64.deb
 ```
 On Raspberry Pi OS, if you have a graphical desktop installed, you can also install the package by double-clicking on the downloaded package in the File Manager.
 

docs/ReleaseNotes.md

@@ -1,6 +1,6 @@
 # Release Notes
 
-## PiPedal 1.1.22
+## PiPedal 1.1.23
 
 Features:
 

docs/download.md

@@ -4,14 +4,14 @@
 
 Download the most recent Debian (.deb) package for your platform:
 
-- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v1.1.22/pipedal_1.1.22_arm64.deb) v1.1.22
+- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v1.1.23/pipedal_1.1.23_arm64.deb) v1.1.23
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install ./pipedal_1.1.22_arm64.deb
+  sudo apt-get install ./pipedal_1.1.23_arm64.deb
 ```
 
 Follow the instructions in [_Configuring PiPedal After Installation_](https://rerdavies.github.io/pipedal/Configuring.html) to complete the installation.

docs/index.md

@@ -1,7 +1,7 @@
 
 
 <img src="GithubBanner.png" width="100%"/>
-<a href="Installing.html"><i>v1.1.22</i></a>
+<a href="Installing.html"><i>v1.1.23</i></a>
 
 &nbsp;
 

lv2/aarch64/ToobAmp.lv2/ToobAmp.so.0

@@ -1 +1 @@
-ToobAmp.so.1.0.11
+ToobAmp.so.1.0.12

src/ConfigMain.cpp

@@ -781,6 +781,49 @@ void Install(const std::filesystem::path &programPrefix, const std::string endpo
          << "\n";
 }
 
+static std::string GetCurrentWebServicePort()
+{
+    std::filesystem::path servicePath = GetServiceFileName(NATIVE_SERVICE);
+    try
+    {
+        if (std::filesystem::exists(servicePath))
+        {
+            {
+                ifstream f(servicePath);
+                if (!f.is_open())
+                {
+                    throw PiPedalException(SS("Can't open " << servicePath));
+                }
+                while (true)
+                {
+                    std::string line;
+                    if (f.eof())
+                        break;
+                    std::getline(f, line);
+                    if (line.starts_with("ExecStart="))
+                    {
+                        auto startPos = line.find("-port ");
+                        if (startPos != std::string::npos)
+                        {
+                            startPos = startPos+6;
+                            auto endPos = line.find(" -systemd");
+                            if (endPos != std::string::npos)
+                            {
+                                std::string result = line.substr(startPos,endPos-startPos);
+                                return result;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch (const std::exception &/*ignored*/)
+    {
+    }
+    return "";
+}
+
 static void PrintHelp()
 {
     PrettyPrinter pp;
@@ -930,6 +973,7 @@ int main(int argc, char **argv)
     bool enable = false, disable = false, restart = false;
     bool enable_ap = false, disable_ap = false;
     bool enable_p2p = false, disable_p2p = false;
+    bool get_current_port = false;
     bool nopkexec = false;
     bool excludeShutdownService = false;
     std::string prefixOption;
@@ -952,19 +996,25 @@ int main(int argc, char **argv)
     parser.AddOption("--enable-p2p", &enable_p2p);
     parser.AddOption("--disable-p2p", &disable_p2p);
 
+    parser.AddOption("--get-current-port", &get_current_port); // private. For debug use only.
+
     parser.AddOption("--excludeShutdownService", &excludeShutdownService); // private (unstable) option used by shutdown service.
     try
     {
         parser.Parse(argc, (const char **)argv);
 
-        int actionCount = install + uninstall + stop + start + enable + disable + enable_ap + disable_ap + restart + enable_p2p + disable_p2p;
+        int actionCount = get_current_port + install + uninstall + stop + start + enable + disable + enable_ap + disable_ap + restart + enable_p2p + disable_p2p;
         if (actionCount > 1)
         {
             throw PiPedalException("Please provide only one action.");
         }
-        if (actionCount == 0)
+        if (argc == 1 )
         {
             help = true;
+        } else if (actionCount == 0)
+        {
+
+            throw PiPedalException("No action provided.");
         }
         if ((!enable_p2p) && (!enable_ap))
         {
@@ -992,6 +1042,11 @@ int main(int argc, char **argv)
         PrintHelp();
         return EXIT_SUCCESS;
     }
+    if (get_current_port)
+    {
+        std::cout << "current port: " << GetCurrentWebServicePort() << std::endl;
+        return 0;
+    }
     if (portOption.size() != 0 && !install)
     {
         cout << "Error: -port option can only be specified with the -install option."
@@ -1044,7 +1099,11 @@ int main(int argc, char **argv)
 
             if (portOption == "")
             {
-                portOption = "80";
+                portOption = GetCurrentWebServicePort();
+                if (portOption == "")
+                {
+                    portOption = "80";
+                }
             }
             if (portOption.find(':') == string::npos)
             {