Add auto update setting

probablykasper · Oct 8, 2024 · 4abe653 · 4abe653
1 parent 7fb91d3
commit 4abe653
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 29 deletions.
diff --git a/ferrum-addon/addon.d.ts b/ferrum-addon/addon.d.ts
@@ -186,6 +186,8 @@ export interface ViewOptions {
   shownPlaylistFolders: Array<string>
   /** Empty is treated as default */
   columns: Array<string>
+  /** Auto update checking */
+  noAutoUpdate: boolean
   skipUpdatingToVersion?: string
 }
 export declare function load_view_options(): ViewOptions

diff --git a/src-native/view_options.rs b/src-native/view_options.rs
@@ -15,6 +15,9 @@ pub struct ViewOptions {
 	pub shown_playlist_folders: Vec<String>,
 	/// Empty is treated as default
 	pub columns: Vec<String>,
+	/// Auto update checking
+	#[serde(default)]
+	pub no_auto_update: bool,
 	pub skip_updating_to_version: Option<String>,
 }
 impl ViewOptions {
@@ -24,6 +27,7 @@ impl ViewOptions {
 			Err(_) => ViewOptions {
 				shown_playlist_folders: Vec::new(),
 				columns: Vec::new(),
+				no_auto_update: false,
 				skip_updating_to_version: None,
 			},
 		}

diff --git a/src/App.svelte b/src/App.svelte
@@ -22,6 +22,7 @@
 	import { navigate_back, navigate_forward } from './lib/router'
 	import './lib/router'
 	import CheckForUpdates from './components/CheckForUpdates.svelte'
+	import Settings from './components/Settings.svelte'
 
 	ipc_renderer.invoke('app_loaded').catch(() => {
 		ipc_renderer.invoke('showMessageBox', false, {
@@ -110,6 +111,15 @@
 		}
 	}
 
+	let show_settings = false
+	onDestroy(
+		ipc_listen('show_settings', () => {
+			if ($modal_count === 0) {
+				show_settings = true
+			}
+		}),
+	)
+
 	let show_itunes_import = false
 	onDestroy(
 		ipc_listen('itunesImport', () => {
@@ -217,6 +227,7 @@
 	{/if}
 </main>
 
+<QuickNav />
 {#if $current_list}
 	<TrackInfo />
 {/if}
@@ -226,7 +237,9 @@
 {#if show_itunes_import}
 	<ItunesImport cancel={() => (show_itunes_import = false)} />
 {/if}
-<QuickNav />
+{#if show_settings}
+	<Settings on_close={() => (show_settings = false)} />
+{/if}
 <CheckForUpdates />
 
 <DragGhost />

diff --git a/src/components/CheckForUpdates.svelte b/src/components/CheckForUpdates.svelte
@@ -8,7 +8,7 @@
 
 	check()
 	async function check() {
-		if (is_dev || !window.navigator.onLine) {
+		if (is_dev || !window.navigator.onLine || view_options.noAutoUpdate) {
 			return
 		}
 		const result = await ipc_renderer.invoke('check_for_updates')
@@ -38,7 +38,6 @@
 		form={() => ipc_renderer.invoke('open_url', channel.url)}
 		title="A new version of Ferrum is available!"
 	>
-		<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
 		<div class="max-w-xl text-sm">
 			<p class="pb-3">
 				Ferrum {latest_update.channel.version} is available. You are currently on {latest_update.app_version}
@@ -58,7 +57,9 @@
 			>
 			<div class="grow"></div>
 			<Button secondary autofocus on:click={() => (latest_update = null)}>Later</Button>
-			<Button on:click={() => ipc_renderer.invoke('open_url', channel.url)}>Update</Button>
+			<Button type="submit" on:click={() => ipc_renderer.invoke('open_url', channel.url)}
+				>Update</Button
+			>
 		</svelte:fragment>
 	</Modal>
 {/if}
diff --git a/src/components/Settings.svelte b/src/components/Settings.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import Modal from './Modal.svelte'
+	import Button from './Button.svelte'
+	import { save_view_options, view_options } from '@/lib/data'
+
+	export let on_close: () => void
+
+	let auto_update = !view_options.noAutoUpdate
+
+	function save() {
+		view_options.noAutoUpdate = !auto_update
+		save_view_options(view_options)
+		on_close()
+	}
+</script>
+
+<Modal on_cancel={on_close} cancel_on_escape form={save} title="Settings">
+	<div class="w-96 text-sm">
+		<label class="flex items-center gap-2">
+			<input
+				type="checkbox"
+				class="size-3.5 border-gray-300 bg-gray-100 text-blue-600 outline-offset-2 outline-blue-500 outline-solid focus-visible:outline"
+				bind:checked={auto_update}
+			/>
+			Automatically check for updates on startup
+		</label>
+	</div>
+	<svelte:fragment slot="buttons">
+		<Button secondary on:click={on_close}>Cancel</Button>
+		<Button type="submit" on:click={save}>Save</Button>
+	</svelte:fragment>
+</Modal>
diff --git a/src/electron/menubar.ts b/src/electron/menubar.ts
@@ -21,6 +21,14 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 			submenu: [
 				{ role: 'about' },
 				{ type: 'separator' },
+				{
+					label: 'Settings...',
+					accelerator: 'CmdOrCtrl+,',
+					click() {
+						web_contents.send('show_settings')
+					},
+				},
+				{ type: 'separator' },
 				{ role: 'services' },
 				{ type: 'separator' },
 				{ role: 'hide' },
@@ -37,32 +45,41 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 				{
 					label: 'New Playlist',
 					accelerator: 'CmdOrCtrl+N',
-					click: () => {
+					click() {
 						web_contents.send('newPlaylist', 'root', false)
 					},
 				},
 				{
 					label: 'New Playlist Folder',
-					click: () => {
+					click() {
 						web_contents.send('newPlaylist', 'root', true)
 					},
 				},
 				{ type: 'separator' },
 				{
 					label: 'Import...',
 					accelerator: 'CmdOrCtrl+O',
-					click: () => {
+					click() {
 						web_contents.send('import')
 					},
 				},
 				{ type: 'separator' },
 				{
 					label: 'Import iTunes Library...',
-					click: () => {
+					click() {
 						web_contents.send('itunesImport')
 					},
 				},
 				{ type: 'separator' },
+				{
+					label: 'Settings...',
+					accelerator: 'CmdOrCtrl+,',
+					click() {
+						web_contents.send('show_settings')
+					},
+					visible: !is.mac,
+				},
+				{ type: 'separator', visible: !is.mac },
 				is.mac ? { role: 'close' } : { role: 'quit' },
 			],
 		},
@@ -87,7 +104,7 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 				menu.push({
 					label: 'Filter',
 					accelerator: 'CmdOrCtrl+F',
-					click: () => {
+					click() {
 						web_contents.send('filter')
 					},
 				})
@@ -100,22 +117,22 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 				{
 					label: 'Play Next',
 					accelerator: '',
-					click: () => {
+					click() {
 						web_contents.send('selected_tracks_action', 'Play Next')
 					},
 				},
 				{
 					label: 'Add to Queue',
 					accelerator: '',
-					click: () => {
+					click() {
 						web_contents.send('selected_tracks_action', 'Add to Queue')
 					},
 				},
 				{ type: 'separator' },
 				{
 					label: 'Get Info',
 					accelerator: 'CmdOrCtrl+I',
-					click: () => {
+					click() {
 						web_contents.send('selected_tracks_action', 'Get Info')
 					},
 				},
@@ -127,22 +144,22 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 						else return 'Reveal in File Manager'
 					})(),
 					accelerator: 'Shift+CmdOrCtrl+R',
-					click: () => {
+					click() {
 						web_contents.send('selected_tracks_action', 'reveal_track_file')
 					},
 				},
 				{ type: 'separator' },
 				{
 					label: 'Remove from Playlist',
 					accelerator: '',
-					click: () => {
+					click() {
 						web_contents.send('selected_tracks_action', 'Remove from Playlist')
 					},
 				},
 				{
 					label: 'Delete from Library',
 					accelerator: 'CmdOrCtrl+Backspace',
-					click: () => {
+					click() {
 						web_contents.send('selected_tracks_action', 'Delete from Library')
 					},
 				},
@@ -156,15 +173,15 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 					id: 'Show Queue',
 					type: 'checkbox',
 					accelerator: 'CmdOrCtrl+U',
-					click: () => {
+					click() {
 						web_contents.send('Show Queue')
 					},
 				},
 				{
 					label: 'Toggle Quick Nav',
 					type: 'checkbox',
 					accelerator: 'CmdOrCtrl+K',
-					click: () => {
+					click() {
 						web_contents.send('ToggleQuickNav')
 					},
 				},
@@ -194,21 +211,21 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 				{
 					label: 'Pause',
 					// no accelerator because it's unreliable
-					click: () => {
+					click() {
 						web_contents.send('playPause')
 					},
 				},
 				{
 					label: 'Next',
 					accelerator: 'CmdOrCtrl+Right',
-					click: () => {
+					click() {
 						web_contents.send('Next')
 					},
 				},
 				{
 					label: 'Previous',
 					accelerator: 'CmdOrCtrl+Left',
-					click: () => {
+					click() {
 						web_contents.send('Previous')
 					},
 				},
@@ -218,7 +235,7 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 					id: 'Shuffle',
 					type: 'checkbox',
 					accelerator: 'CmdOrCtrl+S',
-					click: () => {
+					click() {
 						web_contents.send('Shuffle')
 					},
 				},
@@ -227,7 +244,7 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 					id: 'Repeat',
 					type: 'checkbox',
 					accelerator: 'CmdOrCtrl+R',
-					click: () => {
+					click() {
 						web_contents.send('Repeat')
 					},
 				},
@@ -236,15 +253,15 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 					id: 'Volume Up',
 					label: 'Volume Up',
 					accelerator: 'CmdOrCtrl+Up',
-					click: () => {
+					click() {
 						web_contents.send('volumeUp')
 					},
 				},
 				{
 					id: 'Volume Down',
 					label: 'Volume Down',
 					accelerator: 'CmdOrCtrl+Down',
-					click: () => {
+					click() {
 						web_contents.send('volumeDown')
 					},
 				},
@@ -257,15 +274,15 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 					id: 'Back',
 					label: 'Back',
 					accelerator: 'CmdOrCtrl+[',
-					click: () => {
+					click() {
 						web_contents.send('Back')
 					},
 				},
 				{
 					id: 'Forward',
 					label: 'Forward',
 					accelerator: 'CmdOrCtrl+]',
-					click: () => {
+					click() {
 						web_contents.send('Forward')
 					},
 				},
@@ -274,15 +291,15 @@ export function init_menu_bar(app: App, main_window: BrowserWindow) {
 					id: 'Select Next List',
 					label: 'Select Next List',
 					accelerator: 'Ctrl+Tab',
-					click: () => {
+					click() {
 						web_contents.send('Select Next List')
 					},
 				},
 				{
 					id: 'Select Previous List',
 					label: 'Select Previous List',
 					accelerator: 'Ctrl+Shift+Tab',
-					click: () => {
+					click() {
 						web_contents.send('Select Previous List')
 					},
 				},

diff --git a/src/electron/typed_ipc.ts b/src/electron/typed_ipc.ts
@@ -103,6 +103,7 @@ type Events = {
 	gonnaQuit: () => void
 
 	newPlaylist: (id: string, isFolder: boolean) => void
+	show_settings: () => void
 	itunesImport: () => void
 	import: () => void
 	filter: () => void

diff --git a/src/electron/update.ts b/src/electron/update.ts
@@ -1,6 +1,5 @@
 import { app, dialog } from 'electron'
 import package_json from '../../package.json'
-import is from './is'
 
 export type UpdateJson = {
 	[channel: string]: {