Merge branch 'main' into tx812-performance

src/minidexed.cpp

@@ -2334,7 +2334,8 @@ void CMiniDexed::UpdateNetwork()
 		}
 
 		static constexpr const char *ServiceTypeFTP = "_ftp._tcp";
-		if (!m_pmDNSPublisher->PublishService (m_pConfig->GetNetworkHostname(), ServiceTypeFTP, 21))
+		static const char *ftpTxt[] = { "app=MiniDexed", nullptr };
+		if (!m_pmDNSPublisher->PublishService (m_pConfig->GetNetworkHostname(), ServiceTypeFTP, 21, ftpTxt))
 		{
 			LOGPANIC ("Cannot publish mdns service");
 		}
@@ -2384,7 +2385,8 @@ void CMiniDexed::UpdateNetwork()
 		}
 
 		static constexpr const char *ServiceTypeFTP = "_ftp._tcp";
-		if (!m_pmDNSPublisher->PublishService (m_pConfig->GetNetworkHostname(), ServiceTypeFTP, 21))
+		static const char *ftpTxt[] = { "app=MiniDexed", nullptr };
+		if (!m_pmDNSPublisher->PublishService (m_pConfig->GetNetworkHostname(), ServiceTypeFTP, 21, ftpTxt))
 		{
 			LOGPANIC ("Cannot publish mdns service");
 		}

src/uimenu.cpp

@@ -1574,9 +1574,11 @@ void CUIMenu::PerformanceMenu (CUIMenu *pUIMenu, TMenuEvent Event)
 	}
 	std::string Value;
 		
-	if (Event == MenuEventUpdate)
+	if (Event == MenuEventUpdate || Event == MenuEventUpdateParameter)
 	{
 		pUIMenu->m_bPerformanceDeleteMode=false;
+		// Ensure selected performance matches the actual loaded one
+		pUIMenu->m_nSelectedPerformanceID = pUIMenu->m_pMiniDexed->GetActualPerformanceID();
 	}
 	
 	if (pUIMenu->m_bSplashShow)
@@ -1705,7 +1707,7 @@ void CUIMenu::PerformanceMenu (CUIMenu *pUIMenu, TMenuEvent Event)
 		nPPerf = nPPerf.substr(nPPerf.length()-3,3);
 
 		nPSelected += ":"+nPPerf;
-		if(nValue == pUIMenu->m_pMiniDexed->GetActualPerformanceID())
+		if(bPerformanceSelectToLoad && nValue == pUIMenu->m_pMiniDexed->GetActualPerformanceID())
 		{
 			nPSelected += " [L]";
 		}
@@ -1793,7 +1795,7 @@ void CUIMenu::EditPerformanceBankNumber (CUIMenu *pUIMenu, TMenuEvent Event)
 	nPSelected += std::to_string(nValue+1);  // Convert to user-facing number rather than index
 	nPSelected = nPSelected.substr(nPSelected.length()-3,3);
 
-	if(nValue == (unsigned)pUIMenu->m_pMiniDexed->GetParameter (CMiniDexed::ParameterPerformanceBank))
+	if(bPerformanceSelectToLoad && nValue == (unsigned)pUIMenu->m_pMiniDexed->GetParameter (CMiniDexed::ParameterPerformanceBank))
 	{
 		nPSelected += " [L]";
 	}

updater.py

@@ -36,10 +36,18 @@ class MyListener(ServiceListener):
         info = zc.get_service_info(type_, name)
         print(f"Service {name} added, service info: {info}")
         if info and info.addresses:
+            # Only add if TXT record contains 'MiniDexed'
+            txt_records = info.properties
+            if txt_records:
+                for k, v in txt_records.items():
+                    # v may be bytes, decode if needed
+                    val = v.decode() if isinstance(v, bytes) else v
+                    if (b"MiniDexed" in k or b"MiniDexed" in v) or ("MiniDexed" in str(k) or "MiniDexed" in str(val)):
                         ip = socket.inet_ntoa(info.addresses[0])
                         if ip not in self.ip_list:
                             self.ip_list.append(ip)
                             self.name_list.append(info.server.rstrip('.'))
+                        break
 
 
 # Constants
@@ -82,6 +90,8 @@ def extract_zip(zip_path):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="MiniDexed Updater")
     parser.add_argument("-v", action="store_true", help="Enable verbose FTP debug output")
+    parser.add_argument("--ip", type=str, help="IP address of the device to upload to (skip mDNS discovery)")
+    parser.add_argument("--version", type=int, choices=[1,2,3], help="Version to upload: 1=Latest official, 2=Continuous, 3=Local build (skip prompt)")
     args = parser.parse_args()
 
     import time
@@ -97,6 +107,14 @@ if __name__ == "__main__":
     ]
     if has_local_build:
         release_options.append(("Local build (from src/)", None))
+
+    if args.version:
+        selected_idx = args.version - 1
+        if selected_idx < 0 or selected_idx >= len(release_options):
+            print(f"Invalid version selection: {args.version}")
+            sys.exit(1)
+        github_url = release_options[selected_idx][1]
+    else:
         print("Which release do you want to update?")
         for idx, (desc, _) in enumerate(release_options):
             print(f"  [{idx+1}] {desc}")
@@ -167,6 +185,12 @@ if __name__ == "__main__":
     # Using mDNS to find the IP address of the device(s) that advertise the FTP service "_ftp._tcp."
     ip_addresses = []
     device_names = []
+    selected_ip = None
+    selected_name = None
+    if args.ip:
+        selected_ip = args.ip
+        selected_name = args.ip
+    else:
         zeroconf = Zeroconf()
         listener = MyListener(ip_addresses, device_names)
         browser = ServiceBrowser(zeroconf, "_ftp._tcp.local.", listener)
@@ -319,7 +343,15 @@ if __name__ == "__main__":
                         with open(local_path, 'rb') as f:
                             ftp.storbinary(f'STOR {remote_path}', f, 8192, callback=progress_callback)
                         print(f"\nUploaded {file} to {selected_ip}.")
+    except ftplib.all_errors as e:
+        print(f"FTP error: {e}")
+
+    try:
         ftp.sendcmd("BYE")
         print(f"Disconnected from {selected_ip}.")
     except ftplib.all_errors as e:
-        print(f"FTP error: {e}")
+        if str(e).strip().lower() == "timed out":
+            # Suppress expected timeout after BYE
+            print(f"Disconnected from {selected_ip}.")
+        else:
+            print(f"FTP error after BYE: {e}")