Merge branch 'public/9.0' into public/9.1

LMS-Community · Dec 11, 2024 · 261f97d · 261f97d
2 parents 0602e66 + a37c8ed
commit 261f97d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 22 deletions.
diff --git a/buildme.pl b/buildme.pl
@@ -707,7 +707,7 @@ sub buildMacOS {
 		if (`which npx`) {
 			print "INFO: Building $pkgName.dmg using $realName.app...\n";
 			# system("cd $destDir; npx --yes create-dmg --overwrite '$realName.app'; mv -f L*.dmg '$pkgName.dmg'");
-			system("cd $buildDir/platforms/osx/MenuBarItem && cp *png $destDir/ && cp icon.icns $destDir/ && cp app.json $destDir/");
+			system("cd $buildDir/platforms/osx/MenuBarItem && cp *png *webloc icon.icns app.json $destDir/");
 
 			# add signing information if available
 			if ($hasCerts) {
@@ -718,7 +718,7 @@ sub buildMacOS {
 			}
 
 			system("cd $destDir; npx --yes appdmg\@0.6.6 app.json LMS.dmg; mv -f LMS.dmg '$pkgName.dmg'");
-			system("cd $destDir; rm -rf *.png icon.icns app.json L*.app");
+			system("cd $destDir; rm -rf *.png icon.icns app.json *webloc L*.app");
 
 			if ($hasCerts) {
 				print "INFO: Notarizing $pkgName.dmg...";

diff --git a/osx/MenuBarItem/Getting Started - Lyrion Menubar Item.png b/osx/MenuBarItem/Getting Started - Lyrion Menubar Item.png
diff --git a/osx/MenuBarItem/Getting Started.webloc b/osx/MenuBarItem/Getting Started.webloc
@@ -0,0 +1 @@
+{ URL = "https://lyrion.org/getting-started/mac-install"; }
diff --git a/osx/MenuBarItem/LMSMenu.pl b/osx/MenuBarItem/LMSMenu.pl
@@ -39,14 +39,14 @@ sub getPort {
 }
 
 sub getUpdate {
-	my $updatesFile = catfile(getPref('cachedir'), 'updates', 'server.version');
+	my $updatesFile = getVersionFile();
 	my $update;
 
 	if (-r $updatesFile) {
 		open(UPDATE, '<', $updatesFile) or return;
-		chomp $_;
 
 		while (<UPDATE>) {
+			chomp;
 			if ($_ && -r $_) {
 				$update = $_;
 				last;
@@ -59,6 +59,10 @@ sub getUpdate {
 	return $update;
 }
 
+sub getVersionFile {
+	return catfile(main::getPref('cachedir'), 'updates', 'server.version')
+}
+
 sub getPref {
 	my $pref = shift;
 	my $ret;
@@ -98,19 +102,15 @@ sub getPrefPane {
 	-e '/Library/PreferencePanes/Squeezebox.prefPane' || -e catfile($ENV{HOME}, 'Library/PreferencePanes/Squeezebox.prefPane');
 }
 
-my $httpPort = getPort();
-my $update = getUpdate();
-my $hasPrefPane = getPrefPane();
-
 if (scalar @ARGV > 0) {
-	LMSMenuAction::handleAction($httpPort, $update);
+	LMSMenuAction::handleAction();
 }
 else {
 	my $autoStartItem = -f catfile($ENV{HOME}, 'Library', 'LaunchAgents', 'org.lyrion.lyrionmusicserver.plist')
 		? 'AUTOSTART_ON'
 		: 'AUTOSTART_OFF';
 
-	if ($httpPort) {
+	if (getPort()) {
 		printMenuItem('OPEN_GUI');
 		printMenuItem('OPEN_SETTINGS');
 		print("----\n");
@@ -122,13 +122,12 @@ sub getPrefPane {
 		printMenuItem($autoStartItem);
 	}
 
-	if ($update) {
+	if (getUpdate()) {
 		print("----\n");
 		printMenuItem('UPDATE_AVAILABLE');
-		# print("STATUSTITLE|✨\n");
 	}
 
-	if ($hasPrefPane) {
+	if (getPrefPane()) {
 		print("----\n");
 		printMenuItem('UNINSTALL_PREFPANE');
 	}

diff --git a/osx/MenuBarItem/LMSMenuAction.pm b/osx/MenuBarItem/LMSMenuAction.pm
@@ -8,7 +8,7 @@ use File::Spec::Functions qw(catfile);
 use Text::Unidecode;
 
 sub handleAction {
-	my ($httpPort, $update) = @_;
+	my $httpPort = main::getPort();
 
 	my $item = getMenuItem();
 
@@ -32,12 +32,18 @@ sub handleAction {
 		runScript('create-launchitem.sh');
 	}
 	elsif ($item eq 'UPDATE_AVAILABLE') {
-		system("open \"$update\"");
-		my $title = main::getString('UPDATE_TITLE');
-		my $message = main::getString('INSTALL_UPDATE');
-		print("ALERT:$title|$message\n");
-		# TODO - we don't quit yet, as the user will have to stop the service first... needs more work!
-		# print("QUITAPP\n");
+		if (my $update = main::getUpdate()) {
+			runScript('stop-server.sh');
+			unlink main::getVersionFile();
+			system("open \"$update\"");
+			print("QUITAPP\n");
+		}
+		# if we can't find the installer, fall back to showing instructions
+		else {
+			my $title = main::getString('UPDATE_TITLE');
+			my $message = main::getString('INSTALL_UPDATE');
+			print("ALERT:$title|$message\n");
+		}
 	}
 	elsif ($item eq 'UNINSTALL_PREFPANE') {
 		system("open https://lyrion.org/reference/uninstall-legacy-mac/");

diff --git a/osx/MenuBarItem/app.json b/osx/MenuBarItem/app.json
@@ -6,10 +6,10 @@
 	"code-sign": { "signing-identity": "_SIGNING_IDENTITY_" },
 	"contents": [
 		{
-			"x": 312,
+			"x": 317,
 			"y": 100,
 			"type": "file",
-			"path": "Getting Started - Lyrion Menubar Item.png"
+			"path": "Getting Started.webloc"
 		},
 		{
 			"x": 192,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{ URL = "https://lyrion.org/getting-started/mac-install"; }