prevent completed download restart

closes #162

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help improve the project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Version running**
+Provide the docker label or release tag you're running.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.gitignore

@@ -15,4 +15,7 @@ config.yml
 cookies.txt
 __debug*
 ui/
-.idea
+.idea
+frontend/.pnp.cjs
+frontend/.pnp.loader.mjs
+frontend/.yarn/install-state.gz

Dockerfile

@@ -25,15 +25,13 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o yt-dlp-webui
 # -----------------------------------------------------------------------------
 
 # dependencies ----------------------------------------------------------------
-FROM cgr.dev/chainguard/wolfi-base
+FROM alpine:edge
 
 RUN apk update && \
-apk add ffmpeg ca-certificates python3 py3-pip
+apk add ffmpeg yt-dlp ca-certificates curl wget psmisc
 
 VOLUME /downloads /config
 
-RUN python3 -m pip install yt-dlp
-
 WORKDIR /app
 
 COPY --from=build /usr/src/yt-dlp-webui/yt-dlp-webui /app

Makefile

@@ -1,11 +1,20 @@
+.PHONY : fe clean all
+
 default:
-	CGO_ENABLED=0 go build -o yt-dlp-webui main.go
+	go run main.go
+
+fe:
+	cd frontend && pnpm build
+
+dev:
+	cd frontend && pnpm dev
 
 all:
-	cd frontend && pnpm build && cd ..
+	$(MAKE) fe && cd ..
 	CGO_ENABLED=0 go build -o yt-dlp-webui main.go
 
 multiarch:
+	$(MAKE) fe
 	mkdir -p build
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/yt-dlp-webui_linux-amd64 main.go
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o build/yt-dlp-webui_linux-arm64 main.go

README.md

@@ -92,6 +92,7 @@ To enable it just go to the settings page and enable the **Enable video/audio fo
     - As before server address is not specified or simply yt-dlp process takes a lot of time to fire up. (Forking yt-dlp isn't fast especially if you have a lower-end/low-power NAS/server/desktop where the server is running)
 
 ## [Docker](https://github.com/marcopeocchi/yt-dlp-web-ui/pkgs/container/yt-dlp-web-ui) installation
+## Docker run
 ```sh
 docker pull marcobaobao/yt-dlp-webui
 docker run -d -p 3033:3033 -v <your dir>:/downloads marcobaobao/yt-dlp-webui
@@ -135,6 +136,20 @@ docker run -d \
     --qs 2
 ```
 
+### Docker Compose
+```yaml
+services:
+  yt-dlp-webui:
+    image: marcobaobao/yt-dlp-webui
+    ports:
+      - 3033:3033
+    volumes:
+      - <your dir>:/downloads # replace <your dir> with a directory on your host system
+    healthcheck:
+      test: curl -f http://localhost:3033 || exit 1
+    restart: unless-stopped
+```
+
 ## [Prebuilt binaries](https://github.com/marcopeocchi/yt-dlp-web-ui/releases) installation
 
 ```sh
@@ -229,6 +244,29 @@ WantedBy=multi-user.target
 systemctl enable yt-dlp-webui
 systemctl start yt-dlp-webui
 ```
+It could be that yt-dlp-webui works correctly when started manually from the console, but with systemd, it does not see the yt-dlp executable, or has issues writing to the database file. One way to fix these issues could be as follows:
+```shell
+cd
+mkdir yt-dlp-webui-workingdir
+# optionally move the already existing database file there:
+mv local.db yt-dlp-webui-workingdir
+nano yt-dlp-webui-workingdir/my.conf
+```
+The config file format is described above; make sure to include the `downloaderPath` setting (the path can possibly be found by running `which yt-dlp`). For example, one could have:
+```
+downloadPath: /stuff/media
+downloaderPath: /home/your_user/.local/bin/yt-dlp
+log_path: /home/your_user/yt-dlp-webui-workingdir
+session_file_path: /home/your_user/yt-dlp-webui-workingdir
+```
+Adjust the Service section in the `/etc/systemd/system/yt-dlp-webui.service` file as follows:
+```
+[Service]
+User=your_user
+Group=your_user
+WorkingDirectory=/home/your_user/yt-dlp-webui-workingdir
+ExecStart=/usr/local/bin/yt-dlp-webui --conf /home/your_user/yt-dlp-webui-workingdir/my.conf
+```
 
 ## Manual installation
 ```sh
@@ -240,6 +278,9 @@ npm run build
 
 go build -o yt-dlp-webui main.go
 ```
+## Open-API
+Navigate to `/openapi` to see the related swagger.
+
 
 ## Extendable
 You dont'like the Material feel?

docker-compose.yml

@@ -0,0 +1,11 @@
+services:
+  yt-dlp-webui:
+    image: marcobaobao/yt-dlp-webui
+    ports:
+      - 3033:3033
+    volumes:
+      - <your dir>:/downloads # replace <your dir> with a directory on your host system
+      - <your dir>:/config    # directory where config.yml will be stored
+    healthcheck:
+      test: curl -f http://localhost:3033 || exit 1
+    restart: unless-stopped

env.nix

@@ -0,0 +1,4 @@
+{ pkgs ? import <nixpkgs> {} }:
+  pkgs.mkShell {
+    nativeBuildInputs = with pkgs.buildPackages; [ yt-dlp nodejs_22 yarn-berry go ];
+}

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yt-dlp-webui",
-  "version": "2.10.0",
+  "version": "3.1.0",
   "description": "Frontend compontent of yt-dlp-webui",
   "scripts": {
     "dev": "vite",
@@ -10,29 +10,30 @@
   "license": "MPL-2.0",
   "private": true,
   "dependencies": {
-    "@emotion/react": "^11.11.3",
+    "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.0",
+    "@emotion/styled": "^11.11.5",
-    "@fontsource/roboto": "^5.0.8",
+    "@fontsource/roboto": "^5.0.13",
-    "@fontsource/roboto-mono": "^5.0.16",
+    "@fontsource/roboto-mono": "^5.0.18",
-    "@mui/icons-material": "^5.15.4",
+    "@mui/icons-material": "^5.15.16",
-    "@mui/material": "^5.15.4",
+    "@mui/material": "^5.15.16",
-    "fp-ts": "^2.16.2",
+    "fp-ts": "^2.16.5",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
-    "react-router-dom": "^6.21.2",
+    "react-router-dom": "^6.23.1",
+    "react-virtuoso": "^4.7.11",
     "recoil": "^0.7.7",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@modyfi/vite-plugin-yaml": "^1.1.0",
-    "@types/node": "^20.11.4",
+    "@types/node": "^20.14.2",
-    "@types/react": "^18.2.48",
+    "@types/react": "^18.3.3",
     "@types/react-dom": "^18.2.18",
     "@types/react-helmet": "^6.1.11",
     "@types/react-router-dom": "^5.3.3",
-    "@vitejs/plugin-react-swc": "^3.6.0",
+    "@vitejs/plugin-react-swc": "^3.7.0",
-    "typescript": "^5.4.3",
+    "million": "^3.1.11",
-    "vite": "^5.2.6",
+    "typescript": "^5.4.5",
-    "million": "^3.0.6"
+    "vite": "^5.2.11"
   }
 }

frontend/src/assets/i18n.yaml

@@ -34,7 +34,8 @@ languages:
     clipboardAction: Copied URL to clipboard
     playlistCheckbox: Download playlist (it will take time, after submitting you may close this window)
     restartAppMessage: Needs a page reload to take effect
-    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy
+    urlBase: URL base, for reverse proxy support (subdir), defaults to empty
     newDownloadButton: New download
     homeButtonLabel: Home
     archiveButtonLabel: Archive
@@ -50,6 +51,8 @@ languages:
     logsTitle: 'Logs'
     awaitingLogs: 'Awaiting logs...'
     bulkDownload: 'Download files in a zip archive'
+    rpcPollingTimeTitle: RPC polling time
+    rpcPollingTimeDescription: A lower interval results in higher CPU usage (server and client side)
   german:
     urlInput: Video URL
     statusTitle: Status

frontend/src/atoms/rpc.ts

@@ -1,4 +1,4 @@
-import { selector } from 'recoil'
+import { atom, selector } from 'recoil'
 import { RPCClient } from '../lib/rpcClient'
 import { rpcHTTPEndpoint, rpcWebSocketEndpoint } from './settings'
 
@@ -12,3 +12,12 @@ export const rpcClientState = selector({
     ),
   dangerouslyAllowMutability: true,
 })
+
+export const rpcPollingTimeState = atom({
+  key: 'rpcPollingTimeState',
+  default: Number(localStorage.getItem('rpc-polling-time')) || 1000,
+  effects: [
+    ({ onSet }) =>
+      onSet(a => localStorage.setItem('rpc-polling-time', a.toString()))
+  ]
+})

frontend/src/atoms/settings.ts

