From 04c43f88e2facd5e0b743bfab806145dd2dddc7e Mon Sep 17 00:00:00 2001 From: Kasper Seweryn Date: Sun, 18 Feb 2024 21:48:07 +0100 Subject: [PATCH] fix: fix most linting errors --- front/src/router/routes/ui.ts | 50 --- front/src/ui/components/UploadModal.vue | 4 +- front/src/ui/pages/index.vue | 447 ------------------- front/src/ui/pages/upload.vue | 2 +- front/src/ui/routes/index.ts | 3 +- front/src/ui/routes/ui.ts | 50 --- front/src/ui/stores/upload.ts | 19 +- front/src/ui/workers/file-metadata-parser.ts | 2 - 8 files changed, 17 insertions(+), 560 deletions(-) delete mode 100644 front/src/router/routes/ui.ts delete mode 100644 front/src/ui/pages/index.vue delete mode 100644 front/src/ui/routes/ui.ts diff --git a/front/src/router/routes/ui.ts b/front/src/router/routes/ui.ts deleted file mode 100644 index f4994b901..000000000 --- a/front/src/router/routes/ui.ts +++ /dev/null @@ -1,50 +0,0 @@ -import type { RouteRecordRaw } from 'vue-router' -import { useUploadsStore } from '~/ui/stores/upload' - -export default [ - { - path: '/ui', - name: 'ui', - component: () => import('~/ui/layouts/constrained.vue'), - children: [ - { - path: 'upload', - name: 'upload', - component: () => import('~/ui/pages/upload.vue'), - children: [ - { - path: '', - name: 'upload.index', - component: () => import('~/ui/pages/upload/index.vue') - }, - - { - path: 'running', - name: 'upload.running', - component: () => import('~/ui/pages/upload/running.vue'), - beforeEnter: (_to, _from, next) => { - const uploads = useUploadsStore() - if (uploads.uploadGroups.length === 0) { - next('/ui/upload') - } else { - next() - } - } - }, - - { - path: 'history', - name: 'upload.history', - component: () => import('~/ui/pages/upload/history.vue') - }, - - { - path: 'all', - name: 'upload.all', - component: () => import('~/ui/pages/upload/all.vue') - } - ] - } - ] - } -] as RouteRecordRaw[] diff --git a/front/src/ui/components/UploadModal.vue b/front/src/ui/components/UploadModal.vue index 8c08e9b9a..97f65b2ae 100644 --- a/front/src/ui/components/UploadModal.vue +++ b/front/src/ui/components/UploadModal.vue @@ -44,14 +44,14 @@ const cancel = () => { uploads.currentUploadGroup = undefined if (uploads.queue.length > 0) { - return router.push('/ui/upload/running') + return router.push('/upload/running') } } const continueInBackground = () => { libraryOpen.value = false uploads.currentUploadGroup = undefined - return router.push('/ui/upload/running') + return router.push('/upload/running') } // Sorting diff --git a/front/src/ui/pages/index.vue b/front/src/ui/pages/index.vue deleted file mode 100644 index 57841cd0e..000000000 --- a/front/src/ui/pages/index.vue +++ /dev/null @@ -1,447 +0,0 @@ - - - - - diff --git a/front/src/ui/pages/upload.vue b/front/src/ui/pages/upload.vue index 65ae5da53..57876765d 100644 --- a/front/src/ui/pages/upload.vue +++ b/front/src/ui/pages/upload.vue @@ -66,7 +66,7 @@ const tabs = computed(() => [ diff --git a/front/src/ui/routes/index.ts b/front/src/ui/routes/index.ts index 4d210db11..d5ca54e5a 100644 --- a/front/src/ui/routes/index.ts +++ b/front/src/ui/routes/index.ts @@ -8,6 +8,7 @@ import auth from './auth' import user from './user' import store from '~/store' import { requireLoggedIn } from '~/router/guards' +import { useUploadsStore } from '~/ui/stores/upload' export default [ { @@ -49,7 +50,7 @@ export default [ beforeEnter: (_to, _from, next) => { const uploads = useUploadsStore() if (uploads.uploadGroups.length === 0) { - next('/ui/upload') + next('/upload') } else { next() } diff --git a/front/src/ui/routes/ui.ts b/front/src/ui/routes/ui.ts deleted file mode 100644 index f4994b901..000000000 --- a/front/src/ui/routes/ui.ts +++ /dev/null @@ -1,50 +0,0 @@ -import type { RouteRecordRaw } from 'vue-router' -import { useUploadsStore } from '~/ui/stores/upload' - -export default [ - { - path: '/ui', - name: 'ui', - component: () => import('~/ui/layouts/constrained.vue'), - children: [ - { - path: 'upload', - name: 'upload', - component: () => import('~/ui/pages/upload.vue'), - children: [ - { - path: '', - name: 'upload.index', - component: () => import('~/ui/pages/upload/index.vue') - }, - - { - path: 'running', - name: 'upload.running', - component: () => import('~/ui/pages/upload/running.vue'), - beforeEnter: (_to, _from, next) => { - const uploads = useUploadsStore() - if (uploads.uploadGroups.length === 0) { - next('/ui/upload') - } else { - next() - } - } - }, - - { - path: 'history', - name: 'upload.history', - component: () => import('~/ui/pages/upload/history.vue') - }, - - { - path: 'all', - name: 'upload.all', - component: () => import('~/ui/pages/upload/all.vue') - } - ] - } - ] - } -] as RouteRecordRaw[] diff --git a/front/src/ui/stores/upload.ts b/front/src/ui/stores/upload.ts index 9d6aa8a37..135a5c4ab 100644 --- a/front/src/ui/stores/upload.ts +++ b/front/src/ui/stores/upload.ts @@ -8,6 +8,7 @@ import FileMetadataParserWorker from '~/ui/workers/file-metadata-parser.ts?worke import type { MetadataParsingResult } from '~/ui/workers/file-metadata-parser' import type { Tags } from '~/ui/composables/metadata' +import useLogger from '~/composables/useLogger' export type UploadGroupType = 'music-library' | 'music-channel' | 'podcast-channel' export type FailReason = 'missing-tags' | 'upload-failed' | 'upload-cancelled' @@ -34,6 +35,7 @@ export class UploadGroupEntry { const body = new FormData() body.append('file', this.file) + const logger = useLogger() await axios.post(this.uploadGroup.uploadUrl, body, { headers: { 'Content-Type': 'multipart/form-data' }, signal: this.abortController.signal, @@ -43,12 +45,12 @@ export class UploadGroupEntry { this.progress = Math.floor(e.loaded / (e.total ?? this.file.size) * 100) if (this.progress === 100) { - console.log(`[${this.id}] upload complete!`) + logger.info(`[${this.id}] upload complete!`) } } }) - console.log(`[${this.id}] import complete!`) + logger.info(`[${this.id}] import complete!`) this.importedAt = new Date() } @@ -89,7 +91,7 @@ export class UploadGroup { public guid: string, public type: UploadGroupType, public uploadUrl: string - ) {} + ) { } get progress () { return this.queue.reduce((total, entry) => total + entry.progress, 0) / this.queue.length @@ -113,7 +115,8 @@ export class UploadGroup { const { id, metadata } = entry if (!metadata) { - console.log('sending message to worker', id) + const logger = useLogger() + logger.log('sending message to worker', id) retrieveMetadata({ id, file }) } @@ -154,7 +157,6 @@ const { post: retrieveMetadata, data: workerMetadata } = useWebWorker { const data = toRaw(unref(reactiveData)) const entry = UploadGroup.entries[data.id] - console.log(data, entry) if (!entry) return if (data.status === 'success') { @@ -164,11 +166,14 @@ whenever(workerMetadata, (reactiveData) => { } } else { entry.cancel('missing-tags', data.error) - console.warn(`Failed to parse metadata for file ${entry.file.name}:`, data.error) + const logger = useLogger() + logger.warn(`Failed to parse metadata for file ${entry.file.name}:`, data.error) } }) export const useUploadsStore = defineStore('uploads', () => { + const logger = useLogger() + const createUploadGroup = async (type: UploadGroupType) => { // TODO: API call const uploadGroup = new UploadGroup('guid:' + nanoid(), type, 'https://httpbin.org/post') @@ -187,7 +192,7 @@ export const useUploadsStore = defineStore('uploads', () => { } entry.fail('upload-failed', error) - console.error(error) + logger.error(error) }).finally(() => { // Move to the next upload despite failing currentIndex.value += 1 diff --git a/front/src/ui/workers/file-metadata-parser.ts b/front/src/ui/workers/file-metadata-parser.ts index 21be995e0..f3cbeceef 100644 --- a/front/src/ui/workers/file-metadata-parser.ts +++ b/front/src/ui/workers/file-metadata-parser.ts @@ -19,9 +19,7 @@ export type MetadataParsingResult = MetadataParsingSuccess | MetadataParsingFail const parse = async (id: string, file: File) => { try { - console.log(`[${id}] parsing...`) const tags = await getTags(file) - console.log(`[${id}] tags:`, tags) const coverUrl = await getCoverUrl(tags) postMessage({ id, status: 'success', tags, coverUrl })