From fc386b4867f8ddf31141ef7706477b9fb7bc4808 Mon Sep 17 00:00:00 2001 From: Kasper Date: Sun, 15 Sep 2024 19:26:39 +0200 Subject: [PATCH] Use underscores for variable names --- eslint.config.mjs | 36 ++-- src/App.svelte | 142 +++++++-------- src/components/DragGhost.svelte | 12 +- src/components/Filter.svelte | 10 +- src/components/ItunesImport.svelte | 30 ++-- src/components/Modal.svelte | 28 +-- src/components/Player.svelte | 76 ++++---- src/components/PlaylistInfo.svelte | 18 +- src/components/Queue.svelte | 107 +++++------ src/components/QueueItem.svelte | 8 +- src/components/QuickNav.svelte | 70 ++++---- src/components/Sidebar.svelte | 84 ++++----- src/components/SidebarItems.svelte | 198 ++++++++++----------- src/components/TrackInfo.svelte | 274 ++++++++++++++--------------- src/components/TrackList.svelte | 202 ++++++++++----------- src/electron/ipc.ts | 42 ++--- src/electron/main.ts | 60 +++---- src/electron/menubar.ts | 58 +++--- src/electron/preload.ts | 14 +- src/electron/shortcuts.ts | 40 ++--- src/electron/typed_ipc.ts | 2 +- src/lib/data.ts | 167 +++++++++--------- src/lib/drag-drop.ts | 6 +- src/lib/helpers.ts | 76 ++++---- src/lib/menus.ts | 48 ++--- src/lib/page.ts | 16 +- src/lib/player.ts | 212 +++++++++++----------- src/lib/queue.ts | 216 +++++++++++------------ src/lib/quit.ts | 30 ++-- src/lib/selection.ts | 190 ++++++++++---------- src/lib/window.ts | 20 +-- 31 files changed, 1252 insertions(+), 1240 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 1ddfd0e..0e1f87a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -32,24 +32,24 @@ export default [ }, { rules: { - // '@typescript-eslint/naming-convention': [ - // 'error', - // { - // selector: 'variableLike', - // format: ['snake_case', 'UPPER_CASE'], - // leadingUnderscore: 'allow', - // }, - // { - // selector: 'parameter', - // modifiers: ['destructured'], - // format: null, - // }, - // { - // selector: 'variable', - // modifiers: ['destructured'], - // format: null, - // }, - // ], + '@typescript-eslint/naming-convention': [ + 'error', + { + selector: 'variableLike', + format: ['snake_case', 'UPPER_CASE'], + leadingUnderscore: 'allow', + }, + { + selector: 'parameter', + modifiers: ['destructured'], + format: null, + }, + { + selector: 'variable', + modifiers: ['destructured'], + format: null, + }, + ], '@typescript-eslint/no-unused-expressions': 'off', '@typescript-eslint/no-unused-vars': [ 'error', diff --git a/src/App.svelte b/src/App.svelte index 02d34ce..1efb537 100755 --- a/src/App.svelte +++ b/src/App.svelte @@ -7,134 +7,134 @@ import Queue from './components/Queue.svelte' import TrackInfo, { type TrackInfoList } from './components/TrackInfo.svelte' import PlaylistInfoModal from './components/PlaylistInfo.svelte' - import { queueVisible } from './lib/queue' - import { ipcListen, ipcRenderer } from '@/lib/window' + import { queue_visible } from './lib/queue' + import { ipc_listen, ipc_renderer } from '@/lib/window' import { - importTracks, + import_tracks, type PlaylistInfo, methods, page, - isMac, + is_mac, view_as_songs, view_as_artists, } from './lib/data' - import { playPause } from './lib/player' + import { play_pause } from './lib/player' import DragGhost from './components/DragGhost.svelte' import ItunesImport from './components/ItunesImport.svelte' import type { TrackID } from 'ferrum-addon/addon' - import { modalCount } from './components/Modal.svelte' + import { modal_count } from './components/Modal.svelte' import QuickNav from './components/QuickNav.svelte' - import { checkShortcut } from './lib/helpers' + import { check_shortcut } from './lib/helpers' import ArtistList from './components/ArtistList.svelte' import { tracklist_actions } from './lib/page' - ipcRenderer.emit('appLoaded') + ipc_renderer.emit('appLoaded') - async function openImportDialog() { - if ($modalCount !== 0) { + async function open_import_dialog() { + if ($modal_count !== 0) { return } - let result = await ipcRenderer.invoke('showOpenDialog', false, { + let result = await ipc_renderer.invoke('showOpenDialog', false, { properties: ['openFile', 'multiSelections'], filters: [{ name: 'Audio', extensions: ['mp3', 'm4a', 'opus'] }], }) if (!result.canceled && result.filePaths.length >= 1) { - importTracks(result.filePaths) + import_tracks(result.filePaths) } } - ipcRenderer.on('import', openImportDialog) + ipc_renderer.on('import', open_import_dialog) onDestroy(() => { - ipcRenderer.removeListener('import', openImportDialog) + ipc_renderer.removeListener('import', open_import_dialog) }) - function toggleQueue() { - $queueVisible = !$queueVisible + function toggle_queue() { + $queue_visible = !$queue_visible } - $: ipcRenderer.invoke('update:Show Queue', $queueVisible) - ipcRenderer.on('Show Queue', toggleQueue) + $: ipc_renderer.invoke('update:Show Queue', $queue_visible) + ipc_renderer.on('Show Queue', toggle_queue) onDestroy(() => { - ipcRenderer.removeListener('Show Queue', toggleQueue) + ipc_renderer.removeListener('Show Queue', toggle_queue) }) let droppable = false - const allowedMimes = ['audio/mpeg', 'audio/x-m4a', 'audio/ogg'] // mp3, m4a - function getFilePaths(e: DragEvent): string[] { + const allowed_mimes = ['audio/mpeg', 'audio/x-m4a', 'audio/ogg'] // mp3, m4a + function get_file_paths(e: DragEvent): string[] { if (!e.dataTransfer) return [] - let validPaths: string[] = [] + let valid_paths: string[] = [] for (let i = 0; i < e.dataTransfer.files.length; i++) { const file = e.dataTransfer.files[i] - if (allowedMimes.includes(file.type)) { - validPaths.push(file.path) + if (allowed_mimes.includes(file.type)) { + valid_paths.push(file.path) } } - return validPaths + return valid_paths } - function hasFiles(e: DragEvent): boolean { + function has_files(e: DragEvent): boolean { if (!e.dataTransfer) return false for (let i = 0; i < e.dataTransfer.items.length; i++) { const item = e.dataTransfer.items[i] - if (item.kind === 'file' && allowedMimes.includes(item.type)) { + if (item.kind === 'file' && allowed_mimes.includes(item.type)) { return true } } return false } - function dragEnterOrOver(e: DragEvent) { - droppable = hasFiles(e) + function drag_enter_or_over(e: DragEvent) { + droppable = has_files(e) if (droppable) { e.preventDefault() } } - function dragLeave() { + function drag_leave() { droppable = false } function drop(e: DragEvent) { e.preventDefault() droppable = false - const validPaths = getFilePaths(e) + const valid_paths = get_file_paths(e) const paths = [] - for (const path of validPaths) { + for (const path of valid_paths) { paths.push(path) } - importTracks(paths) + import_tracks(paths) } function keydown(e: KeyboardEvent) { let el = e.target as HTMLAudioElement if (el && el.tagName !== 'INPUT' && el.tagName !== 'TEXTAREA') { if (e.key === ' ') { e.preventDefault() - playPause() + play_pause() } } } - let showItunesImport = false + let show_itunes_import = false onDestroy( - ipcListen('itunesImport', () => { - if ($modalCount === 0) { - showItunesImport = true + ipc_listen('itunesImport', () => { + if ($modal_count === 0) { + show_itunes_import = true } }), ) - let trackInfoList: TrackInfoList | null = null - function onTrackInfo(ids: TrackID[], trackIndex: number) { - if ($modalCount === 0) { - trackInfoList = { ids, index: trackIndex } + let track_info_list: TrackInfoList | null = null + function on_track_info(ids: TrackID[], track_index: number) { + if ($modal_count === 0) { + track_info_list = { ids, index: track_index } } } onDestroy( - ipcListen('context.Get Info', (_, ids: TrackID[], trackIndex: number) => { - onTrackInfo(ids, trackIndex) + ipc_listen('context.Get Info', (_, ids: TrackID[], track_index: number) => { + on_track_info(ids, track_index) }), ) - let playlistInfo: PlaylistInfo | null = null + let playlist_info: PlaylistInfo | null = null onDestroy( - ipcListen('context.playlist.edit', (_, id) => { + ipc_listen('context.playlist.edit', (_, id) => { const list = methods.getTrackList(id) - if (list.type !== 'special' && $modalCount === 0) { - playlistInfo = { + if (list.type !== 'special' && $modal_count === 0) { + playlist_info = { name: list.name, description: list.description || '', isFolder: list.type === 'folder', @@ -145,9 +145,9 @@ }), ) onDestroy( - ipcListen('context.playlist.delete', async (_, id) => { + ipc_listen('context.playlist.delete', async (_, id) => { const list = methods.getTrackList(id) - const result = await ipcRenderer.invoke('showMessageBox', false, { + const result = await ipc_renderer.invoke('showMessageBox', false, { type: 'info', message: `Delete the ${list.type} "${list.name}"?`, detail: list.type === 'folder' ? 'This will also delete all playlists inside.' : '', @@ -160,11 +160,11 @@ }), ) onDestroy( - ipcListen('newPlaylist', (_, id, isFolder) => { - playlistInfo = { + ipc_listen('newPlaylist', (_, id, is_folder) => { + playlist_info = { name: '', description: '', - isFolder: isFolder, + isFolder: is_folder, id: id, editMode: false, } @@ -183,15 +183,15 @@
{ if (e.target) { - if (checkShortcut(e, 'ArrowUp', { cmdOrCtrl: true })) { + if (check_shortcut(e, 'ArrowUp', { cmd_or_ctrl: true })) { e.preventDefault() - ipcRenderer.invoke('volume_change', true) - } else if (checkShortcut(e, 'ArrowDown', { cmdOrCtrl: true })) { + ipc_renderer.invoke('volume_change', true) + } else if (check_shortcut(e, 'ArrowDown', { cmd_or_ctrl: true })) { e.preventDefault() - ipcRenderer.invoke('volume_change', false) + ipc_renderer.invoke('volume_change', false) } } }} @@ -202,8 +202,8 @@

{#if $page.tracklist.id === 'root'} @@ -226,13 +226,13 @@ {/if}

{#if $page.viewAs === 0} - + {:else} {/if}
- {#if $queueVisible} - + {#if $queue_visible} + {/if} @@ -243,9 +243,9 @@