@@ -64,8 +64,7 @@ export const serverAddressState = atom<string>({
 
 export const serverPortState = atom<number>({
   key: 'serverPortState',
-  default: Number(localStorage.getItem('server-port')) ||
+  default: Number(localStorage.getItem('server-port')) || Number(window.location.port),
-    Number(window.location.port),
   effects: [
     ({ onSet }) =>
       onSet(a => localStorage.setItem('server-port', a.toString()))
@@ -135,6 +134,15 @@ export const servedFromReverseProxyState = atom({
   ]
 })
 
+export const servedFromReverseProxySubDirState = atom<string>({
+  key: 'servedFromReverseProxySubDirState',
+  default: localStorage.getItem('reverseProxySubDir') ?? '',
+  effects: [
+    ({ onSet }) =>
+      onSet(a => localStorage.setItem('reverseProxySubDir', a))
+  ]
+})
+
 export const appTitleState = atom({
   key: 'appTitleState',
   default: localStorage.getItem('appTitle') ?? 'yt-dlp Web UI',
@@ -146,9 +154,15 @@ export const appTitleState = atom({
 
 export const serverAddressAndPortState = selector({
   key: 'serverAddressAndPortState',
-  get: ({ get }) => get(servedFromReverseProxyState)
+  get: ({ get }) => {
-    ? `${get(serverAddressState)}`
+    if (get(servedFromReverseProxySubDirState)) {
-    : `${get(serverAddressState)}:${get(serverPortState)}`
+      return `${get(serverAddressState)}/${get(servedFromReverseProxySubDirState)}/`
+    }
+    if (get(servedFromReverseProxyState)) {
+      return `${get(serverAddressState)}`
+    }
+    return `${get(serverAddressState)}:${get(serverPortState)}`
+  }
 })
 
 export const serverURL = selector({
@@ -182,7 +196,7 @@ export const cookiesState = atom({
   ]
 })
 
-export const themeSelector = selector<ThemeNarrowed>({
+const themeSelector = selector<ThemeNarrowed>({
   key: 'themeSelector',
   get: ({ get }) => {
     const theme = get(themeState)

frontend/src/atoms/status.ts

@@ -6,16 +6,6 @@ export const connectedState = atom({
   default: false
 })
 
-export const updatedBinaryState = atom({
-  key: 'updatedBinaryState',
-  default: false
-})
-
-export const isDownloadingState = atom({
-  key: 'isDownloadingState',
-  default: false
-})
-
 export const freeSpaceBytesState = selector({
   key: 'freeSpaceBytesState',
   get: async ({ get }) => {

frontend/src/components/AppBar.tsx

@@ -1,11 +1,11 @@
-import { styled } from '@mui/material';
+import { styled } from '@mui/material'
-import MuiAppBar, { AppBarProps as MuiAppBarProps } from '@mui/material/AppBar';
+import MuiAppBar, { AppBarProps as MuiAppBarProps } from '@mui/material/AppBar'
 
 interface AppBarProps extends MuiAppBarProps {
   open?: boolean
 }
 
-const drawerWidth = 240;
+const drawerWidth = 240
 
 const AppBar = styled(MuiAppBar, {
   shouldForwardProp: (prop) => prop !== 'open',
@@ -23,6 +23,6 @@ const AppBar = styled(MuiAppBar, {
       duration: theme.transitions.duration.enteringScreen,
     }),
   }),
-}));
+}))
 
 export default AppBar

frontend/src/components/DownloadDialog.tsx

@@ -26,19 +26,17 @@ import {
   Suspense,
   forwardRef,
   useEffect,
-  useMemo,
   useRef,
   useState,
   useTransition
 } from 'react'
 import { useRecoilState, useRecoilValue } from 'recoil'
 import { customArgsState, downloadTemplateState, filenameTemplateState, savedTemplatesState } from '../atoms/downloadTemplate'
-import { latestCliArgumentsState, settingsState } from '../atoms/settings'
+import { settingsState } from '../atoms/settings'
 import { availableDownloadPathsState, connectedState } from '../atoms/status'
 import FormatsGrid from '../components/FormatsGrid'
 import { useI18n } from '../hooks/useI18n'
 import { useRPC } from '../hooks/useRPC'
-import { CliArguments } from '../lib/argsParser'
 import type { DLMetadata } from '../types'
 import { toFormatArgs } from '../utils'
 import ExtraDownloadOptions from './ExtraDownloadOptions'
@@ -71,7 +69,6 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
   const [pickedBestFormat, setPickedBestFormat] = useState('')
 
   const [customArgs, setCustomArgs] = useRecoilState(customArgsState)
-  const [, setCliArgs] = useRecoilState(latestCliArgumentsState)
 
   const [downloadPath, setDownloadPath] = useState('')
 
@@ -83,10 +80,6 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
 
   const [isPlaylist, setIsPlaylist] = useState(false)
 
-  const argsBuilder = useMemo(() =>
-    new CliArguments().fromString(settings.cliArgs), [settings.cliArgs]
-  )
-
   const { i18n } = useI18n()
   const { client } = useRPC()
 
@@ -110,9 +103,9 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
       if (pickedBestFormat !== '') codes.push(pickedBestFormat)
 
       await new Promise(r => setTimeout(r, 10))
-      await client.download({
+      client.download({
         url: immediate || line,
-        args: `${argsBuilder.toString()} ${toFormatArgs(codes)} ${downloadTemplate}`,
+        args: `${toFormatArgs(codes)} ${downloadTemplate}`,
         pathOverride: downloadPath ?? '',
         renameTo: settings.fileRenaming ? filenameTemplate : '',
         playlist: isPlaylist,
@@ -122,7 +115,7 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
         resetInput()
         setDownloadFormats(undefined)
         onDownloadStart(immediate || line)
-      }, 250)
+      }, 100)
     }
 
     setUrl('')
@@ -327,19 +320,6 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
                         label={i18n.t('playlistCheckbox')}
                       />
                     </Grid>
-                    <Grid item>
-                      <FormControlLabel
-                        control={
-                          <Checkbox
-                            onChange={() => setCliArgs(argsBuilder.toggleExtractAudio().toString())}
-                          />
-                        }
-                        checked={argsBuilder.extractAudio}
-                        onChange={() => setCliArgs(argsBuilder.toggleExtractAudio().toString())}
-                        disabled={settings.formatSelection}
-                        label={i18n.t('extractAudioCheckbox')}
-                      />
-                    </Grid>
                   </Grid>
                   <Grid item>
                     <Button

frontend/src/components/Downloads.tsx

@@ -3,7 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil'
 import { loadingDownloadsState } from '../atoms/downloads'
 import { listViewState } from '../atoms/settings'
 import { loadingAtom } from '../atoms/ui'
-import DownloadsCardView from './DownloadsCardView'
+import DownloadsGridView from './DownloadsGridView'
 import DownloadsTableView from './DownloadsTableView'
 
 const Downloads: React.FC = () => {
@@ -21,7 +21,7 @@ const Downloads: React.FC = () => {
 
   if (tableView) return <DownloadsTableView />
 
-  return <DownloadsCardView />
+  return <DownloadsGridView />
 }
 
 export default Downloads

frontend/src/components/DownloadsGridView.tsx

@@ -4,16 +4,19 @@ import { activeDownloadsState } from '../atoms/downloads'
 import { useToast } from '../hooks/toast'
 import { useI18n } from '../hooks/useI18n'
 import { useRPC } from '../hooks/useRPC'
+import { ProcessStatus, RPCResult } from '../types'
 import DownloadCard from './DownloadCard'
 
-const DownloadsCardView: React.FC = () => {
+const DownloadsGridView: React.FC = () => {
   const downloads = useRecoilValue(activeDownloadsState)
 
   const { i18n } = useI18n()
   const { client } = useRPC()
   const { pushMessage } = useToast()
 
-  const abort = (id: string) => client.kill(id)
+  const stop = (r: RPCResult) => r.progress.process_status === ProcessStatus.Completed
+    ? client.clear(r.id)
+    : client.kill(r.id)
 
   return (
     <Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12, xl: 12 }} pt={2}>
@@ -22,7 +25,7 @@ const DownloadsCardView: React.FC = () => {
           <Grid item xs={4} sm={8} md={6} xl={4} key={download.id}>
             <DownloadCard
               download={download}
-              onStop={() => abort(download.id)}
+              onStop={() => stop(download)}
               onCopy={() => pushMessage(i18n.t('clipboardAction'), 'info')}
             />
           </Grid>
@@ -32,4 +35,4 @@ const DownloadsCardView: React.FC = () => {
   )
 }
 
-export default DownloadsCardView
+export default DownloadsGridView

frontend/src/components/DownloadsTableView.tsx

@@ -18,12 +18,60 @@ import {
   TableRow,
   Typography
 } from "@mui/material"
+import { forwardRef } from 'react'
+import { TableComponents, TableVirtuoso } from 'react-virtuoso'
 import { useRecoilValue } from 'recoil'
 import { activeDownloadsState } from '../atoms/downloads'
 import { serverURL } from '../atoms/settings'
 import { useRPC } from '../hooks/useRPC'
+import { ProcessStatus, RPCResult } from '../types'
 import { base64URLEncode, formatSize, formatSpeedMiB } from "../utils"
 
+const columns = [
+  {
+    width: 8,
+    label: 'Status',
+    dataKey: 'status',
+    numeric: false,
+  },
+  {
+    width: 500,
+    label: 'Title',
+    dataKey: 'title',
+    numeric: false,
+  },
+  {
+    width: 50,
+    label: 'Speed',
+    dataKey: 'speed',
+    numeric: true,
+  },
+  {
+    width: 150,
+    label: 'Progress',
+    dataKey: 'progress',
+    numeric: true,
+  },
+  {
+    width: 80,
+    label: 'Size',
+    dataKey: 'size',
+    numeric: true,
+  },
+  {
+    width: 100,
+    label: 'Added on',
+    dataKey: 'addedon',
+    numeric: true,
+  },
+  {
+    width: 80,
+    label: 'Actions',
+    dataKey: 'actions',
+    numeric: true,
+  },
+] as const
+
 function LinearProgressWithLabel(props: LinearProgressProps & { value: number }) {
   return (
     <Box sx={{ display: 'flex', alignItems: 'center' }}>
@@ -39,14 +87,42 @@ function LinearProgressWithLabel(props: LinearProgressProps & { value: number })
   )
 }
 
+const VirtuosoTableComponents: TableComponents<RPCResult> = {
+  Scroller: forwardRef<HTMLDivElement>((props, ref) => (
+    <TableContainer {...props} ref={ref} />
+  )),
+  Table: (props) => (
+    <Table {...props} sx={{ borderCollapse: 'separate', tableLayout: 'fixed', mt: 2 }} size='small' />
+  ),
+  TableHead,
+  TableRow: ({ item: _item, ...props }) => <TableRow {...props} />,
+  TableBody: forwardRef<HTMLTableSectionElement>((props, ref) => (
+    <TableBody {...props} ref={ref} />
+  )),
+}
+
+function fixedHeaderContent() {
+  return (
+    <TableRow>
+      {columns.map((column) => (
+        <TableCell
+          key={column.dataKey}
+          variant="head"
+          align={column.numeric || false ? 'right' : 'left'}
+          style={{ width: column.width }}
+        >
+          {column.label}
+        </TableCell>
+      ))}
+    </TableRow>
+  )
+}
+
 const DownloadsTableView: React.FC = () => {
-  const serverAddr = useRecoilValue(serverURL)
   const downloads = useRecoilValue(activeDownloadsState)
-
+  const serverAddr = useRecoilValue(serverURL)
   const { client } = useRPC()
 
-  const abort = (id: string) => client.kill(id)
-
   const viewFile = (path: string) => {
     const encoded = base64URLEncode(path)
     window.open(`${serverAddr}/archive/v/${encoded}?token=${localStorage.getItem('token')}`)
@@ -57,102 +133,83 @@ const DownloadsTableView: React.FC = () => {
     window.open(`${serverAddr}/archive/d/${encoded}?token=${localStorage.getItem('token')}`)
   }
 
-  return (
+  const stop = (r: RPCResult) => r.progress.process_status === ProcessStatus.Completed
-    <TableContainer
+    ? client.clear(r.id)
-      sx={{ minHeight: '80vh', mt: 4 }}
+    : client.kill(r.id)
-      hidden={downloads.length === 0}
-    >
-      <Table size="small">
-        <TableHead>
-          <TableRow>
-            <TableCell width={8}>
-              <Typography fontWeight={500} fontSize={13}>Status</Typography>
-            </TableCell>
-            <TableCell>
-              <Typography fontWeight={500} fontSize={13}>Title</Typography>
-            </TableCell>
-            <TableCell align="right">
-              <Typography fontWeight={500} fontSize={13}>Speed</Typography>
-            </TableCell>
-            <TableCell align="center" width={200}>
-              <Typography fontWeight={500} fontSize={13}>Progress</Typography>
-            </TableCell>
-            <TableCell align="right">
-              <Typography fontWeight={500} fontSize={13}>Size</Typography>
-            </TableCell>
-            <TableCell align="right" width={180}>
-              <Typography fontWeight={500} fontSize={13}>Added on</Typography>
-            </TableCell>
-            <TableCell align="right" width={8}>
-              <Typography fontWeight={500} fontSize={13}>Actions</Typography>
-            </TableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {
-            downloads.map(download => (
-              <TableRow key={download.id}>
-                <TableCell>
-                  {download.progress.percentage === '-1'
-                    ? <DownloadDoneIcon color="primary" />
-                    : <DownloadIcon color="primary" />
-                  }
-                </TableCell>
-                <TableCell>{download.info.title}</TableCell>
-                <TableCell align="right">{formatSpeedMiB(download.progress.speed)}</TableCell>
-                <TableCell align="right">
-                  <LinearProgressWithLabel
-                    sx={{ height: '16px' }}
-                    value={
-                      download.progress.percentage === '-1'
-                        ? 100
-                        : Number(download.progress.percentage.replace('%', ''))
-                    }
-                    variant={
-                      download.progress.process_status === 0
-                        ? 'indeterminate'
-                        : 'determinate'
-                    }
-                    color={download.progress.percentage === '-1' ? 'primary' : 'primary'}
-                  />
-                </TableCell>
-                <TableCell align="right">{formatSize(download.info.filesize_approx ?? 0)}</TableCell>
-                <TableCell align="right">
-                  {new Date(download.info.created_at).toLocaleString()}
-                </TableCell>
-                <TableCell align="right">
-                  <ButtonGroup>
-                    <IconButton
-                      size="small"
-                      onClick={() => abort(download.id)}
-                    >
-                      {download.progress.percentage === '-1' ? <DeleteIcon /> : <StopCircleIcon />}
 
-                    </IconButton>
+
-                    {download.progress.percentage === '-1' &&
+  function rowContent(_index: number, download: RPCResult) {
-                      <>
+    return (
-                        <IconButton
+      <>
-                          size="small"
+        <TableCell>
-                          onClick={() => viewFile(download.output.savedFilePath)}
+          {download.progress.percentage === '-1'
-                        >
+            ? <DownloadDoneIcon color="primary" />
-                          <SmartDisplayIcon />
+            : <DownloadIcon color="primary" />
-                        </IconButton>
-                        <IconButton
-                          size="small"
-                          onClick={() => downloadFile(download.output.savedFilePath)}
-                        >
-                          <FileDownloadIcon />
-                        </IconButton>
-                      </>
-                    }
-                  </ButtonGroup>
-                </TableCell>
-              </TableRow>
-            ))
           }
-        </TableBody>
+        </TableCell>
-      </Table>
+        <TableCell>{download.info.title}</TableCell>
-    </TableContainer>
+        <TableCell align="right">{formatSpeedMiB(download.progress.speed)}</TableCell>
+        <TableCell align="right">
+          <LinearProgressWithLabel
+            sx={{ height: '16px' }}
+            value={
+              download.progress.percentage === '-1'
+                ? 100
+                : Number(download.progress.percentage.replace('%', ''))
+            }
+            variant={
+              download.progress.process_status === 0
+                ? 'indeterminate'
+                : 'determinate'
+            }
+            color={download.progress.percentage === '-1' ? 'primary' : 'primary'}
+          />
+        </TableCell>
+        <TableCell align="right">{formatSize(download.info.filesize_approx ?? 0)}</TableCell>
+        <TableCell align="right">
+          {new Date(download.info.created_at).toLocaleString()}
+        </TableCell>
+        <TableCell align="right">
+          <ButtonGroup>
+            <IconButton
+              size="small"
+              onClick={() => stop(download)}
+            >
+              {download.progress.percentage === '-1' ? <DeleteIcon /> : <StopCircleIcon />}
+
+            </IconButton>
+            {download.progress.percentage === '-1' &&
+              <>
+                <IconButton
+                  size="small"
+                  onClick={() => viewFile(download.output.savedFilePath)}
+                >
+                  <SmartDisplayIcon />
+                </IconButton>
+                <IconButton
+                  size="small"
+                  onClick={() => downloadFile(download.output.savedFilePath)}
+                >
+                  <FileDownloadIcon />
+                </IconButton>
+              </>
+            }
+          </ButtonGroup>
+        </TableCell>
+      </>
+    )
+  }
+
+  return (
+    <Box style={{ height: downloads.length === 0 ? '0vh' : '80vh', width: '100%' }}>
+      <TableVirtuoso
+        hidden={downloads.length === 0}
+        data={downloads}
+        components={VirtuosoTableComponents}
+        fixedHeaderContent={fixedHeaderContent}
+        itemContent={rowContent}
+      />
+    </Box>
   )
 }
 

frontend/src/components/ErrorBoundary.tsx

@@ -39,7 +39,7 @@ const ErrorBoundary: React.FC = () => {
         </Button>
       </Link>
       <Typography sx={{ mt: 2 }} color={'gray'} fontWeight={500}>
-        Or login if authentication is enabled
+        Or login if authentification is enabled
       </Typography>
       <Link to={'/login'} >
         <Button variant='contained' sx={{ mt: 2 }}>
@@ -50,4 +50,4 @@ const ErrorBoundary: React.FC = () => {
   )
 }
 
-export default ErrorBoundary
+export default ErrorBoundary

frontend/src/components/ExtraDownloadOptions.tsx

@@ -15,6 +15,12 @@ const ExtraDownloadOptions: React.FC = () => {
         disablePortal
         options={customTemplates.map(({ name, content }) => ({ label: name, content }))}
         autoHighlight
+        defaultValue={
+          customTemplates
+            .filter(({ id, name }) => id === "0" || name === "default")
+            .map(({ name, content }) => ({ label: name, content }))
+            .at(0)
+        }
         getOptionLabel={(option) => option.label}
         onChange={(_, value) => {
           setCustomArgs(value?.content!)

frontend/src/components/Footer.tsx

@@ -1,15 +1,15 @@
+import DownloadIcon from '@mui/icons-material/Download'
 import SettingsEthernet from '@mui/icons-material/SettingsEthernet'
 import { AppBar, Chip, Divider, Toolbar } from '@mui/material'
 import { Suspense } from 'react'
 import { useRecoilValue } from 'recoil'
 import { settingsState } from '../atoms/settings'
 import { connectedState } from '../atoms/status'
+import { totalDownloadSpeedState } from '../atoms/ui'
 import { useI18n } from '../hooks/useI18n'
+import { formatSpeedMiB } from '../utils'
 import FreeSpaceIndicator from './FreeSpaceIndicator'
 import VersionIndicator from './VersionIndicator'
-import DownloadIcon from '@mui/icons-material/Download'
-import { totalDownloadSpeedState } from '../atoms/ui'
-import { formatSpeedMiB } from '../utils'
 
 const Footer: React.FC = () => {
   const settings = useRecoilValue(settingsState)
@@ -35,7 +35,7 @@ const Footer: React.FC = () => {
         display: 'flex', gap: 1, justifyContent: 'space-between'
       }}>
         <div style={{ display: 'flex', gap: 4, alignItems: 'center' }}>
-          <Chip label="RPC v3.0.6" variant="outlined" size="small" />
+          <Chip label="RPC v3.1.0" variant="outlined" size="small" />
           <VersionIndicator />
         </div>
         <div style={{ display: 'flex', gap: 4, 'alignItems': 'center' }}>

frontend/src/components/HomeSpeedDial.tsx

@@ -1,9 +1,9 @@
 import AddCircleIcon from '@mui/icons-material/AddCircle'
 import BuildCircleIcon from '@mui/icons-material/BuildCircle'
 import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
+import FolderZipIcon from '@mui/icons-material/FolderZip'
 import FormatListBulleted from '@mui/icons-material/FormatListBulleted'
 import ViewAgendaIcon from '@mui/icons-material/ViewAgenda'
-import FolderZipIcon from '@mui/icons-material/FolderZip'
 import {
   SpeedDial,
   SpeedDialAction,
@@ -26,8 +26,6 @@ const HomeSpeedDial: React.FC<Props> = ({ onDownloadOpen, onEditorOpen }) => {
   const { i18n } = useI18n()
   const { client } = useRPC()
 
-  const abort = () => client.killAll()
-
   return (
     <SpeedDial
       ariaLabel="Home speed dial"
@@ -42,12 +40,12 @@ const HomeSpeedDial: React.FC<Props> = ({ onDownloadOpen, onEditorOpen }) => {
       <SpeedDialAction
         icon={<FolderZipIcon />}
         tooltipTitle={i18n.t('bulkDownload')}
-        onClick={() => window.open(`${serverAddr}/archive/bulk`)}
+        onClick={() => window.open(`${serverAddr}/archive/bulk?token=${localStorage.getItem('token')}`)}
       />
       <SpeedDialAction
         icon={<DeleteForeverIcon />}
         tooltipTitle={i18n.t('abortAllButton')}
-        onClick={abort}
+        onClick={() => client.killAll()}
       />
       <SpeedDialAction
         icon={<BuildCircleIcon />}

frontend/src/components/Logout.tsx

@@ -1,13 +1,10 @@
 import LogoutIcon from '@mui/icons-material/Logout'
 import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material'
 import { useNavigate } from 'react-router-dom'
-import { useRecoilValue } from 'recoil'
-import { serverURL } from '../atoms/settings'
 import { useI18n } from '../hooks/useI18n'
 
 export default function Logout() {
   const navigate = useNavigate()
-  const url = useRecoilValue(serverURL)
 
   const logout = async () => {
     localStorage.removeItem('token')

frontend/src/components/SocketSubscriber.tsx

@@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom'
 import { useRecoilState, useRecoilValue } from 'recoil'
 import { take, timer } from 'rxjs'
 import { downloadsState } from '../atoms/downloads'
+import { rpcPollingTimeState } from '../atoms/rpc'
 import { serverAddressAndPortState } from '../atoms/settings'
 import { connectedState } from '../atoms/status'
 import { useSubscription } from '../hooks/observable'
@@ -19,6 +20,7 @@ const SocketSubscriber: React.FC<Props> = () => {
   const [, setDownloads] = useRecoilState(downloadsState)
 
   const serverAddressAndPort = useRecoilValue(serverAddressAndPortState)
+  const rpcPollingTime = useRecoilValue(rpcPollingTimeState)
 
   const { i18n } = useI18n()
   const { client } = useRPC()
@@ -70,11 +72,10 @@ const SocketSubscriber: React.FC<Props> = () => {
 
   useEffect(() => {
     if (connected) {
-      const sub = timer(0, 1000).subscribe(() => client.running())
+      const sub = timer(0, rpcPollingTime).subscribe(() => client.running())
-
       return () => sub.unsubscribe()
     }
-  }, [connected, client])
+  }, [connected, client, rpcPollingTime])
 
   return null
 }

frontend/src/index.tsx

@@ -6,7 +6,6 @@ import '@fontsource/roboto/300.css'
 import '@fontsource/roboto/400.css'
 import '@fontsource/roboto/500.css'
 import '@fontsource/roboto/700.css'
-import '@fontsource/roboto/700.css'
 
 import '@fontsource/roboto-mono'
 

frontend/src/lib/argsParser.ts

@@ -1,66 +0,0 @@
-export class CliArguments {
-  private _extractAudio: boolean
-  private _noMTime: boolean
-
-  constructor(extractAudio = false, noMTime = true) {
-    this._extractAudio = extractAudio
-    this._noMTime = noMTime
-  }
-
-  public get extractAudio(): boolean {
-    return this._extractAudio
-  }
-
-  public toggleExtractAudio() {
-    this._extractAudio = !this._extractAudio
-    return this
-  }
-
-  public disableExtractAudio() {
-    this._extractAudio = false
-    return this
-  }
-
-  public get noMTime(): boolean {
-    return this._noMTime
-  }
-
-  public toggleNoMTime() {
-    this._noMTime = !this._noMTime
-    return this
-  }
-
-  public toString(): string {
-    let args = ''
-
-    if (this._extractAudio) {
-      args += '-x '
-    }
-
-    if (this._noMTime) {
-      args += '--no-mtime '
-    }
-
-    return args.trim()
-  }
-
-  private reset() {
-    this._extractAudio = false
-    this._noMTime = false
-  }
-
-  public fromString(str: string): CliArguments {
-    this.reset()
-
-    if (str) {
-      if (str.includes('-x')) {
-        this._extractAudio = true
-      }
-
-      if (str.includes('--no-mtime')) {
-        this._noMTime = true
-      }
-    }
-    return this
-  }
-}

frontend/src/lib/rpcClient.ts

@@ -132,6 +132,13 @@ export class RPCClient {
     })
   }
 
+  public clear(id: string) {
+    this.sendHTTP({
+      method: 'Service.Clear',
+      params: [id],
+    })
+  }
+
   public killAll() {
     this.sendHTTP({
       method: 'Service.KillAll',

frontend/src/types/index.ts

@@ -34,11 +34,18 @@ type DownloadInfo = {
   created_at: string
 }
 
+export enum ProcessStatus {
+  Pending = 0,
+  Downloading,
+  Completed,
+  Errored,
+}
+
 type DownloadProgress = {
   speed: number
   eta: number
   percentage: string
-  process_status: number
+  process_status: ProcessStatus
 }
 
 export type RPCResult = Readonly<{
@@ -76,15 +83,14 @@ export type DirectoryEntry = {
   name: string
   path: string
   size: number
-  shaSum: string
   modTime: string
   isVideo: boolean
   isDirectory: boolean
 }
 
-export type DeleteRequest = Pick<DirectoryEntry, 'path' | 'shaSum'>
+export type DeleteRequest = Pick<DirectoryEntry, 'path'>
 
-export type PlayRequest = Pick<DirectoryEntry, 'path'>
+export type PlayRequest = DeleteRequest
 
 export type CustomTemplate = {
   id: string

frontend/src/utils.ts

@@ -1,11 +1,7 @@
 import { pipe } from 'fp-ts/lib/function'
 import type { RPCResponse } from "./types"
+import { ProcessStatus } from './types'
 
-/**
- * Validate an ip v4 via regex
- * @param {string} ipAddr 
- * @returns ip validity test
- */
 export function validateIP(ipAddr: string): boolean {
   let ipRegex = /^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}$/gm
   return ipRegex.test(ipAddr)
@@ -58,15 +54,15 @@ export function isRPCResponse(object: any): object is RPCResponse<any> {
   return 'result' in object && 'id' in object
 }
 
-export function mapProcessStatus(status: number) {
+export function mapProcessStatus(status: ProcessStatus) {
   switch (status) {
-    case 0:
+    case ProcessStatus.Pending:
       return 'Pending'
-    case 1:
+    case ProcessStatus.Downloading:
       return 'Downloading'
-    case 2:
+    case ProcessStatus.Completed:
       return 'Completed'
-    case 3:
+    case ProcessStatus.Errored:
       return 'Error'
     default:
       return 'Pending'

frontend/src/views/Archive.tsx

@@ -113,7 +113,6 @@ export default function Downloaded() {
             modTime: '',
             name: '..',
             path: upperLevel,
-            shaSum: '',
             size: 0,
           }, ...r.filter(f => f.name !== '')]
           : r.filter(f => f.name !== '')
@@ -144,7 +143,6 @@ export default function Downloaded() {
       method: 'POST',
       body: JSON.stringify({
         path: entry.path,
-        shaSum: entry.shaSum,
       })
     }),
     matchW(

frontend/src/views/Settings.tsx

@@ -4,7 +4,6 @@ import {
   Container,
   FormControl,
   FormControlLabel,
-  FormGroup,
   Grid,
   InputAdornment,
   InputLabel,
@@ -12,6 +11,7 @@ import {
   Paper,
   Select,
   SelectChangeEvent,
+  Slider,
   Stack,
   Switch,
   TextField,
@@ -27,6 +27,7 @@ import {
   map,
   takeWhile
 } from 'rxjs'
+import { rpcPollingTimeState } from '../atoms/rpc'
 import {
   Language,
   Theme,
@@ -36,9 +37,9 @@ import {
   formatSelectionState,
   languageState,
   languages,
-  latestCliArgumentsState,
   pathOverridingState,
   servedFromReverseProxyState,
+  servedFromReverseProxySubDirState,
   serverAddressState,
   serverPortState,
   themeState
@@ -47,21 +48,25 @@ import CookiesTextField from '../components/CookiesTextField'
 import { useToast } from '../hooks/toast'
 import { useI18n } from '../hooks/useI18n'
 import { useRPC } from '../hooks/useRPC'
-import { CliArguments } from '../lib/argsParser'
 import { validateDomain, validateIP } from '../utils'
 
 // NEED ABSOLUTELY TO BE SPLIT IN MULTIPLE COMPONENTS
 export default function Settings() {
   const [reverseProxy, setReverseProxy] = useRecoilState(servedFromReverseProxyState)
+  const [baseURL, setBaseURL] = useRecoilState(servedFromReverseProxySubDirState)
+
   const [formatSelection, setFormatSelection] = useRecoilState(formatSelectionState)
   const [pathOverriding, setPathOverriding] = useRecoilState(pathOverridingState)
   const [fileRenaming, setFileRenaming] = useRecoilState(fileRenamingState)
   const [enableArgs, setEnableArgs] = useRecoilState(enableCustomArgsState)
+
   const [serverAddr, setServerAddr] = useRecoilState(serverAddressState)
   const [serverPort, setServerPort] = useRecoilState(serverPortState)
+
+  const [pollingTime, setPollingTime] = useRecoilState(rpcPollingTimeState)
   const [language, setLanguage] = useRecoilState(languageState)
   const [appTitle, setApptitle] = useRecoilState(appTitleState)
-  const [cliArgs, setCliArgs] = useRecoilState(latestCliArgumentsState)
+
   const [theme, setTheme] = useRecoilState(themeState)
 
   const [invalidIP, setInvalidIP] = useState(false)
@@ -71,11 +76,20 @@ export default function Settings() {
 
   const { pushMessage } = useToast()
 
-  const argsBuilder = useMemo(() => new CliArguments().fromString(cliArgs), [])
+  const baseURL$ = useMemo(() => new Subject<string>(), [])
-
   const serverAddr$ = useMemo(() => new Subject<string>(), [])
   const serverPort$ = useMemo(() => new Subject<string>(), [])
 
+  useEffect(() => {
+    const sub = baseURL$
+      .pipe(debounceTime(500))
+      .subscribe(baseURL => {
+        setBaseURL(baseURL)
+        pushMessage(i18n.t('restartAppMessage'), 'info')
+      })
+    return () => sub.unsubscribe()
+  }, [])
+
   useEffect(() => {
     const sub = serverAddr$
       .pipe(
@@ -135,191 +149,218 @@ export default function Settings() {
 
   return (
     <Container maxWidth="xl" sx={{ mt: 4, mb: 8 }}>
-      <Grid container spacing={3}>
+      <Paper
-        <Grid item xs={12} md={12} lg={12}>
+        sx={{
-          <Paper
+          p: 2.5,
-            sx={{
+          display: 'flex',
-              p: 2.5,
+          flexDirection: 'column',
-              display: 'flex',
+          minHeight: 240,
-              flexDirection: 'column',
+        }}
-              minHeight: 240,
+      >
-            }}
+        <Typography pb={2} variant="h6" color="primary">
-          >
+          {i18n.t('settingsAnchor')}
-            <Typography pb={3} variant="h5" color="primary">
+        </Typography>
-              {i18n.t('settingsAnchor')}
+        <Grid container spacing={2}>
+          <Grid item xs={12} md={11}>
+            <TextField
+              fullWidth
+              label={i18n.t('serverAddressTitle')}
+              defaultValue={serverAddr}
+              error={invalidIP}
+              onChange={(e) => serverAddr$.next(e.currentTarget.value)}
+              InputProps={{
+                startAdornment: <InputAdornment position="start">ws://</InputAdornment>,
+              }}
+            />
+          </Grid>
+          <Grid item xs={12} md={1}>
+            <TextField
+              disabled={reverseProxy}
+              fullWidth
+              label={i18n.t('serverPortTitle')}
+              defaultValue={serverPort}
+              onChange={(e) => serverPort$.next(e.currentTarget.value)}
+              error={isNaN(Number(serverPort)) || Number(serverPort) > 65535}
+            />
+          </Grid>
+          <Grid item xs={12} md={12}>
+            <TextField
+              disabled={reverseProxy}
+              fullWidth
+              label={i18n.t('appTitle')}
+              defaultValue={appTitle}
+              onChange={(e) => setApptitle(e.currentTarget.value)}
+              error={appTitle === ''}
+            />
+          </Grid>
+          <Grid item xs={12} md={12}>
+            <Typography>
+              {i18n.t('rpcPollingTimeTitle')}
             </Typography>
-            <FormGroup>
+            <Typography variant='caption' sx={{ mb: 0.5 }}>
-              <Grid container spacing={2}>
+              {i18n.t('rpcPollingTimeDescription')}
-                <Grid item xs={12} md={11}>
+            </Typography>
-                  <TextField
+            <Slider
-                    fullWidth
+              aria-label="rpc polling time"
-                    label={i18n.t('serverAddressTitle')}
+              defaultValue={pollingTime}
-                    defaultValue={serverAddr}
+              max={2000}
-                    error={invalidIP}
+              getAriaValueText={(v: number) => `${v} ms`}
-                    onChange={(e) => serverAddr$.next(e.currentTarget.value)}
+              step={null}
-                    InputProps={{
+              valueLabelDisplay="off"
-                      startAdornment: <InputAdornment position="start">ws://</InputAdornment>,
+              marks={[
-                    }}
+                { value: 100, label: '100 ms' },
-                  />
+                { value: 250, label: '250 ms' },
-                </Grid>
+                { value: 500, label: '500 ms' },
-                <Grid item xs={12} md={1}>
+                { value: 750, label: '750 ms' },
-                  <TextField
+                { value: 1000, label: '1000 ms' },
-                    disabled={reverseProxy}
+                { value: 2000, label: '2000 ms' },
-                    fullWidth
+              ]}
-                    label={i18n.t('serverPortTitle')}
+              onChange={(_, value) => typeof value === 'number'
-                    defaultValue={serverPort}
+                ? setPollingTime(value)
-                    onChange={(e) => serverPort$.next(e.currentTarget.value)}
+                : setPollingTime(1000)
-                    error={isNaN(Number(serverPort)) || Number(serverPort) > 65535}
+              }
-                  />
+            />
-                </Grid>
+          </Grid>
-                <Grid item xs={12} md={12}>
+          <Grid item xs={12}>
-                  <TextField
+            <Typography variant="h6" color="primary" sx={{ mb: 0.5 }}>
-                    disabled={reverseProxy}
+              Reverse Proxy
-                    fullWidth
+            </Typography>
-                    label={i18n.t('appTitle')}
+            <FormControlLabel
-                    defaultValue={appTitle}
+              control={
-                    onChange={(e) => setApptitle(e.currentTarget.value)}
+                <Checkbox
-                    error={appTitle === ''}
+                  defaultChecked={reverseProxy}
-                  />
+                  onChange={() => setReverseProxy(state => !state)}
-                </Grid>
+                />
-                <Grid item xs={12}>
+              }
-                  <FormControlLabel
+              label={i18n.t('servedFromReverseProxyCheckbox')}
-                    control={
+              sx={{ mb: 1 }}
-                      <Checkbox
+            />
-                        defaultChecked={reverseProxy}
+            <TextField
-                        onChange={() => setReverseProxy(state => !state)}
+              fullWidth
-                      />
+              label={i18n.t('urlBase')}
-                    }
+              defaultValue={baseURL}
-                    label={i18n.t('servedFromReverseProxyCheckbox')}
+              onChange={(e) => {
-                    sx={{ mb: 2 }}
+                let value = e.currentTarget.value
-                  />
+                if (value.startsWith('/')) {
-                </Grid>
+                  value = value.substring(1)
-              </Grid>
-              <Grid container spacing={2}>
-                <Grid item xs={12} md={6}>
-                  <FormControl fullWidth>
-                    <InputLabel>{i18n.t('languageSelect')}</InputLabel>
-                    <Select
-                      defaultValue={language}
-                      label={i18n.t('languageSelect')}
-                      onChange={handleLanguageChange}
-                    >
-                      {languages.toSorted((a, b) => a.localeCompare(b)).map(l => (
-                        <MenuItem value={l} key={l}>
-                          {capitalize(l)}
-                        </MenuItem>
-                      ))}
-                    </Select>
-                  </FormControl>
-                </Grid>
-                <Grid item xs={12} md={6}>
-                  <FormControl fullWidth>
-                    <InputLabel>{i18n.t('themeSelect')}</InputLabel>
-                    <Select
-                      defaultValue={theme}
-                      label={i18n.t('themeSelect')}
-                      onChange={handleThemeChange}
-                    >
-                      <MenuItem value="light">Light</MenuItem>
-                      <MenuItem value="dark">Dark</MenuItem>
-                      <MenuItem value="system">System</MenuItem>
-                    </Select>
-                  </FormControl>
-                </Grid>
-              </Grid>
-              <FormControlLabel
-                control={
-                  <Switch
-                    defaultChecked={argsBuilder.noMTime}
-                    onChange={() => setCliArgs(argsBuilder.toggleNoMTime().toString())}
-                  />
                 }
-                label={i18n.t('noMTimeCheckbox')}
+                if (value.endsWith('/')) {
-                sx={{ mt: 3 }}
+                  value = value.substring(0, value.length - 1)
-              />
-              <FormControlLabel
-                control={
-                  <Switch
-                    defaultChecked={argsBuilder.extractAudio}
-                    onChange={() => setCliArgs(argsBuilder.toggleExtractAudio().toString())}
-                    disabled={formatSelection}
-                  />
                 }
-                label={i18n.t('extractAudioCheckbox')}
+                baseURL$.next(value)
-              />
+              }}
-              <FormControlLabel
+              sx={{ mb: 2 }}
-                control={
+            />
-                  <Switch
+          </Grid>
-                    defaultChecked={formatSelection}
-                    onChange={() => {
-                      setCliArgs(argsBuilder.disableExtractAudio().toString())
-                      setFormatSelection(!formatSelection)
-                    }}
-                  />
-                }
-                label={i18n.t('formatSelectionEnabler')}
-              />
-              <Grid>
-                <Typography variant="h6" color="primary" sx={{ mt: 2, mb: 0.5 }}>
-                  {i18n.t('overridesAnchor')}
-                </Typography>
-                <Stack direction="column">
-                  <FormControlLabel
-                    control={
-                      <Switch
-                        defaultChecked={!!pathOverriding}
-                        onChange={() => {
-                          setPathOverriding(state => !state)
-                        }}
-                      />
-                    }
-                    label={i18n.t('pathOverrideOption')}
-                  />
-                  <FormControlLabel
-                    control={
-                      <Switch
-                        defaultChecked={fileRenaming}
-                        onChange={() => {
-                          setFileRenaming(state => !state)
-                        }}
-                      />
-                    }
-                    label={i18n.t('filenameOverrideOption')}
-                  />
-                  <FormControlLabel
-                    control={
-                      <Switch
-                        defaultChecked={enableArgs}
-                        onChange={() => {
-                          setEnableArgs(state => !state)
-                        }}
-                      />
-                    }
-                    label={i18n.t('customArgs')}
-                  />
-                </Stack>
-              </Grid>
-              <Grid sx={{ mr: 1, mt: 3 }}>
-                <Typography variant="h6" color="primary" sx={{ mb: 2 }}>
-                  Cookies
-                </Typography>
-                <CookiesTextField />
-              </Grid>
-              <Grid>
-                <Stack direction="row">
-                  <Button
-                    sx={{ mr: 1, mt: 3 }}
-                    variant="contained"
-                    onClick={() => updateBinary()}
-                  >
-                    {i18n.t('updateBinButton')}
-                  </Button>
-                </Stack>
-              </Grid>
-            </FormGroup>
-          </Paper>
         </Grid>
-      </Grid>
+        <Typography variant="h6" color="primary" sx={{ mt: 0.5, mb: 2 }}>
+          Appearance
+        </Typography>
+        <Grid container spacing={2}>
+          <Grid item xs={12} md={6}>
+            <FormControl fullWidth>
+              <InputLabel>{i18n.t('languageSelect')}</InputLabel>
+              <Select
+                defaultValue={language}
+                label={i18n.t('languageSelect')}
+                onChange={handleLanguageChange}
+              >
+                {languages.toSorted((a, b) => a.localeCompare(b)).map(l => (
+                  <MenuItem value={l} key={l}>
+                    {capitalize(l)}
+                  </MenuItem>
+                ))}
+              </Select>
+            </FormControl>
+          </Grid>
+          <Grid item xs={12} md={6}>
+            <FormControl fullWidth>
+              <InputLabel>{i18n.t('themeSelect')}</InputLabel>
+              <Select
+                defaultValue={theme}
+                label={i18n.t('themeSelect')}
+                onChange={handleThemeChange}
+              >
+                <MenuItem value="light">Light</MenuItem>
+                <MenuItem value="dark">Dark</MenuItem>
+                <MenuItem value="system">System</MenuItem>
+              </Select>
+            </FormControl>
+          </Grid>
+        </Grid>
+        <Typography variant="h6" color="primary" sx={{ mt: 2, mb: 0.5 }}>
+          General download settings
+        </Typography>
+
+        <FormControlLabel
+          control={
+            <Switch
+              defaultChecked={formatSelection}
+              onChange={() => {
+                setFormatSelection(!formatSelection)
+              }}
+            />
+          }
+          label={i18n.t('formatSelectionEnabler')}
+        />
+        <Grid>
+          <Typography variant="h6" color="primary" sx={{ mt: 2, mb: 0.5 }}>
+            {i18n.t('overridesAnchor')}
+          </Typography>
+          <Stack direction="column">
+            <FormControlLabel
+              control={
+                <Switch
+                  defaultChecked={!!pathOverriding}
+                  onChange={() => {
+                    setPathOverriding(state => !state)
+                  }}
+                />
+              }
+              label={i18n.t('pathOverrideOption')}
+            />
+            <FormControlLabel
+              control={
+                <Switch
+                  defaultChecked={fileRenaming}
+                  onChange={() => {
+                    setFileRenaming(state => !state)
+                  }}
+                />
+              }
+              label={i18n.t('filenameOverrideOption')}
+            />
+            <FormControlLabel
+              control={
+                <Switch
+                  defaultChecked={enableArgs}
+                  onChange={() => {
+                    setEnableArgs(state => !state)
+                  }}
+                />
+              }
+              label={i18n.t('customArgs')}
+            />
+          </Stack>
+        </Grid>
+        <Grid sx={{ mr: 1, mt: 2 }}>
+          <Typography variant="h6" color="primary" sx={{ mb: 2 }}>
+            Cookies
+          </Typography>
+          <CookiesTextField />
+        </Grid>
+        <Grid>
+          <Stack direction="row">
+            <Button
+              sx={{ mr: 1, mt: 3 }}
+              variant="contained"
+              onClick={() => updateBinary()}
+            >
+              {i18n.t('updateBinButton')}
+            </Button>
+          </Stack>
+        </Grid>
+      </Paper>
     </Container>
   )
 }

go.mod

@@ -3,12 +3,14 @@ module github.com/marcopeocchi/yt-dlp-web-ui
 go 1.22
 
 require (
+	github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
 	github.com/go-chi/chi/v5 v5.0.12
 	github.com/go-chi/cors v1.2.1
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.1
 	github.com/reactivex/rxgo/v2 v2.5.0
+	golang.org/x/sync v0.6.0
 	golang.org/x/sys v0.18.0
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.29.5
@@ -28,7 +30,6 @@ require (
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/teivah/onecontext v1.3.0 // indirect
 	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
 	modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
 	modernc.org/libc v1.47.0 // indirect
 	modernc.org/mathutil v1.6.0 // indirect

go.sum

@@ -1,3 +1,5 @@
+github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP9/R33ZaagQtAM4EkkSYnIAlOG5EI8gkM=
+github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII=
 github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=

main.go

@@ -36,13 +36,15 @@ var (
 	//go:embed frontend/dist/index.html
 	//go:embed frontend/dist/assets/*
 	frontend embed.FS
+
+	//go:embed openapi/*
+	swagger embed.FS
 )
 
 func init() {
-
 	flag.StringVar(&host, "host", "0.0.0.0", "Host where server will listen at")
 	flag.IntVar(&port, "port", 3033, "Port where server will listen at")
-	flag.IntVar(&queueSize, "qs", runtime.NumCPU(), "Download queue size")
+	flag.IntVar(&queueSize, "qs", 2, "Queue size (concurrent downloads)")
 
 	flag.StringVar(&configFile, "conf", "./config.yml", "Config file path")
 	flag.StringVar(&downloadPath, "out", ".", "Where files will be saved")
@@ -62,7 +64,6 @@ func init() {
 
 func main() {
 	frontend, err := fs.Sub(frontend, "frontend/dist")
-
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -80,6 +81,11 @@ func main() {
 	c.Username = username
 	c.Password = password
 
+	// limit concurrent downloads for systems with 2 or less logical cores
+	if runtime.NumCPU() <= 2 {
+		c.QueueSize = 1
+	}
+
 	// if config file is found it will be merged with the current config struct
 	if err := c.LoadFile(configFile); err != nil {
 		log.Println(cli.BgRed, "config", cli.Reset, err)
@@ -88,9 +94,10 @@ func main() {
 	server.RunBlocking(&server.RunConfig{
 		Host:        c.Host,
 		Port:        c.Port,
-		App:         frontend,
 		DBPath:      localDatabasePath,
 		FileLogging: enableFileLogging,
 		LogFile:     logFile,
+		App:         frontend,
+		Swagger:     swagger,
 	})
 }

openapi/index.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="description" content="SwaggerUI" />
+  <title>SwaggerUI</title>
+  <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.17.2/swagger-ui.css" />
+</head>
+
+<body>
+  <div id="swagger-ui"></div>
+  <script src="https://unpkg.com/swagger-ui-dist@5.17.2/swagger-ui-bundle.js" crossorigin></script>
+  <script>
+    window.onload = () => {
+      window.ui = SwaggerUIBundle({
+        url: './openapi.json',
+        dom_id: '#swagger-ui',
+      });
+    };
+  </script>
+</body>
+
+</html>

openapi/openapi.json

@@ -0,0 +1,273 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "Swagger yt-dlp-webui - OpenAPI 3.1",
+    "description": "yt-dlp-webui api based on the OpenAPI 3.1 specification.  You can find out more about\nSwagger at [https://swagger.io](https://swagger.io). \n\nSome useful links:\n- [yt-dlp-webui repository](https://github.com/marcopeocchi/yt-dlp-web-ui)",
+    "termsOfService": "http://swagger.io/terms/",
+    "contact": {
+      "email": "apiteam@swagger.io"
+    },
+    "license": {
+      "name": "Apache 2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+    },
+    "version": "1.0.11"
+  },
+  "externalDocs": {
+    "description": "Find out more about Swagger",
+    "url": "http://swagger.io"
+  },
+  "servers": [
+    {
+      "url": "/api/v1"
+    }
+  ],
+  "tags": [
+    {
+      "name": "download",
+      "description": "Everything about your Pets",
+      "externalDocs": {
+        "description": "Find out more",
+        "url": "https://github.com/marcopeocchi/yt-dlp-web-ui"
+      }
+    }
+  ],
+  "paths": {
+    "/exec": {
+      "post": {
+        "tags": [
+          "download"
+        ],
+        "summary": "Add a new download in the pending state ready to be processed",
+        "description": "Add a new download in the pending state ready to be processed",
+        "operationId": "addDownload",
+        "requestBody": {
+          "description": "Create a new download",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DownloadRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "description": "Process uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid input"
+          },
+          "422": {
+            "description": "Validation exception"
+          }
+        },
+        "security": [
+          {
+            "api_key": [
+              "write:download",
+              "read:download"
+            ]
+          }
+        ]
+      }
+    },
+    "/running": {
+      "get": {
+        "tags": [
+          "download"
+        ],
+        "summary": "Returns all running and pending process",
+        "description": "Returns all running and pending process",
+        "operationId": "running",
+        "responses": {
+          "200": {
+            "description": "Successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid input"
+          },
+          "422": {
+            "description": "Validation exception"
+          }
+        },
+        "security": [
+          {
+            "api_key": [
+              "write:download",
+              "read:download"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "DownloadRequest": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string",
+            "examples": [
+              "https://..."
+            ]
+          },
+          "params": {
+            "type": "array",
+            "format": "string",
+            "examples": [
+              "-N",
+              "4",
+              "-R",
+              "infinite"
+            ]
+          }
+        }
+      },
+      "DownloadResponse": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string",
+            "examples": [
+              "https://..."
+            ]
+          },
+          "params": {
+            "type": "array",
+            "format": "string",
+            "examples": [
+              "-N",
+              "4",
+              "-R",
+              "infinite"
+            ]
+          }
+        }
+      },
+      "DownloadProgress": {
+        "type": "object",
+        "properties": {
+          "process_status": {
+            "type": "integer",
+            "examples": [
+              0,
+              1,
+              2,
+              3
+            ]
+          },
+          "percentage": {
+            "type": "string",
+            "examples": [
+              "50%"
+            ]
+          },
+          "speed": {
+            "type": "integer",
+            "examples": [
+              7289347
+            ]
+          },
+          "eta": {
+            "type": "integer",
+            "examples": [
+              3600
+            ]
+          }
+        }
+      },
+      "DownloadInfo": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "thumbnail": {
+            "type": "string"
+          },
+          "resolution": {
+            "type": "string"
+          },
+          "size": {
+            "type": "integer"
+          },
+          "vcodec": {
+            "type": "string"
+          },
+          "acodec": {
+            "type": "string"
+          },
+          "extension": {
+            "type": "string"
+          },
+          "original_url": {
+            "type": "string"
+          },
+          "created_at": {
+            "type": "object"
+          }
+        }
+      },
+      "DownloadOutput": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "filename": {
+            "type": "string"
+          },
+          "saveFilePath": {
+            "type": "string"
+          }
+        }
+      },
+      "ProcessResponse": {
+        "type": "object",
+        "properties": {
+          "progress": {
+            "$ref": "#/components/schemas/DownloadProgress"
+          },
+          "info": {
+            "$ref": "#/components/schemas/DownloadInfo"
+          },
+          "output": {
+            "$ref": "#/components/schemas/DownloadOutput"
+          },
+          "params": {
+            "type": "array",
+            "format": "string"
+          }
+        }
+      }
+    },
+    "securitySchemes": {
+      "api_key": {
+        "type": "apiKey",
+        "name": "api_key",
+        "in": "header"
+      }
+    }
+  }
+}

proto/yt-dlp.proto

@@ -0,0 +1,65 @@
+syntax = "proto3";
+
+message Empty {}
+
+message BaseRequest {
+  string id = 1;
+  string url = 2;
+}
+
+message DownloadRequest {
+  string id = 1;
+  string url = 2;
+  string path = 3;
+  string rename = 4;
+  repeated string params = 5;
+}
+
+message ExecResponse {
+  string id = 1;
+}
+
+message DownloadProgress {
+  int32 status = 1;
+  string percentage = 2;
+  float speed = 3;
+  float eta = 4;
+}
+
+message DownloadInfo {
+  string url = 1;
+  string title = 2;
+  string thumbnail = 3;
+  string resolution = 4;
+  int32  size = 5;
+  string vcodec = 6;
+  string acodec = 7;
+  string extension = 8;
+  string originalURL = 9;
+  string createdAt = 10;
+}
+
+message DownloadOutput {
+  string path = 1;
+  string filename = 2;
+  string savedFilePath = 3;
+}
+
+message ProcessResponse {
+  string id = 1;
+  DownloadProgress progress = 2;
+  DownloadInfo info = 3;
+  DownloadOutput output = 4;
+  repeated string params = 5;
+}
+
+service Ytdlp {
+  rpc Exec (DownloadRequest) returns (ExecResponse);
+  rpc ExecPlaylist (DownloadRequest) returns (ExecResponse);
+
+  rpc Progress (BaseRequest) returns (DownloadProgress);
+  rpc Running (Empty) returns (stream ProcessResponse);
+
+  rpc Kill (BaseRequest) returns (ExecResponse);
+  rpc KillAll (Empty) returns (stream ExecResponse);
+}

server/config/config.go

@@ -10,6 +10,7 @@ import (
 type Config struct {
 	CurrentLogFile  string
 	LogPath         string `yaml:"log_path"`
+	BaseURL         string `yaml:"base_url"`
 	Host            string `yaml:"host"`
 	Port            int    `yaml:"port"`
 	DownloadPath    string `yaml:"downloadPath"`

server/dbutil/migrate.go

@@ -1,4 +1,4 @@
-package dbutils
+package dbutil
 
 import (
 	"context"
@@ -22,6 +22,18 @@ func AutoMigrate(ctx context.Context, db *sql.DB) error {
 			content TEXT NOT NULL
 		)`,
 	)
+	if err != nil {
+		return err
+	}
+
+	db.ExecContext(
+		ctx,
+		`INSERT INTO templates (id, name, content) VALUES
+			($1, $2, $3),
+			($4, $5, $6);`,
+		"0", "default", "--no-mtime",
+		"1", "audio only", "-x",
+	)
 
 	return err
 }

server/handlers/archive.go

@@ -2,14 +2,15 @@ package handlers
 
 import (
 	"archive/zip"
-	"bytes"
 	"encoding/base64"
 	"encoding/json"
 	"io"
+	"io/fs"
 	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
+	"regexp"
 	"slices"
 	"sort"
 	"strings"
@@ -18,7 +19,6 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
 )
 
 /*
@@ -26,6 +26,20 @@ import (
 	a entirely self-contained package
 */
 
+var (
+	videoRe = regexp.MustCompile(`(?i)/\.mov|\.mp4|\.webm|\.mvk|/gmi`)
+)
+
+func isVideo(d fs.DirEntry) bool {
+	return videoRe.MatchString(d.Name())
+}
+
+func isValidEntry(d fs.DirEntry) bool {
+	return !strings.HasPrefix(d.Name(), ".") &&
+		!strings.HasSuffix(d.Name(), ".part") &&
+		!strings.HasSuffix(d.Name(), ".ytdl")
+}
+
 type DirectoryEntry struct {
 	Name        string    `json:"name"`
 	Path        string    `json:"path"`
@@ -44,7 +58,7 @@ func walkDir(root string) (*[]DirectoryEntry, error) {
 	var files []DirectoryEntry
 
 	for _, d := range dirs {
-		if !utils.IsValidEntry(d) {
+		if !isValidEntry(d) {
 			continue
 		}
 
@@ -59,7 +73,7 @@ func walkDir(root string) (*[]DirectoryEntry, error) {
 			Path:        path,
 			Name:        d.Name(),
 			Size:        info.Size(),
-			IsVideo:     utils.IsVideo(d),
+			IsVideo:     isVideo(d),
 			IsDirectory: d.IsDir(),
 			ModTime:     info.ModTime(),
 		})
@@ -178,14 +192,8 @@ func DownloadFile(w http.ResponseWriter, r *http.Request) {
 	root := config.Instance().DownloadPath
 
 	if strings.Contains(filepath.Dir(filename), root) {
-		w.Header().Add(
+		w.Header().Add("Content-Disposition", "inline; filename=\""+filepath.Base(filename)+"\"")
-			"Content-Disposition",
+		w.Header().Set("Content-Type", "application/octet-stream")
-			"inline; filename="+filepath.Base(filename),
-		)
-		w.Header().Set(
-			"Content-Type",
-			"application/octet-stream",
-		)
 
 		fd, err := os.Open(filename)
 		if err != nil {
@@ -209,10 +217,13 @@ func BulkDownload(mdb *internal.MemoryDB) http.HandlerFunc {
 			return
 		}
 
-		var (
+		zipWriter := zip.NewWriter(w)
-			buff      bytes.Buffer
+
-			zipWriter = zip.NewWriter(&buff)
+		w.Header().Add(
+			"Content-Disposition",
+			"inline; filename=download-archive-"+time.Now().Format(time.RFC3339)+".zip",
 		)
+		w.Header().Set("Content-Type", "application/zip")
 
 		for _, p := range ps {
 			wr, err := zipWriter.Create(filepath.Base(p.Output.SavedFilePath))
@@ -227,25 +238,15 @@ func BulkDownload(mdb *internal.MemoryDB) http.HandlerFunc {
 				return
 			}
 
-			_, err = io.Copy(wr, fd)
+			if _, err := io.Copy(wr, fd); err != nil {
-			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
 		}
 
-		err := zipWriter.Close()
+		if err := zipWriter.Close(); err != nil {
-		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-
-		w.Header().Add(
-			"Content-Disposition",
-			"inline; filename=download-archive-"+time.Now().Format(time.RFC3339)+".zip",
-		)
-		w.Header().Set("Content-Type", "application/zip")
-
-		io.Copy(w, &buff)
 	}
 }

server/handlers/login.go

@@ -8,9 +8,10 @@ import (
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
 )
 
+const TOKEN_COOKIE_NAME = "jwt-yt-dlp-webui"
+
 type LoginRequest struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
@@ -55,7 +56,7 @@ func Login(w http.ResponseWriter, r *http.Request) {
 
 func Logout(w http.ResponseWriter, r *http.Request) {
 	cookie := &http.Cookie{
-		Name:     utils.TOKEN_COOKIE_NAME,
+		Name:     TOKEN_COOKIE_NAME,
 		HttpOnly: true,
 		Secure:   false,
 		Expires:  time.Now(),

server/internal/balancer.go

@@ -0,0 +1,34 @@
+package internal
+
+import (
+	"container/heap"
+)
+
+type LoadBalancer struct {
+	pool Pool
+	done chan *Worker
+}
+
+func (b *LoadBalancer) Balance(work chan Process) {
+	for {
+		select {
+		case req := <-work:
+			b.dispatch(req)
+		case w := <-b.done:
+			b.completed(w)
+		}
+	}
+}
+
+func (b *LoadBalancer) dispatch(req Process) {
+	w := heap.Pop(&b.pool).(*Worker)
+	w.requests <- req
+	w.pending++
+	heap.Push(&b.pool, w)
+}
+
+func (b *LoadBalancer) completed(w *Worker) {
+	w.pending--
+	heap.Remove(&b.pool, w.index)
+	heap.Push(&b.pool, w)
+}

server/internal/common_types.go

@@ -36,6 +36,7 @@ type DownloadInfo struct {
 	ACodec      string    `json:"acodec"`
 	Extension   string    `json:"ext"`
 	OriginalURL string    `json:"original_url"`
+	FileName    string    `json:"filename"`
 	CreatedAt   time.Time `json:"created_at"`
 }
 

server/internal/memory_db.go

@@ -23,14 +23,17 @@ func (m *MemoryDB) Get(id string) (*Process, error) {
 	if !ok {
 		return nil, errors.New("no process found for the given key")
 	}
+
 	return entry.(*Process), nil
 }
 
 // Store a pointer of a process and return its id
 func (m *MemoryDB) Set(process *Process) string {
 	id := uuid.NewString()
+
 	m.table.Store(id, process)
 	process.Id = id
+
 	return id
 }
 
@@ -40,17 +43,20 @@ func (m *MemoryDB) Delete(id string) {
 }
 
 func (m *MemoryDB) Keys() *[]string {
-	running := []string{}
+	var running []string
+
 	m.table.Range(func(key, value any) bool {
 		running = append(running, key.(string))
 		return true
 	})
+
 	return &running
 }
 
 // Returns a slice of all currently stored processes progess
 func (m *MemoryDB) All() *[]ProcessResponse {
 	running := []ProcessResponse{}
+
 	m.table.Range(func(key, value any) bool {
 		running = append(running, ProcessResponse{
 			Id:       key.(string),
@@ -61,6 +67,7 @@ func (m *MemoryDB) All() *[]ProcessResponse {
 		})
 		return true
 	})
+
 	return &running
 }
 
@@ -75,12 +82,9 @@ func (m *MemoryDB) Persist() error {
 		return errors.Join(errors.New("failed to persist session"), err)
 	}
 
-	session := Session{
+	session := Session{Processes: *running}
-		Processes: *running,
-	}
 
-	err = gob.NewEncoder(fd).Encode(session)
+	if err := gob.NewEncoder(fd).Encode(session); err != nil {
-	if err != nil {
 		return errors.Join(errors.New("failed to persist session"), err)
 	}
 
@@ -88,7 +92,7 @@ func (m *MemoryDB) Persist() error {
 }
 
 // Restore a persisted state
-func (m *MemoryDB) Restore(logger *slog.Logger) {
+func (m *MemoryDB) Restore(mq *MessageQueue, logger *slog.Logger) {
 	fd, err := os.Open("session.dat")
 	if err != nil {
 		return
@@ -113,8 +117,8 @@ func (m *MemoryDB) Restore(logger *slog.Logger) {
 
 		m.table.Store(proc.Id, restored)
 
-		if restored.Progress.Percentage != "-1" {
+		if restored.Progress.Status != StatusCompleted {
-			go restored.Start()
+			mq.Publish(restored)
 		}
 	}
 }

server/internal/message_queue.go

@@ -1,74 +1,112 @@
 package internal
 
 import (
+	"context"
+	"errors"
 	"log/slog"
 
+	evbus "github.com/asaskevich/EventBus"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"golang.org/x/sync/semaphore"
 )
 
+const queueName = "process:pending"
+
 type MessageQueue struct {
-	producerCh chan *Process
+	concurrency int
-	consumerCh chan struct{}
+	eventBus    evbus.Bus
-	logger     *slog.Logger
+	logger      *slog.Logger
 }
 
 // Creates a new message queue.
 // By default it will be created with a size equals to nthe number of logical
-// CPU cores.
+// CPU cores -1.
 // The queue size can be set via the qs flag.
-func NewMessageQueue(l *slog.Logger) *MessageQueue {
+func NewMessageQueue(l *slog.Logger) (*MessageQueue, error) {
-	size := config.Instance().QueueSize
+	qs := config.Instance().QueueSize
 
-	if size <= 0 {
+	if qs <= 0 {
-		panic("invalid queue size")
+		return nil, errors.New("invalid queue size")
 	}
 
 	return &MessageQueue{
-		producerCh: make(chan *Process, size),
+		concurrency: qs,
-		consumerCh: make(chan struct{}, size),
+		eventBus:    evbus.New(),
-		logger:     l,
+		logger:      l,
-	}
+	}, nil
 }
 
 // Publish a message to the queue and set the task to a peding state.
 func (m *MessageQueue) Publish(p *Process) {
+	// needs to have an id set before
 	p.SetPending()
-	go func() {
+
-		if err := p.SetMetadata(); err != nil {
+	m.eventBus.Publish(queueName, p)
-			m.logger.Error(
-				"failed to retrieve metadata",
-				slog.String("err", err.Error()),
-			)
-		}
-	}()
-	m.producerCh <- p
 }
 
-// Publish a message to the queue and set the task to a peding state.
+func (m *MessageQueue) SetupConsumers() {
-// ENSURE P IS PART OF A PLAYLIST
+	go m.downloadConsumer()
-// Needs a further review
+	go m.metadataSubscriber()
-func (m *MessageQueue) PublishPlaylistEntry(p *Process) {
-	m.producerCh <- p
 }
 
 // Setup the consumer listener which subscribes to the changes to the producer
 // channel and triggers the "download" action.
-func (m *MessageQueue) Subscriber() {
+func (m *MessageQueue) downloadConsumer() {
-	for msg := range m.producerCh {
+	sem := semaphore.NewWeighted(int64(m.concurrency))
-		m.consumerCh <- struct{}{}
+
-		go func(p *Process) {
+	m.eventBus.SubscribeAsync(queueName, func(p *Process) {
+		//TODO: provide valid context
+		sem.Acquire(context.Background(), 1)
+		defer sem.Release(1)
+
+		m.logger.Info("received process from event bus",
+			slog.String("bus", queueName),
+			slog.String("consumer", "downloadConsumer"),
+			slog.String("id", p.getShortId()),
+		)
+
+		if p.Progress.Status != StatusCompleted {
 			p.Start()
-			<-m.consumerCh
+		}
-		}(msg)
+
-	}
+		m.logger.Info("started process",
+			slog.String("bus", queueName),
+			slog.String("id", p.getShortId()),
+		)
+	}, false)
 }
 
-// Empties the message queue
+// Setup the metadata consumer listener which subscribes to the changes to the
-func (m *MessageQueue) Empty() {
+// producer channel and adds metadata to each download.
-	for range m.producerCh {
+func (m *MessageQueue) metadataSubscriber() {
-		<-m.producerCh
+	// How many concurrent metadata fetcher jobs are spawned
-	}
+	// Since there's ongoing downloads, 1 job at time seems a good compromise
-	for range m.consumerCh {
+	sem := semaphore.NewWeighted(1)
-		<-m.consumerCh
+
-	}
+	m.eventBus.SubscribeAsync(queueName, func(p *Process) {
+		//TODO: provide valid context
+		sem.Acquire(context.TODO(), 1)
+		defer sem.Release(1)
+
+		m.logger.Info("received process from event bus",
+			slog.String("bus", queueName),
+			slog.String("consumer", "metadataConsumer"),
+			slog.String("id", p.getShortId()),
+		)
+
+		if p.Progress.Status == StatusCompleted {
+			m.logger.Warn("proccess has an illegal state",
+				slog.String("id", p.getShortId()),
+				slog.Int("status", p.Progress.Status),
+			)
+			return
+		}
+
+		if err := p.SetMetadata(); err != nil {
+			m.logger.Error("failed to retrieve metadata",
+				slog.String("id", p.getShortId()),
+				slog.String("err", err.Error()),
+			)
+		}
+	}, false)
 }

server/internal/playlist.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"log/slog"
 	"os/exec"
+	"slices"
 	"strings"
 	"time"
 
@@ -21,7 +22,7 @@ type metadata struct {
 func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger *slog.Logger) error {
 	var (
 		downloader = config.Instance().DownloaderPath
-		cmd        = exec.Command(downloader, req.URL, "-J")
+		cmd        = exec.Command(downloader, req.URL, "--flat-playlist", "-J")
 	)
 
 	stdout, err := cmd.StdoutPipe()
@@ -35,29 +36,30 @@ func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger
 		return err
 	}
 
-	logger.Info("decoding metadata", slog.String("url", req.URL))
+	logger.Info("decoding playlist metadata", slog.String("url", req.URL))
 
 	if err := json.NewDecoder(stdout).Decode(&m); err != nil {
 		return err
 	}
 
-	logger.Info("decoded metadata", slog.String("url", req.URL))
+	if err := cmd.Wait(); err != nil {
+		return err
+	}
+
+	logger.Info("decoded playlist metadata", slog.String("url", req.URL))
 
 	if m.Type == "" {
-		cmd.Wait()
 		return errors.New("probably not a valid URL")
 	}
 
 	if m.Type == "playlist" {
-		logger.Info(
+		entries := slices.CompactFunc(slices.Compact(m.Entries), func(a DownloadInfo, b DownloadInfo) bool {
-			"playlist detected",
+			return a.URL == b.URL
-			slog.String("url", req.URL),
+		})
-			slog.Int("count", m.Count),
-		)
 
-		for i, meta := range m.Entries {
+		logger.Info("playlist detected", slog.String("url", req.URL), slog.Int("count", len(entries)))
-			delta := time.Second.Microseconds() * int64(i+1)
 
+		for i, meta := range entries {
 			// detect playlist title from metadata since each playlist entry will be
 			// treated as an individual download
 			req.Rename = strings.Replace(
@@ -67,8 +69,11 @@ func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger
 				1,
 			)
 
+			//TODO: it's idiotic but it works: virtually delay the creation time
+			meta.CreatedAt = time.Now().Add(time.Millisecond * time.Duration(i*10))
+
 			proc := &Process{
-				Url:      meta.OriginalURL,
+				Url:      meta.URL,
 				Progress: DownloadProgress{},
 				Output:   DownloadOutput{Filename: req.Rename},
 				Info:     meta,
@@ -76,16 +81,13 @@ func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger
 				Logger:   logger,
 			}
 
-			proc.Info.URL = meta.OriginalURL
+			proc.Info.URL = meta.URL
-			proc.Info.CreatedAt = time.Now().Add(time.Duration(delta))
+
+			time.Sleep(time.Millisecond)
 
 			db.Set(proc)
-			proc.SetPending()
+			mq.Publish(proc)
-			mq.PublishPlaylistEntry(proc)
 		}
-
-		err = cmd.Wait()
-		return err
 	}
 
 	proc := &Process{
@@ -94,6 +96,7 @@ func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger
 		Logger: logger,
 	}
 
+	db.Set(proc)
 	mq.Publish(proc)
 	logger.Info("sending new process to message queue", slog.String("url", proc.Url))
 

server/internal/pool.go

@@ -0,0 +1,16 @@
+package internal
+
+type Pool []*Worker
+
+func (h Pool) Len() int           { return len(h) }
+func (h Pool) Less(i, j int) bool { return h[i].index < h[j].index }
+func (h Pool) Swap(i, j int)      { h[i], h[j] = h[j], h[i] }
+func (h *Pool) Push(x any)        { *h = append(*h, x.(*Worker)) }
+
+func (h *Pool) Pop() any {
+	old := *h
+	n := len(old)
+	x := old[n-1]
+	*h = old[0 : n-1]
+	return x
+}

server/internal/process.go

@@ -82,9 +82,10 @@ func (p *Process) Start() {
 
 	buildFilename(&p.Output)
 
+	//TODO: it spawn another one yt-dlp process, too slow.
 	go p.GetFileName(&out)
 
-	params := []string{
+	baseParams := []string{
 		strings.Split(p.Url, "?list")[0], //no playlist
 		"--newline",
 		"--no-colors",
@@ -94,12 +95,12 @@ func (p *Process) Start() {
 	}
 
 	// if user asked to manually override the output path...
-	if !(slices.Contains(params, "-P") || slices.Contains(params, "--paths")) {
+	if !(slices.Contains(p.Params, "-P") || slices.Contains(p.Params, "--paths")) {
-		params = append(params, "-o")
+		p.Params = append(p.Params, "-o")
-		params = append(params, fmt.Sprintf("%s/%s", out.Path, out.Filename))
+		p.Params = append(p.Params, fmt.Sprintf("%s/%s", out.Path, out.Filename))
 	}
 
-	params = append(params, p.Params...)
+	params := append(baseParams, p.Params...)
 
 	// ----------------- main block ----------------- //
 	cmd := exec.Command(config.Instance().DownloaderPath, params...)
@@ -114,8 +115,7 @@ func (p *Process) Start() {
 		panic(err)
 	}
 
-	err = cmd.Start()
+	if err := cmd.Start(); err != nil {
-	if err != nil {
 		p.Logger.Error(
 			"failed to start yt-dlp process",
 			slog.String("err", err.Error()),
@@ -139,7 +139,9 @@ func (p *Process) Start() {
 		defer func() {
 			r.Close()
 			p.Complete()
+
 			doneChan <- struct{}{}
+
 			close(sourceChan)
 			close(doneChan)
 		}()
@@ -196,18 +198,22 @@ func (p *Process) Complete() {
 
 // Kill a process and remove it from the memory
 func (p *Process) Kill() error {
+	defer func() {
+		p.Progress.Status = StatusCompleted
+	}()
 	// yt-dlp uses multiple child process the parent process
 	// has been spawned with setPgid = true. To properly kill
 	// all subprocesses a SIGTERM need to be sent to the correct
 	// process group
-	if p.proc != nil {
+	if p.proc == nil {
-		pgid, err := syscall.Getpgid(p.proc.Pid)
+		return errors.New("*os.Process not set")
-		if err != nil {
+	}
-			return err
-		}
-		err = syscall.Kill(-pgid, syscall.SIGTERM)
 
-		p.Logger.Info("killed process", slog.String("id", p.Id))
+	pgid, err := syscall.Getpgid(p.proc.Pid)
+	if err != nil {
+		return err
+	}
+	if err := syscall.Kill(-pgid, syscall.SIGTERM); err != nil {
 		return err
 	}
 
@@ -215,15 +221,13 @@ func (p *Process) Kill() error {
 }
 
 // Returns the available format for this URL
+// TODO: Move out from process.go
 func (p *Process) GetFormatsSync() (DownloadFormats, error) {
 	cmd := exec.Command(config.Instance().DownloaderPath, p.Url, "-J")
 
 	stdout, err := cmd.Output()
 	if err != nil {
-		p.Logger.Error(
+		p.Logger.Error("failed to retrieve metadata", slog.String("err", err.Error()))
-			"failed to retrieve metadata",
-			slog.String("err", err.Error()),
-		)
 		return DownloadFormats{}, err
 	}
 
@@ -356,9 +360,7 @@ func (p *Process) SetMetadata() error {
 	return nil
 }
 
-func (p *Process) getShortId() string {
+func (p *Process) getShortId() string { return strings.Split(p.Id, "-")[0] }
-	return strings.Split(p.Id, "-")[0]
-}
 
 func buildFilename(o *DownloadOutput) {
 	if o.Filename != "" && strings.Contains(o.Filename, ".%(ext)s") {

server/internal/worker.go

@@ -0,0 +1,15 @@
+package internal
+
+type Worker struct {
+	requests chan Process // downloads to do
+	pending  int          // downloads pending
+	index    int          // index in the heap
+}
+
+func (w *Worker) Work(done chan *Worker) {
+	for {
+		req := <-w.requests
+		req.Start()
+		done <- w
+	}
+}

server/logging/handler.go

@@ -61,7 +61,10 @@ func sse(w http.ResponseWriter, r *http.Request) {
 		}
 
 		sb.WriteString("event: log\n")
-		sb.WriteString("data: " + b.String() + "\n\n")
+		sb.WriteString("data: ")
+		sb.WriteString(b.String())
+		sb.WriteRune('\n')
+		sb.WriteRune('\n')
 
 		fmt.Fprint(w, sb.String())
 

server/rest/common.go

@@ -0,0 +1,15 @@
+package rest
+
+import (
+	"database/sql"
+	"log/slog"
+
+	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
+)
+
+type ContainerArgs struct {
+	DB     *sql.DB
+	MDB    *internal.MemoryDB
+	MQ     *internal.MessageQueue
+	Logger *slog.Logger
+}

server/rest/container.go

@@ -1,24 +1,21 @@
 package rest
 
 import (
-	"database/sql"
-
 	"github.com/go-chi/chi/v5"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
 	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
 )
 
-func Container(db *sql.DB, mdb *internal.MemoryDB, mq *internal.MessageQueue) *Handler {
+func Container(args *ContainerArgs) *Handler {
 	var (
-		service = ProvideService(db, mdb, mq)
+		service = ProvideService(args)
 		handler = ProvideHandler(service)
 	)
 	return handler
 }
 
-func ApplyRouter(db *sql.DB, mdb *internal.MemoryDB, mq *internal.MessageQueue) func(chi.Router) {
+func ApplyRouter(args *ContainerArgs) func(chi.Router) {
-	h := Container(db, mdb, mq)
+	h := Container(args)
 
 	return func(r chi.Router) {
 		if config.Instance().RequireAuth {

server/rest/handlers.go

@@ -22,7 +22,7 @@ func (h *Handler) Exec() http.HandlerFunc {
 
 		w.Header().Set("Content-Type", "application/json")
 
-		req := internal.DownloadRequest{}
+		var req internal.DownloadRequest
 
 		if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)

server/rest/provider.go

@@ -1,10 +1,7 @@
 package rest
 
 import (
-	"database/sql"
 	"sync"
-
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
 )
 
 var (
@@ -15,12 +12,13 @@ var (
 	handlerOnce sync.Once
 )
 
-func ProvideService(db *sql.DB, mdb *internal.MemoryDB, mq *internal.MessageQueue) *Service {
+func ProvideService(args *ContainerArgs) *Service {
 	serviceOnce.Do(func() {
 		service = &Service{
-			mdb: mdb,
+			mdb:    args.MDB,
-			db:  db,
+			db:     args.DB,
-			mq:  mq,
+			mq:     args.MQ,
+			logger: args.Logger,
 		}
 	})
 	return service

server/rpc/handlers.go

@@ -2,7 +2,6 @@ package rpc
 
 import (
 	"io"
-	"log"
 	"net/http"
 
 	"github.com/gorilla/websocket"
@@ -30,8 +29,6 @@ func WebSocket(w http.ResponseWriter, r *http.Request) {
 	for {
 		mtype, reader, err := c.NextReader()
 		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			log.Println(err)
 			break
 		}
 
@@ -40,7 +37,6 @@ func WebSocket(w http.ResponseWriter, r *http.Request) {
 		writer, err := c.NextWriter(mtype)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
-			log.Println(err)
 			break
 		}
 

server/rpc/service.go

@@ -1,6 +1,7 @@
 package rpc
 
 import (
+	"errors"
 	"log/slog"
 
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
@@ -54,7 +55,6 @@ func (s *Service) ExecPlaylist(args internal.DownloadRequest, result *string) er
 	}
 
 	*result = ""
-
 	return nil
 }
 
@@ -64,14 +64,17 @@ func (s *Service) Progess(args Args, progress *internal.DownloadProgress) error
 	if err != nil {
 		return err
 	}
+
 	*progress = proc.Progress
 	return nil
 }
 
 // Progess retrieves available format for a given resource
 func (s *Service) Formats(args Args, meta *internal.DownloadFormats) error {
-	var err error
+	var (
-	p := internal.Process{Url: args.URL, Logger: s.logger}
+		err error
+		p   = internal.Process{Url: args.URL, Logger: s.logger}
+	)
 	*meta, err = p.GetFormatsSync()
 	return err
 }
@@ -91,38 +94,64 @@ func (s *Service) Running(args NoArgs, running *Running) error {
 // Kill kills a process given its id and remove it from the memoryDB
 func (s *Service) Kill(args string, killed *string) error {
 	s.logger.Info("Trying killing process with id", slog.String("id", args))
-	proc, err := s.db.Get(args)
 
+	proc, err := s.db.Get(args)
 	if err != nil {
 		return err
 	}
-	if proc != nil {
+
-		err = proc.Kill()
+	if proc == nil {
-		s.db.Delete(proc.Id)
+		return errors.New("nil process")
+	}
+
+	if err := proc.Kill(); err != nil {
+		s.logger.Info("failed killing process", slog.String("id", proc.Id), slog.Any("err", err))
+		return err
 	}
 
 	s.db.Delete(proc.Id)
-	return err
+	s.logger.Info("succesfully killed process", slog.String("id", proc.Id))
+
+	return nil
 }
 
 // KillAll kills all process unconditionally and removes them from
 // the memory db
 func (s *Service) KillAll(args NoArgs, killed *string) error {
 	s.logger.Info("Killing all spawned processes")
-	keys := s.db.Keys()
+
-	var err error
+	var (
+		keys       = s.db.Keys()
+		removeFunc = func(p *internal.Process) error {
+			defer s.db.Delete(p.Id)
+			return p.Kill()
+		}
+	)
+
 	for _, key := range *keys {
 		proc, err := s.db.Get(key)
 		if err != nil {
 			return err
 		}
-		if proc != nil {
+
-			proc.Kill()
+		if proc == nil {
-			s.db.Delete(proc.Id)
+			s.db.Delete(key)
+			continue
 		}
+
+		if err := removeFunc(proc); err != nil {
+			s.logger.Info(
+				"failed killing process",
+				slog.String("id", proc.Id),
+				slog.Any("err", err),
+			)
+			continue
+		}
+
+		s.logger.Info("succesfully killed process", slog.String("id", proc.Id))
 	}
-	s.mq.Empty()
+
-	return err
+	return nil
 }
 
 // Remove a process from the db rendering it unusable if active
@@ -135,6 +164,10 @@ func (s *Service) Clear(args string, killed *string) error {
 // FreeSpace gets the available from package sys util
 func (s *Service) FreeSpace(args NoArgs, free *uint64) error {
 	freeSpace, err := sys.FreeSpace()
+	if err != nil {
+		return err
+	}
+
 	*free = freeSpace
 	return err
 }
@@ -142,21 +175,31 @@ func (s *Service) FreeSpace(args NoArgs, free *uint64) error {
 // Return a flattned tree of the download directory
 func (s *Service) DirectoryTree(args NoArgs, tree *[]string) error {
 	dfsTree, err := sys.DirectoryTree()
+
+	if err != nil {
+		*tree = nil
+		return err
+	}
+
 	if dfsTree != nil {
 		*tree = *dfsTree
 	}
-	return err
+
+	return nil
 }
 
 // Updates the yt-dlp binary using its builtin function
 func (s *Service) UpdateExecutable(args NoArgs, updated *bool) error {
 	s.logger.Info("Updating yt-dlp executable to the latest release")
-	err := updater.UpdateExecutable()
+
-	if err != nil {
+	if err := updater.UpdateExecutable(); err != nil {
-		*updated = true
+		s.logger.Error("Failed updating yt-dlp")
-		s.logger.Info("Succesfully updated yt-dlp")
+		*updated = false
 		return err
 	}
-	*updated = false
+
-	return err
+	*updated = true
+	s.logger.Info("Succesfully updated yt-dlp")
+
+	return nil
 }

server/server.go

@@ -19,7 +19,7 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/cors"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/dbutils"
+	"github.com/marcopeocchi/yt-dlp-web-ui/server/dbutil"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/handlers"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/logging"
@@ -33,14 +33,16 @@ import (
 type RunConfig struct {
 	Host        string
 	Port        int
-	App         fs.FS
 	DBPath      string
 	LogFile     string
 	FileLogging bool
+	App         fs.FS
+	Swagger     fs.FS
 }
 
 type serverConfig struct {
 	frontend fs.FS
+	swagger  fs.FS
 	logger   *slog.Logger
 	host     string
 	port     int
@@ -77,23 +79,26 @@ func RunBlocking(cfg *RunConfig) {
 		slog.NewTextHandler(io.MultiWriter(logWriters...), &slog.HandlerOptions{}),
 	)
 
-	mdb.Restore(logger)
-
 	db, err := sql.Open("sqlite", cfg.DBPath)
 	if err != nil {
 		logger.Error("failed to open database", slog.String("err", err.Error()))
 	}
 
-	err = dbutils.AutoMigrate(context.Background(), db)
+	if err := dbutil.AutoMigrate(context.Background(), db); err != nil {
-	if err != nil {
 		logger.Error("failed to init database", slog.String("err", err.Error()))
 	}
 
-	mq := internal.NewMessageQueue(logger)
+	mq, err := internal.NewMessageQueue(logger)
-	go mq.Subscriber()
+	if err != nil {
+		panic(err)
+	}
+	mq.SetupConsumers()
+
+	go mdb.Restore(mq, logger)
 
 	srv := newServer(serverConfig{
 		frontend: cfg.App,
+		swagger:  cfg.Swagger,
 		logger:   logger,
 		host:     cfg.Host,
 		port:     cfg.Port,
@@ -152,7 +157,11 @@ func newServer(c serverConfig) *http.Server {
 	// use in dev
 	// r.Use(middleware.Logger)
 
-	r.Mount("/", http.FileServer(http.FS(c.frontend)))
+	baseUrl := config.Instance().BaseURL
+	r.Mount(baseUrl+"/", http.StripPrefix(baseUrl, http.FileServerFS(c.frontend)))
+
+	// swagger
+	r.Mount("/openapi", http.FileServerFS(c.swagger))
 
 	// Archive routes
 	r.Route("/archive", func(r chi.Router) {
@@ -176,7 +185,12 @@ func newServer(c serverConfig) *http.Server {
 	r.Route("/rpc", ytdlpRPC.ApplyRouter())
 
 	// REST API handlers
-	r.Route("/api/v1", rest.ApplyRouter(c.db, c.mdb, c.mq))
+	r.Route("/api/v1", rest.ApplyRouter(&rest.ContainerArgs{
+		DB:     c.db,
+		MDB:    c.mdb,
+		MQ:     c.mq,
+		Logger: c.logger,
+	}))
 
 	// Logging
 	r.Route("/log", logging.ApplyRouter())
@@ -198,7 +212,7 @@ func gracefulShutdown(srv *http.Server, db *internal.MemoryDB) {
 		defer func() {
 			db.Persist()
 			stop()
-			srv.Shutdown(context.TODO())
+			srv.Shutdown(context.Background())
 		}()
 	}()
 }

server/utils/cookie.go

@@ -1,5 +0,0 @@
-package utils
-
-const (
-	TOKEN_COOKIE_NAME = "jwt-yt-dlp-webui"
-)

server/utils/file.go

@@ -1,21 +0,0 @@
-package utils
-
-import (
-	"io/fs"
-	"regexp"
-	"strings"
-)
-
-var (
-	videoRe = regexp.MustCompile(`(?i)/\.mov|\.mp4|\.webm|\.mvk|/gmi`)
-)
-
-func IsVideo(d fs.DirEntry) bool {
-	return videoRe.MatchString(d.Name())
-}
-
-func IsValidEntry(d fs.DirEntry) bool {
-	return !strings.HasPrefix(d.Name(), ".") &&
-		!strings.HasSuffix(d.Name(), ".part") &&
-		!strings.HasSuffix(d.Name(), ".ytdl")
-}