Compare commits

...

22 Commits

Author SHA1 Message Date
13dd9526e2 Removed unused import 2023-07-31 19:14:50 +02:00
055f71f4f1 custom error boundary 2023-07-31 19:14:50 +02:00
c0a424410e code refactoring 2023-07-31 19:14:50 +02:00
b5731759b0 migrated from redux to recoil 2023-07-31 19:14:50 +02:00
Marco
8327d1e94c Download REST API endpoints (#72)
* backend and frontend hotfixes, see message

Improved rendering on the frontend by cutting unecessary useStates.
Backend side, downloads now auto resume even on application kill.

* download rest api endpoints, general code refactor

* download request json mappings
2023-07-31 08:30:09 +02:00
Marco
68c829c40e 10 playlist download (#71)
* leveraging message queue for playlist entries DL

* playlist support implemented

It's a little bit slow but solid enough :D
2023-07-28 11:44:38 +02:00
d4f656fd87 code refactoring 2023-07-26 16:21:10 +02:00
Alexandro
a4d586a3a0 Added Polish language (#68)
* Update i18n.yaml

Added Russian language

* Update settingsSlice.ts

* Update i18n.yaml

* Update Settings.tsx

* Update i18n.yaml, Added Polish language

* Update settingsSlice.ts, added Polish language

* Update Settings.tsx, added Polish language
2023-07-26 15:55:03 +02:00
e1510d28d2 dropped fiber for std http + gorilla websocket
Session serialization will use gob encoding instead of json.
Binary size will likely be reduced.
General backend code refactoring.
2023-07-26 11:48:54 +02:00
82b22db7ae code refactor 2023-07-26 09:51:00 +02:00
deluxghost
49ded2e0f6 Update chinese (#67) 2023-07-19 07:56:55 +02:00
Alexandro
58f0e67aac Added Ukrainian language (#63)
* Update i18n.yaml

Added Russian language

* Update settingsSlice.ts

* Update i18n.yaml

* Update Settings.tsx
2023-07-08 17:50:06 +02:00
Alexandro
00c6e5aaf2 Update i18n.yaml (#61)
Added Russian language
2023-07-07 07:42:57 +02:00
Marco
3ded768a6f 10 feat download queue (#59)
* testing message queue

* better mq syncronisation

* major code refactoring, concern separation.

* bugfix

* code refactoring

* queuesize configurable via flags

* code refactoring

* comments

* code refactoring, updated readme
2023-06-26 11:27:15 +02:00
dd753c5f26 code refactoring 2023-06-24 15:02:47 +02:00
2c9d4b0a9b bugfix 2023-06-23 17:46:47 +02:00
3067cee08c code refactoring, fixed wrong jwt expire time 2023-06-23 15:18:40 +02:00
7d510fd2d4 code refactoring, deps bump 2023-06-23 14:49:58 +02:00
12300d43c5 copy url to clipboard, code refactoring 2023-06-23 11:58:11 +02:00
53045be65c code refactoring 2023-06-23 11:46:44 +02:00
765b36cc98 code refactoring 2023-06-23 11:41:55 +02:00
e9df173aef removed dead code 2023-06-23 11:02:08 +02:00
80 changed files with 2582 additions and 1595 deletions

10
.vscode/launch.json vendored
View File

@@ -4,13 +4,19 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{
"name": "Launch file",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${file}"
},
{ {
"type": "chrome", "type": "chrome",
"request": "launch", "request": "launch",
"name": "Launch Chrome against localhost", "name": "Launch Chrome against localhost",
"url": "http://localhost:1234", "url": "http://localhost:5173",
"webRoot": "${workspaceFolder}", "webRoot": "${workspaceFolder}",
"breakOnLoad": true,
"sourceMapPathOverrides": { "sourceMapPathOverrides": {
"/__parcel_source_root/*": "${webRoot}/*" "/__parcel_source_root/*": "${webRoot}/*"
} }

View File

@@ -68,6 +68,7 @@ The currently avaible settings are:
- Override the output filename - Override the output filename
- Override the output path - Override the output path
- Pass custom yt-dlp arguments safely - Pass custom yt-dlp arguments safely
- Download queue (limit concurrent downloads)
![](https://i.ibb.co/YdBVcgc/image.png) ![](https://i.ibb.co/YdBVcgc/image.png)
![](https://i.ibb.co/Sf102b1/image.png) ![](https://i.ibb.co/Sf102b1/image.png)
@@ -84,8 +85,9 @@ Future releases will have:
- ~~Multi download~~ *done* - ~~Multi download~~ *done*
- ~~Exctract audio~~ *done* - ~~Exctract audio~~ *done*
- ~~Format selection~~ *done* - ~~Format selection~~ *done*
- Download archive - ~~Download archive~~ *done*
- ~~ARM Build~~ *done available through ghcr.io* - ~~ARM Build~~ *done available through ghcr.io*
- Playlist support
## Troubleshooting ## Troubleshooting
- **It says that it isn't connected/ip in the header is not defined.** - **It says that it isn't connected/ip in the header is not defined.**
@@ -118,6 +120,18 @@ docker run -d \
--secret your_rpc_secret --secret your_rpc_secret
``` ```
If you wish for limiting the download queue size...
e.g. limiting max 2 concurrent download.
```sh
docker run -d \
-p 3033:3033 \
-e JWT_SECRET randomsecret
-v /path/to/downloads:/downloads \
marcobaobao/yt-dlp-webui \
--qs 2
```
## [Prebuilt binaries](https://github.com/marcopeocchi/yt-dlp-web-ui/releases) installation ## [Prebuilt binaries](https://github.com/marcopeocchi/yt-dlp-web-ui/releases) installation
```sh ```sh
@@ -134,6 +148,25 @@ yt-dlp-webui --out /home/user/downloads --driver /opt/soemdir/yt-dlp
yt-dlp-webui --conf /home/user/.config/yt-dlp-webui.conf yt-dlp-webui --conf /home/user/.config/yt-dlp-webui.conf
``` ```
### Arguments
```sh
Usage yt-dlp-webui:
-auth
Enable RPC authentication
-conf string
Config file path
-driver string
yt-dlp executable path (default "yt-dlp")
-out string
Where files will be saved (default ".")
-port int
Port where server will listen at (default 3033)
-qs int
Download queue size (default 8)
-secret string
Secret required for auth
```
### Config file ### Config file
By running `yt-dlp-webui` in standalone mode you have the ability to also specify a config file. By running `yt-dlp-webui` in standalone mode you have the ability to also specify a config file.
The config file **will overwrite what have been passed as cli argument**. The config file **will overwrite what have been passed as cli argument**.
@@ -149,6 +182,7 @@ downloaderPath: /usr/local/bin/yt-dlp
# Optional settings # Optional settings
require_auth: true require_auth: true
rpc_secret: my_random_secret rpc_secret: my_random_secret
queue_size: 4
``` ```
### Systemd integration ### Systemd integration

View File

@@ -1,6 +1,6 @@
{ {
"name": "yt-dlp-webui", "name": "yt-dlp-webui",
"version": "2.0.7", "version": "2.10.0",
"description": "Frontend compontent of yt-dlp-webui", "description": "Frontend compontent of yt-dlp-webui",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
@@ -9,29 +9,27 @@
"author": "marcopeocchi", "author": "marcopeocchi",
"license": "MPL-2.0", "license": "MPL-2.0",
"dependencies": { "dependencies": {
"@emotion/react": "^11.11.0", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0", "@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.11.16", "@mui/icons-material": "^5.11.16",
"@mui/material": "^5.13.2", "@mui/material": "^5.13.5",
"@reduxjs/toolkit": "^1.9.5",
"fp-ts": "^2.16.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-redux": "^8.0.5", "react-router-dom": "^6.13.0",
"react-router-dom": "^6.11.2", "recoil": "^0.7.7",
"rxjs": "^7.8.1", "rxjs": "^7.8.1",
"uuid": "^9.0.0" "uuid": "^9.0.0"
}, },
"devDependencies": { "devDependencies": {
"@modyfi/vite-plugin-yaml": "^1.0.4", "@modyfi/vite-plugin-yaml": "^1.0.4",
"@types/node": "^20.2.4", "@types/node": "^20.3.1",
"@types/react": "^18.2.7", "@types/react": "^18.2.13",
"@types/react-dom": "^18.0.10", "@types/react-dom": "^18.2.6",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"@types/uuid": "^9.0.1", "@types/uuid": "^9.0.2",
"@vitejs/plugin-react": "^4.0.0", "@vitejs/plugin-react": "^4.0.3",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"typescript": "^5.0.4", "typescript": "^5.1.3",
"vite": "^4.3.8" "vite": "^4.4.7"
} }
} }

View File

@@ -1,12 +1,11 @@
import { Provider } from 'react-redux'
import { RouterProvider } from 'react-router-dom' import { RouterProvider } from 'react-router-dom'
import { RecoilRoot } from 'recoil'
import { router } from './router' import { router } from './router'
import { store } from './stores/store'
export function App() { export function App() {
return ( return (
<Provider store={store}> <RecoilRoot>
<RouterProvider router={router} /> <RouterProvider router={router} />
</Provider> </RecoilRoot>
) )
} }

View File

@@ -1,15 +1,11 @@
import { ThemeProvider } from '@emotion/react' import { ThemeProvider } from '@emotion/react'
import ChevronLeft from '@mui/icons-material/ChevronLeft' import ChevronLeft from '@mui/icons-material/ChevronLeft'
import Dashboard from '@mui/icons-material/Dashboard' import Dashboard from '@mui/icons-material/Dashboard'
import DownloadIcon from '@mui/icons-material/Download'
import Menu from '@mui/icons-material/Menu' import Menu from '@mui/icons-material/Menu'
import SettingsIcon from '@mui/icons-material/Settings' import SettingsIcon from '@mui/icons-material/Settings'
import SettingsEthernet from '@mui/icons-material/SettingsEthernet' import SettingsEthernet from '@mui/icons-material/SettingsEthernet'
import Storage from '@mui/icons-material/Storage'
import { Box, createTheme } from '@mui/material' import { Box, createTheme } from '@mui/material'
import DownloadIcon from '@mui/icons-material/Download'
import CssBaseline from '@mui/material/CssBaseline' import CssBaseline from '@mui/material/CssBaseline'
import Divider from '@mui/material/Divider' import Divider from '@mui/material/Divider'
import IconButton from '@mui/material/IconButton' import IconButton from '@mui/material/IconButton'
@@ -19,27 +15,25 @@ import ListItemIcon from '@mui/material/ListItemIcon'
import ListItemText from '@mui/material/ListItemText' import ListItemText from '@mui/material/ListItemText'
import Toolbar from '@mui/material/Toolbar' import Toolbar from '@mui/material/Toolbar'
import Typography from '@mui/material/Typography' import Typography from '@mui/material/Typography'
import { grey } from '@mui/material/colors' import { grey } from '@mui/material/colors'
import { useMemo, useState } from 'react' import { useMemo, useState } from 'react'
import { useSelector } from 'react-redux'
import { Link, Outlet } from 'react-router-dom' import { Link, Outlet } from 'react-router-dom'
import { RootState } from './stores/store' import { useRecoilValue } from 'recoil'
import { settingsState } from './atoms/settings'
import { connectedState } from './atoms/status'
import AppBar from './components/AppBar' import AppBar from './components/AppBar'
import Drawer from './components/Drawer' import Drawer from './components/Drawer'
import FreeSpaceIndicator from './components/FreeSpaceIndicator'
import Logout from './components/Logout' import Logout from './components/Logout'
import { formatGiB } from './utils' import SocketSubscriber from './components/SocketSubscriber'
import ThemeToggler from './components/ThemeToggler' import ThemeToggler from './components/ThemeToggler'
import Toaster from './providers/ToasterProvider'
export default function Layout() { export default function Layout() {
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
const settings = useSelector((state: RootState) => state.settings) const settings = useRecoilValue(settingsState)
const status = useSelector((state: RootState) => state.status) const isConnected = useRecoilValue(connectedState)
const mode = settings.theme const mode = settings.theme
const theme = useMemo(() => const theme = useMemo(() =>
@@ -53,129 +47,121 @@ export default function Layout() {
}), [settings.theme] }), [settings.theme]
) )
const toggleDrawer = () => { const toggleDrawer = () => setOpen(state => !state)
setOpen(state => !state)
}
return ( return (
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<Box sx={{ display: 'flex' }}> <SocketSubscriber>
<CssBaseline /> <Box sx={{ display: 'flex' }}>
<AppBar position="absolute" open={open}> <CssBaseline />
<Toolbar sx={{ pr: '24px' }}> <AppBar position="absolute" open={open}>
<IconButton <Toolbar sx={{ pr: '24px' }}>
edge="start" <IconButton
color="inherit" edge="start"
aria-label="open drawer" color="inherit"
onClick={toggleDrawer} aria-label="open drawer"
onClick={toggleDrawer}
sx={{
marginRight: '36px',
...(open && { display: 'none' }),
}}
>
<Menu />
</IconButton>
<Typography
component="h1"
variant="h6"
color="inherit"
noWrap
sx={{ flexGrow: 1 }}
>
yt-dlp WebUI
</Typography>
<FreeSpaceIndicator />
<div style={{
display: 'flex',
alignItems: 'center',
flexWrap: 'wrap',
}}>
<SettingsEthernet />
<span>
&nbsp;{isConnected ? settings.serverAddr : 'not connected'}
</span>
</div>
</Toolbar>
</AppBar>
<Drawer variant="permanent" open={open}>
<Toolbar
sx={{ sx={{
marginRight: '36px', display: 'flex',
...(open && { display: 'none' }), alignItems: 'center',
justifyContent: 'flex-end',
px: [1],
}} }}
> >
<Menu /> <IconButton onClick={toggleDrawer}>
</IconButton> <ChevronLeft />
<Typography </IconButton>
component="h1" </Toolbar>
variant="h6" <Divider />
color="inherit" <List component="nav">
noWrap <Link to={'/'} style={
sx={{ flexGrow: 1 }} {
> textDecoration: 'none',
yt-dlp WebUI color: mode === 'dark' ? '#ffffff' : '#000000DE'
</Typography> }
{ }>
status.freeSpace ? <ListItemButton>
<div style={{ <ListItemIcon>
display: 'flex', <Dashboard />
alignItems: 'center', </ListItemIcon>
flexWrap: 'wrap', <ListItemText primary="Home" />
}}> </ListItemButton>
<Storage /> </Link>
<span>&nbsp;{formatGiB(status.freeSpace)}&nbsp;</span> <Link to={'/archive'} style={
</div> {
: null textDecoration: 'none',
} color: mode === 'dark' ? '#ffffff' : '#000000DE'
<div style={{ }
display: 'flex', }>
alignItems: 'center', <ListItemButton>
flexWrap: 'wrap', <ListItemIcon>
}}> <DownloadIcon />
<SettingsEthernet /> </ListItemIcon>
<span>&nbsp;{status.connected ? settings.serverAddr : 'not connected'}</span> <ListItemText primary="Archive" />
</div> </ListItemButton>
</Toolbar> </Link>
</AppBar> <Link to={'/settings'} style={
<Drawer variant="permanent" open={open}> {
<Toolbar textDecoration: 'none',
color: mode === 'dark' ? '#ffffff' : '#000000DE'
}
}>
<ListItemButton>
<ListItemIcon>
<SettingsIcon />
</ListItemIcon>
<ListItemText primary="Settings" />
</ListItemButton>
</Link>
<ThemeToggler />
<Logout />
</List>
</Drawer>
<Box
component="main"
sx={{ sx={{
display: 'flex', flexGrow: 1,
alignItems: 'center', height: '100vh',
justifyContent: 'flex-end', overflow: 'auto',
px: [1],
}} }}
> >
<IconButton onClick={toggleDrawer}> <Toolbar />
<ChevronLeft /> <Outlet />
</IconButton> </Box>
</Toolbar>
<Divider />
<List component="nav">
<Link to={'/'} style={
{
textDecoration: 'none',
color: mode === 'dark' ? '#ffffff' : '#000000DE'
}
}>
<ListItemButton disabled={status.downloading}>
<ListItemIcon>
<Dashboard />
</ListItemIcon>
<ListItemText primary="Home" />
</ListItemButton>
</Link>
<Link to={'/archive'} style={
{
textDecoration: 'none',
color: mode === 'dark' ? '#ffffff' : '#000000DE'
}
}>
<ListItemButton disabled={status.downloading}>
<ListItemIcon>
<DownloadIcon />
</ListItemIcon>
<ListItemText primary="Archive" />
</ListItemButton>
</Link>
<Link to={'/settings'} style={
{
textDecoration: 'none',
color: mode === 'dark' ? '#ffffff' : '#000000DE'
}
}>
<ListItemButton disabled={status.downloading}>
<ListItemIcon>
<SettingsIcon />
</ListItemIcon>
<ListItemText primary="Settings" />
</ListItemButton>
</Link>
<ThemeToggler />
<Logout />
</List>
</Drawer>
<Box
component="main"
sx={{
flexGrow: 1,
height: '100vh',
overflow: 'auto',
}}
>
<Toolbar />
<Outlet />
</Box> </Box>
</Box> <Toaster />
</SocketSubscriber>
</ThemeProvider> </ThemeProvider>
) )
} }

View File

@@ -29,6 +29,10 @@ languages:
customArgs: Enable custom yt-dlp args (great power = great responsabilities) customArgs: Enable custom yt-dlp args (great power = great responsabilities)
customArgsInput: Custom yt-dlp arguments customArgsInput: Custom yt-dlp arguments
rpcConnErr: Error while conencting to RPC server rpcConnErr: Error while conencting to RPC server
splashText: No active downloads
archiveTitle: Archive
clipboardAction: Copied URL to clipboard
playlistCheckbox: Download playlist (it will take time, after submitting you may close this window)
italian: italian:
urlInput: URL di YouTube o di qualsiasi altro servizio supportato urlInput: URL di YouTube o di qualsiasi altro servizio supportato
statusTitle: Stato statusTitle: Stato
@@ -57,11 +61,16 @@ languages:
customArgs: Enable custom yt-dlp args (great power = great responsabilities) customArgs: Enable custom yt-dlp args (great power = great responsabilities)
customArgsInput: Custom yt-dlp arguments customArgsInput: Custom yt-dlp arguments
rpcConnErr: Error nella connessione al server RPC rpcConnErr: Error nella connessione al server RPC
splashText: Nessun download attivo
archiveTitle: Archivio
clipboardAction: URL copiato negli appunti
playlistCheckbox: Download playlist (richiederà tempo, puoi chiudere la finestra dopo l'inoltro)
chinese: chinese:
urlInput: YouTube 或其他受支持服务的视频网址 urlInput: YouTube 或其他受支持服务的视频网址
statusTitle: 状态 statusTitle: 状态
startButton: 开始
statusReady: 就绪 statusReady: 就绪
selectFormatButton: 选择格式
startButton: 开始
abortAllButton: 全部中止 abortAllButton: 全部中止
updateBinButton: 更新 yt-dlp 可执行文件 updateBinButton: 更新 yt-dlp 可执行文件
darkThemeButton: 黑暗主题 darkThemeButton: 黑暗主题
@@ -84,7 +93,11 @@ languages:
customPath: 自定义路径 customPath: 自定义路径
customArgs: 启用自定义 yt-dlp 参数(能力越大 = 责任越大) customArgs: 启用自定义 yt-dlp 参数(能力越大 = 责任越大)
customArgsInput: 自定义 yt-dlp 参数 customArgsInput: 自定义 yt-dlp 参数
rpcConnErr: Error while conencting to RPC server rpcConnErr: 连接 RPC 服务器发生错误
splashText: 没有正在进行的下载
archiveTitle: 归档
clipboardAction: 复制 URL 到剪贴板
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
spanish: spanish:
urlInput: URL de YouTube u otro servicio compatible urlInput: URL de YouTube u otro servicio compatible
statusTitle: Estado statusTitle: Estado
@@ -113,34 +126,42 @@ languages:
customArgs: Habilitar los argumentos yt-dlp personalizados (un gran poder conlleva una gran responsabilidad) customArgs: Habilitar los argumentos yt-dlp personalizados (un gran poder conlleva una gran responsabilidad)
customArgsInput: Argumentos yt-dlp personalizados customArgsInput: Argumentos yt-dlp personalizados
rpcConnErr: Error al conectarse al servidor RPC rpcConnErr: Error al conectarse al servidor RPC
splashText: No active downloads
archiveTitle: Archive
clipboardAction: Copied URL to clipboard
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
russian: russian:
urlInput: YouTube or other supported service video url urlInput: URL-адрес YouTube или любого другого поддерживаемого сервиса
statusTitle: Status statusTitle: Статус
startButton: Start startButton: Начать
statusReady: Ready statusReady: Готово
abortAllButton: Abort All abortAllButton: Прервать все
updateBinButton: Update yt-dlp binary updateBinButton: Обновить бинарный файл yt-dlp
darkThemeButton: Dark theme darkThemeButton: Темная тема
lightThemeButton: Light theme lightThemeButton: Светлая тема
settingsAnchor: Settings settingsAnchor: Настройки
serverAddressTitle: Server address serverAddressTitle: Адрес сервера
serverPortTitle: Port serverPortTitle: Порт
extractAudioCheckbox: Extract audio extractAudioCheckbox: Извлечь аудио
noMTimeCheckbox: Don't set file modification time noMTimeCheckbox: Не устанавливать время модификации файла
bgReminder: Once you close this page the download will continue in the background. bgReminder: Как только вы закроете эту страницу, загрузка продолжится в фоновом режиме.
toastConnected: 'Connected to ' toastConnected: 'Подключен к '
toastUpdated: Updated yt-dlp binary! toastUpdated: Бинарный файл yt-dlp обновлен!
formatSelectionEnabler: Enable video/audio formats selection formatSelectionEnabler: Активировать выбор видео/аудио форматов
themeSelect: 'Theme' themeSelect: 'Тема'
languageSelect: 'Language' languageSelect: 'Язык'
overridesAnchor: Overrides overridesAnchor: Переопределить
pathOverrideOption: Enable output path overriding pathOverrideOption: Активировать переопределение выходного пути
filenameOverrideOption: Enable output file name overriding filenameOverrideOption: Активировать переопределение имени выходного файла
customFilename: Custom filemame (leave blank to use default) customFilename: Задать имя файла (оставьте пустым, чтобы использовать значение по умолчанию)
customPath: Custom path customPath: Задать путь
customArgs: Enable custom yt-dlp args (great power = great responsabilities) customArgs: Включить настраиваемые аргументы yt-dlp (большая сила = большая ответственность)
customArgsInput: Custom yt-dlp arguments customArgsInput: Пользовательские аргументы yt-dlp
rpcConnErr: Error while conencting to RPC server rpcConnErr: Ошибка при подключении к серверу RPC
splashText: Нет активных загрузок
archiveTitle: Архив
clipboardAction: URL скопирован в буфер обмена
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
korean: korean:
urlInput: YouTube나 다른 지원되는 사이트의 URL urlInput: YouTube나 다른 지원되는 사이트의 URL
statusTitle: 상태 statusTitle: 상태
@@ -169,6 +190,10 @@ languages:
customArgs: Enable custom yt-dlp args (great power = great responsabilities) customArgs: Enable custom yt-dlp args (great power = great responsabilities)
customArgsInput: Custom yt-dlp arguments customArgsInput: Custom yt-dlp arguments
rpcConnErr: Error while conencting to RPC server rpcConnErr: Error while conencting to RPC server
splashText: No active downloads
archiveTitle: Archive
clipboardAction: Copied URL to clipboard
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
japanese: japanese:
urlInput: YouTubeまたはサポート済み動画のURL urlInput: YouTubeまたはサポート済み動画のURL
statusTitle: 状態 statusTitle: 状態
@@ -198,6 +223,10 @@ languages:
customArgs: yt-dlpのオプションの有効化 (最適設定にする場合) customArgs: yt-dlpのオプションの有効化 (最適設定にする場合)
customArgsInput: yt-dlpのオプション customArgsInput: yt-dlpのオプション
rpcConnErr: Error while conencting to RPC server rpcConnErr: Error while conencting to RPC server
splashText: No active downloads
archiveTitle: Archive
clipboardAction: Copied URL to clipboard
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
catalan: catalan:
urlInput: URL de YouTube o d'un altre servei compatible urlInput: URL de YouTube o d'un altre servei compatible
statusTitle: Estat statusTitle: Estat
@@ -226,3 +255,71 @@ languages:
customArgs: Habilitar els arguments yt-dlp personalitzats (un gran poder comporta una gran responsabilitat) customArgs: Habilitar els arguments yt-dlp personalitzats (un gran poder comporta una gran responsabilitat)
customArgsInput: Arguments yt-dlp personalitzats customArgsInput: Arguments yt-dlp personalitzats
rpcConnErr: Error en connectar-se al servidor RPC rpcConnErr: Error en connectar-se al servidor RPC
splashText: No active downloads
archiveTitle: Archive
clipboardAction: Copied URL to clipboard
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
ukrainian:
urlInput: URL-адреса YouTube або будь-якого іншого підтримуваного сервісу
statusTitle: Статус
startButton: Почати
statusReady: Готово
abortAllButton: Перервати все
updateBinButton: Оновити бінарний файл yt-dlp
darkThemeButton: Темна тема
lightThemeButton: Світла тема
settingsAnchor: Налаштування
serverAddressTitle: Адреса сервера
serverPortTitle: Порт
extractAudioCheckbox: Витягти аудіо
noMTimeCheckbox: Не встановлювати час модифікації файлу
bgReminder: Як тільки ви закриєте цю сторінку, завантаження продовжиться у фоновому режимі.
toastConnected: 'Підключений до '
toastUpdated: Бінарний файл yt-dlp оновлено!
formatSelectionEnabler: Активувати вибір відео/аудіо форматів
themeSelect: 'Тема'
languageSelect: 'Мова'
overridesAnchor: Перевизначити
pathOverrideOption: Активувати перевизначення вихідного шляху
filenameOverrideOption: Активувати перевизначення імені вихідного файлу
customFilename: Введіть ім'я файлу (залишіть порожнім, щоб використовувати значення за замовчуванням)
customPath: Задати шлях
customArgs: Включити аргументи, що настроюються yt-dlp (велика сила = велика відповідальність)
customArgsInput: Користувальницькі аргументи yt-dlp
rpcConnErr: Помилка при підключенні до сервера RPC
splashText: Немає активних завантажень
archiveTitle: Архів
clipboardAction: URL скопійовано в буфер обміну
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
polish:
urlInput: Adres URL YouTube lub innej obsługiwanej usługi
statusTitle: Status
startButton: Początek
statusReady: Gotowy
abortAllButton: Anuluj wszystko
updateBinButton: Zaktualizuj plik binarny yt-dlp
darkThemeButton: Ciemny motyw
lightThemeButton: Światło motyw
settingsAnchor: Ustawienia
serverAddressTitle: Adres serwera
serverPortTitle: Port
extractAudioCheckbox: Wyodrębnij dźwięk
noMTimeCheckbox: Nie ustawiaj czasu modyfikacji pliku
bgReminder: Po zamknięciu tej strony pobieranie będzie kontynuowane w tle.
toastConnected: 'Połączony z '
toastUpdated: Zaktualizowano plik binarny yt-dlp!
formatSelectionEnabler: Aktywuj wybór formatów wideo/audio
themeSelect: 'Motyw'
languageSelect: 'Język'
overridesAnchor: Przedefiniuj
pathOverrideOption: Aktywuj zastąpienie ścieżki źródłowej
filenameOverrideOption: Aktywuj zastępowanie nazwy pliku źródłowego
customFilename: Wprowadź nazwę pliku (pozostaw puste, aby użyć nazwy domyślnej)
customPath: Ustaw ścieżkę
customArgs: Uwzględnij konfigurowalne argumenty yt-dlp (wielka moc = wielka odpowiedzialność)
customArgsInput: Niestandardowe argumenty yt-dlp
rpcConnErr: Wystąpił błąd podczas łączenia z serwerem RPC
splashText: Brak aktywnych pobrań
archiveTitle: Archiwum
clipboardAction: Adres URL zostanie skopiowany do schowka
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)

View File

@@ -0,0 +1,9 @@
import { atom } from 'recoil'
export const downloadTemplateState = atom({
key: 'downloadTemplateState',
default: localStorage.getItem('lastDownloadTemplate') ?? '',
effects: [
({ onSet }) => onSet(e => localStorage.setItem('lastDownloadTemplate', e))
]
})

View File

@@ -0,0 +1,7 @@
import { atom } from 'recoil'
import { RPCResult } from '../types'
export const activeDownloadsState = atom<RPCResult[] | undefined>({
key: 'activeDownloadsState',
default: undefined
})

View File

@@ -0,0 +1,7 @@
import { atom } from 'recoil'
import { DLMetadata } from '../types'
export const selectedFormatState = atom<Partial<DLMetadata>>({
key: 'selectedFormatState',
default: {},
})

View File

@@ -0,0 +1,9 @@
import { selector } from 'recoil'
import I18nBuilder from '../lib/intl'
import { languageState } from './settings'
export const i18nBuilderState = selector({
key: 'i18nBuilderState',
get: ({ get }) => new I18nBuilder(get(languageState)),
dangerouslyAllowMutability: true,
})

12
frontend/src/atoms/rpc.ts Normal file
View File

@@ -0,0 +1,12 @@
import { selector } from 'recoil'
import { RPCClient } from '../lib/rpcClient'
import { rpcHTTPEndpoint, rpcWebSocketEndpoint } from './settings'
export const rpcClientState = selector({
key: 'rpcClientState',
get: ({ get }) =>
new RPCClient(get(rpcHTTPEndpoint), get(rpcWebSocketEndpoint)),
set: ({ get }) =>
new RPCClient(get(rpcHTTPEndpoint), get(rpcWebSocketEndpoint)),
dangerouslyAllowMutability: true,
})

View File

@@ -0,0 +1,175 @@
import { atom, selector } from 'recoil'
export type Language =
| 'english'
| 'chinese'
| 'russian'
| 'italian'
| 'spanish'
| 'korean'
| 'japanese'
| 'catalan'
| 'ukrainian'
| 'polish'
export const languages = [
'english',
'chinese',
'russian',
'italian',
'spanish',
'korean',
'japanese',
'catalan',
'ukrainian',
'polish',
] as const
export type Theme = 'light' | 'dark'
export interface SettingsState {
serverAddr: string
serverPort: number
language: Language
theme: Theme
cliArgs: string
formatSelection: boolean
fileRenaming: boolean
pathOverriding: boolean
enableCustomArgs: boolean
listView: boolean
}
export const languageState = atom<Language>({
key: 'languageState',
default: localStorage.getItem('language') as Language || 'english',
effects: [
({ onSet }) =>
onSet(l => localStorage.setItem('language', l.toString()))
]
})
export const themeState = atom<Theme>({
key: 'themeStateState',
default: localStorage.getItem('theme') as Theme || 'light',
effects: [
({ onSet }) =>
onSet(l => localStorage.setItem('theme', l.toString()))
]
})
export const serverAddressState = atom<string>({
key: 'serverAddressState',
default: localStorage.getItem('server-addr') || window.location.hostname,
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('server-addr', a.toString()))
]
})
export const serverPortState = atom<number>({
key: 'serverPortState',
default: Number(localStorage.getItem('server-port')) ||
Number(window.location.port),
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('server-port', a.toString()))
]
})
export const latestCliArgumentsState = atom<string>({
key: 'latestCliArgumentsState',
default: localStorage.getItem('cli-args') || '',
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('cli-args', a.toString()))
]
})
export const formatSelectionState = atom({
key: 'formatSelectionState',
default: localStorage.getItem('format-selection') === "true",
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('format-selection', a.toString()))
]
})
export const fileRenamingState = atom({
key: 'fileRenamingState',
default: localStorage.getItem('file-renaming') === "true",
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('file-renaming', a.toString()))
]
})
export const pathOverridingState = atom({
key: 'pathOverridingState',
default: localStorage.getItem('path-overriding') === "true",
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('path-overriding', a.toString()))
]
})
export const enableCustomArgsState = atom({
key: 'enableCustomArgsState',
default: localStorage.getItem('enable-custom-args') === "true",
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('enable-custom-args', a.toString()))
]
})
export const listViewState = atom({
key: 'listViewState',
default: localStorage.getItem('listview') === "true",
effects: [
({ onSet }) =>
onSet(a => localStorage.setItem('listview', a.toString()))
]
})
export const serverAddressAndPortState = selector({
key: 'serverAddressAndPortState',
get: ({ get }) => `${get(serverAddressState)}:${get(serverPortState)}`
})
export const serverURL = selector({
key: 'serverURL',
get: ({ get }) =>
`${window.location.protocol}//${get(serverAddressState)}:${get(serverPortState)}`
})
export const rpcWebSocketEndpoint = selector({
key: 'rpcWebSocketEndpoint',
get: ({ get }) => {
const proto = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
return `${proto}//${get(serverAddressAndPortState)}/rpc/ws`
}
})
export const rpcHTTPEndpoint = selector({
key: 'rpcHTTPEndpoint',
get: ({ get }) => {
const proto = window.location.protocol
return `${proto}//${get(serverAddressAndPortState)}/rpc/http`
}
})
export const settingsState = selector<SettingsState>({
key: 'settingsState',
get: ({ get }) => ({
serverAddr: get(serverAddressState),
serverPort: get(serverPortState),
language: get(languageState),
theme: get(themeState),
cliArgs: get(latestCliArgumentsState),
formatSelection: get(formatSelectionState),
fileRenaming: get(fileRenamingState),
pathOverriding: get(pathOverridingState),
enableCustomArgs: get(enableCustomArgsState),
listView: get(listViewState),
})
})

View File

@@ -0,0 +1,40 @@
import { atom, selector } from 'recoil'
import { rpcClientState } from './rpc'
type StatusState = {
connected: boolean,
updated: boolean,
downloading: boolean,
}
export const connectedState = atom({
key: 'connectedState',
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 }) => {
// const res = await get(rpcClientState).freeSpace()
// return res.result
// }
// })
export const availableDownloadPathsState = selector({
key: 'availableDownloadPathsState',
get: async ({ get }) => {
const res = await get(rpcClientState).directoryTree()
return res.result
}
})

View File

@@ -0,0 +1,15 @@
import { AlertColor } from '@mui/material'
import { atom } from 'recoil'
type Toast = {
open: boolean,
message: string
autoClose: boolean
createdAt: number,
severity?: AlertColor
}
export const toastListState = atom<Toast[]>({
key: 'toastListState',
default: [],
})

6
frontend/src/atoms/ui.ts Normal file
View File

@@ -0,0 +1,6 @@
import { atom } from 'recoil'
export const loadingAtom = atom({
key: 'loadingAtom',
default: false
})

View File

@@ -1,37 +0,0 @@
import {
Card,
CardActionArea,
CardContent,
CardMedia,
Skeleton,
Typography
} from '@mui/material'
import { ellipsis } from '../utils'
type Props = {
title: string,
thumbnail: string,
url: string,
}
export function ArchiveResult({ title, thumbnail, url }: Props) {
return (
<Card>
<CardActionArea onClick={() => window.open(url)}>
{thumbnail ?
<CardMedia
component="img"
height={180}
image={thumbnail}
/> :
<Skeleton variant="rectangular" height={180} />
}
<CardContent>
<Typography gutterBottom variant="body2" component="div">
{ellipsis(title, 72)}
</Typography>
</CardContent>
</CardActionArea>
</Card>
)
}

View File

@@ -1,9 +1,12 @@
import { FileUpload } from '@mui/icons-material' import { FileUpload } from '@mui/icons-material'
import CloseIcon from '@mui/icons-material/Close' import CloseIcon from '@mui/icons-material/Close'
import { import {
Backdrop,
Button, Button,
Checkbox,
Container, Container,
FormControl, FormControl,
FormControlLabel,
Grid, Grid,
IconButton, IconButton,
InputAdornment, InputAdornment,
@@ -11,23 +14,30 @@ import {
MenuItem, MenuItem,
Paper, Paper,
Select, Select,
styled, TextField,
TextField styled
} from '@mui/material' } from '@mui/material'
import AppBar from '@mui/material/AppBar' import AppBar from '@mui/material/AppBar'
import Dialog from '@mui/material/Dialog' import Dialog from '@mui/material/Dialog'
import Slide from '@mui/material/Slide' import Slide from '@mui/material/Slide'
import Toolbar from '@mui/material/Toolbar' import Toolbar from '@mui/material/Toolbar'
import { TransitionProps } from '@mui/material/transitions'
import Typography from '@mui/material/Typography' import Typography from '@mui/material/Typography'
import { TransitionProps } from '@mui/material/transitions'
import { Buffer } from 'buffer' import { Buffer } from 'buffer'
import { forwardRef, useEffect, useMemo, useRef, useState } from 'react' import {
import { useDispatch, useSelector } from 'react-redux' forwardRef,
useMemo,
useRef,
useState,
useTransition
} from 'react'
import { useRecoilValue } from 'recoil'
import { settingsState } from '../atoms/settings'
import { availableDownloadPathsState, connectedState } from '../atoms/status'
import FormatsGrid from '../components/FormatsGrid' import FormatsGrid from '../components/FormatsGrid'
import { useI18n } from '../hooks/useI18n'
import { useRPC } from '../hooks/useRPC'
import { CliArguments } from '../lib/argsParser' import { CliArguments } from '../lib/argsParser'
import I18nBuilder from '../lib/intl'
import { RPCClient } from '../lib/rpcClient'
import { RootState } from '../stores/store'
import type { DLMetadata } from '../types' import type { DLMetadata } from '../types'
import { isValidURL, toFormatArgs } from '../utils' import { isValidURL, toFormatArgs } from '../utils'
@@ -43,13 +53,18 @@ const Transition = forwardRef(function Transition(
type Props = { type Props = {
open: boolean open: boolean
onClose: () => void onClose: () => void
onDownloadStart: () => void
} }
export default function DownloadDialog({ open, onClose }: Props) { export default function DownloadDialog({
// redux state open,
const settings = useSelector((state: RootState) => state.settings) onClose,
const status = useSelector((state: RootState) => state.status) onDownloadStart
const dispatch = useDispatch() }: Props) {
// recoil state
const settings = useRecoilValue(settingsState)
const isConnected = useRecoilValue(connectedState)
const availableDownloadPaths = useRecoilValue(availableDownloadPathsState)
// ephemeral state // ephemeral state
const [downloadFormats, setDownloadFormats] = useState<DLMetadata>() const [downloadFormats, setDownloadFormats] = useState<DLMetadata>()
@@ -59,38 +74,33 @@ export default function DownloadDialog({ open, onClose }: Props) {
const [customArgs, setCustomArgs] = useState('') const [customArgs, setCustomArgs] = useState('')
const [downloadPath, setDownloadPath] = useState(0) const [downloadPath, setDownloadPath] = useState(0)
const [availableDownloadPaths, setAvailableDownloadPaths] = useState<string[]>([])
const [fileNameOverride, setFilenameOverride] = useState('') const [fileNameOverride, setFilenameOverride] = useState('')
const [url, setUrl] = useState('') const [url, setUrl] = useState('')
const [workingUrl, setWorkingUrl] = useState('') const [workingUrl, setWorkingUrl] = useState('')
const [isPlaylist, setIsPlaylist] = useState(false)
// memos // memos
const i18n = useMemo(() => new I18nBuilder(settings.language), [settings.language]) const cliArgs = useMemo(() =>
const client = useMemo(() => new RPCClient(), [settings.serverAddr, settings.serverPort]) new CliArguments().fromString(settings.cliArgs), [settings.cliArgs]
const cliArgs = useMemo(() => new CliArguments().fromString(settings.cliArgs), [settings.cliArgs]) )
// context
const { i18n } = useI18n()
const { client } = useRPC()
// refs // refs
const urlInputRef = useRef<HTMLInputElement>(null) const urlInputRef = useRef<HTMLInputElement>(null)
const customFilenameInputRef = useRef<HTMLInputElement>(null) const customFilenameInputRef = useRef<HTMLInputElement>(null)
// effects // transitions
useEffect(() => { const [isPending, startTransition] = useTransition()
client.directoryTree()
.then(data => {
setAvailableDownloadPaths(data.result)
})
}, [])
useEffect(() => {
setCustomArgs(localStorage.getItem('last-input-args') ?? '')
setFilenameOverride(localStorage.getItem('last-filename-override') ?? '')
}, [])
/** /**
* Retrive url from input, cli-arguments from checkboxes and emits via WebSocket * Retrive url from input, cli-arguments from checkboxes and emits via WebSocket
*/ */
const sendUrl = (immediate?: string) => { const sendUrl = (immediate?: string) => {
const codes = new Array<string>() const codes = new Array<string>()
if (pickedVideoFormat !== '') codes.push(pickedVideoFormat) if (pickedVideoFormat !== '') codes.push(pickedVideoFormat)
@@ -101,7 +111,8 @@ export default function DownloadDialog({ open, onClose }: Props) {
immediate || url || workingUrl, immediate || url || workingUrl,
`${cliArgs.toString()} ${toFormatArgs(codes)} ${customArgs}`, `${cliArgs.toString()} ${toFormatArgs(codes)} ${customArgs}`,
availableDownloadPaths[downloadPath] ?? '', availableDownloadPaths[downloadPath] ?? '',
fileNameOverride fileNameOverride,
isPlaylist,
) )
setUrl('') setUrl('')
@@ -110,7 +121,7 @@ export default function DownloadDialog({ open, onClose }: Props) {
setTimeout(() => { setTimeout(() => {
resetInput() resetInput()
setDownloadFormats(undefined) setDownloadFormats(undefined)
onClose() onDownloadStart()
}, 250) }, 250)
} }
@@ -193,6 +204,10 @@ export default function DownloadDialog({ open, onClose }: Props) {
onClose={onClose} onClose={onClose}
TransitionComponent={Transition} TransitionComponent={Transition}
> >
<Backdrop
sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }}
open={isPending}
/>
<AppBar sx={{ position: 'relative' }}> <AppBar sx={{ position: 'relative' }}>
<Toolbar> <Toolbar>
<IconButton <IconButton
@@ -208,7 +223,7 @@ export default function DownloadDialog({ open, onClose }: Props) {
</Typography> </Typography>
</Toolbar> </Toolbar>
</AppBar> </AppBar>
<Container sx={{ mt: 4 }}> <Container sx={{ my: 4 }}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Paper <Paper
@@ -225,13 +240,25 @@ export default function DownloadDialog({ open, onClose }: Props) {
label={i18n.t('urlInput')} label={i18n.t('urlInput')}
variant="outlined" variant="outlined"
onChange={handleUrlChange} onChange={handleUrlChange}
disabled={!status.connected || (settings.formatSelection && downloadFormats != null)} disabled={
!isConnected
|| (settings.formatSelection && downloadFormats != null)
}
InputProps={{ InputProps={{
endAdornment: ( endAdornment: (
<InputAdornment position="end"> <InputAdornment position="end">
<label htmlFor="icon-button-file"> <label htmlFor="icon-button-file">
<Input id="icon-button-file" type="file" accept=".txt" onChange={parseUrlListFile} /> <Input
<IconButton color="primary" aria-label="upload file" component="span"> id="icon-button-file"
type="file"
accept=".txt"
onChange={parseUrlListFile}
/>
<IconButton
color="primary"
aria-label="upload file"
component="span"
>
<FileUpload /> <FileUpload />
</IconButton> </IconButton>
</label> </label>
@@ -250,7 +277,10 @@ export default function DownloadDialog({ open, onClose }: Props) {
variant="outlined" variant="outlined"
onChange={handleCustomArgsChange} onChange={handleCustomArgsChange}
value={customArgs} value={customArgs}
disabled={!status.connected || (settings.formatSelection && downloadFormats != null)} disabled={
!isConnected ||
(settings.formatSelection && downloadFormats != null)
}
/> />
</Grid> </Grid>
} }
@@ -264,7 +294,10 @@ export default function DownloadDialog({ open, onClose }: Props) {
variant="outlined" variant="outlined"
value={fileNameOverride} value={fileNameOverride}
onChange={handleFilenameOverrideChange} onChange={handleFilenameOverrideChange}
disabled={!status.connected || (settings.formatSelection && downloadFormats != null)} disabled={
!isConnected ||
(settings.formatSelection && downloadFormats != null)
}
/> />
</Grid> </Grid>
} }
@@ -288,16 +321,30 @@ export default function DownloadDialog({ open, onClose }: Props) {
</Grid> </Grid>
} }
</Grid> </Grid>
<Grid container spacing={1} pt={2}> <Grid container spacing={1} pt={2} justifyContent="space-between">
<Grid item> <Grid item>
<Button <Button
variant="contained" variant="contained"
disabled={url === ''} disabled={url === ''}
onClick={() => settings.formatSelection ? sendUrlFormatSelection() : sendUrl()} onClick={() => settings.formatSelection
? startTransition(() => sendUrlFormatSelection())
: sendUrl()
}
> >
{settings.formatSelection ? i18n.t('selectFormatButton') : i18n.t('startButton')} {
settings.formatSelection
? i18n.t('selectFormatButton')
: i18n.t('startButton')
}
</Button> </Button>
</Grid> </Grid>
<Grid item>
<FormControlLabel
control={<Checkbox onChange={() => setIsPlaylist(state => !state)} />}
checked={isPlaylist}
label={i18n.t('playlistCheckbox')}
/>
</Grid>
</Grid> </Grid>
</Paper> </Paper>
</Grid> </Grid>

View File

@@ -0,0 +1,32 @@
import { useEffect } from 'react'
import { useRecoilState, useRecoilValue } from 'recoil'
import { activeDownloadsState } from '../atoms/downloads'
import { listViewState } from '../atoms/settings'
import { loadingAtom } from '../atoms/ui'
import DownloadsCardView from './DownloadsCardView'
import DownloadsListView from './DownloadsListView'
const Downloads: React.FC = () => {
const listView = useRecoilValue(listViewState)
const active = useRecoilValue(activeDownloadsState)
const [, setIsLoading] = useRecoilState(loadingAtom)
useEffect(() => {
if (active) {
setIsLoading(true)
}
}, [active?.length])
if (listView) {
return (
<DownloadsListView />
)
}
return (
<DownloadsCardView />
)
}
export default Downloads

View File

@@ -1,15 +1,21 @@
import { Grid } from "@mui/material" import { Grid } from "@mui/material"
import { Fragment } from "react" import { Fragment } from "react"
import { useRecoilValue } from 'recoil'
import type { RPCResult } from "../types" import { activeDownloadsState } from '../atoms/downloads'
import { useToast } from "../hooks/toast"
import { useI18n } from '../hooks/useI18n'
import { useRPC } from '../hooks/useRPC'
import { StackableResult } from "./StackableResult" import { StackableResult } from "./StackableResult"
type Props = { const DownloadsCardView: React.FC = () => {
downloads: RPCResult[] const downloads = useRecoilValue(activeDownloadsState) ?? []
abortFunction: (id: string) => void
} const { i18n } = useI18n()
const { client } = useRPC()
const { pushMessage } = useToast()
const abort = (id: string) => client.kill(id)
export function DownloadsCardView({ downloads, abortFunction }: Props) {
return ( return (
<Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}> <Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
{ {
@@ -17,13 +23,16 @@ export function DownloadsCardView({ downloads, abortFunction }: Props) {
<Grid item xs={4} sm={8} md={6} key={download.id}> <Grid item xs={4} sm={8} md={6} key={download.id}>
<Fragment> <Fragment>
<StackableResult <StackableResult
url={download.info.url}
title={download.info.title} title={download.info.title}
thumbnail={download.info.thumbnail} thumbnail={download.info.thumbnail}
percentage={download.progress.percentage} percentage={download.progress.percentage}
stopCallback={() => abortFunction(download.id)} onStop={() => abort(download.id)}
onCopy={() => pushMessage(i18n.t('clipboardAction'))}
resolution={download.info.resolution ?? ''} resolution={download.info.resolution ?? ''}
speed={download.progress.speed} speed={download.progress.speed}
size={download.info.filesize_approx ?? 0} size={download.info.filesize_approx ?? 0}
status={download.progress.process_status}
/> />
</Fragment> </Fragment>
</Grid> </Grid>
@@ -31,4 +40,6 @@ export function DownloadsCardView({ downloads, abortFunction }: Props) {
} }
</Grid> </Grid>
) )
} }
export default DownloadsCardView

View File

@@ -11,21 +11,25 @@ import {
TableRow, TableRow,
Typography Typography
} from "@mui/material" } from "@mui/material"
import { useRecoilValue } from 'recoil'
import { activeDownloadsState } from '../atoms/downloads'
import { useRPC } from '../hooks/useRPC'
import { ellipsis, formatSpeedMiB, roundMiB } from "../utils" import { ellipsis, formatSpeedMiB, roundMiB } from "../utils"
import type { RPCResult } from "../types"
type Props = {
downloads: RPCResult[]
abortFunction: Function
}
export function DownloadsListView({ downloads, abortFunction }: Props) { const DownloadsListView: React.FC = () => {
const downloads = useRecoilValue(activeDownloadsState) ?? []
const { client } = useRPC()
const abort = (id: string) => client.kill(id)
return ( return (
<Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}> <Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
<Grid item xs={12}> <Grid item xs={12}>
<TableContainer component={Paper} sx={{ minHeight: '80vh' }} elevation={2}> <TableContainer component={Paper} sx={{ minHeight: '100%' }} elevation={2}>
<Table> <Table>
<TableHead> <TableHead hidden={downloads.length === 0}>
<TableRow> <TableRow>
<TableCell> <TableCell>
<Typography fontWeight={500} fontSize={15}>Title</Typography> <Typography fontWeight={500} fontSize={15}>Title</Typography>
@@ -52,10 +56,15 @@ export function DownloadsListView({ downloads, abortFunction }: Props) {
<TableCell> <TableCell>
<LinearProgress <LinearProgress
value={ value={
download.progress.percentage === '-1' ? 100 : download.progress.percentage === '-1'
Number(download.progress.percentage.replace('%', '')) ? 100
: Number(download.progress.percentage.replace('%', ''))
}
variant={
download.progress.process_status === 0
? 'indeterminate'
: 'determinate'
} }
variant="determinate"
color={download.progress.percentage === '-1' ? 'success' : 'primary'} color={download.progress.percentage === '-1' ? 'success' : 'primary'}
/> />
</TableCell> </TableCell>
@@ -65,7 +74,7 @@ export function DownloadsListView({ downloads, abortFunction }: Props) {
<Button <Button
variant="contained" variant="contained"
size="small" size="small"
onClick={() => abortFunction(download.id)} onClick={() => abort(download.id)}
> >
{download.progress.percentage === '-1' ? 'Remove' : 'Stop'} {download.progress.percentage === '-1' ? 'Remove' : 'Stop'}
</Button> </Button>
@@ -79,4 +88,6 @@ export function DownloadsListView({ downloads, abortFunction }: Props) {
</Grid> </Grid>
</Grid> </Grid>
) )
} }
export default DownloadsListView

View File

@@ -0,0 +1,45 @@
import ErrorIcon from '@mui/icons-material/Error'
import { Button, Container, SvgIcon, Typography, styled } from '@mui/material'
import { Link } from 'react-router-dom'
const FlexContainer = styled(Container)({
display: 'flex',
minWidth: '100%',
minHeight: '80vh',
alignItems: 'center',
justifyContent: 'center',
flexDirection: 'column'
})
const Title = styled(Typography)({
display: 'flex',
width: '100%',
alignItems: 'center',
justifyContent: 'center',
paddingBottom: '0.5rem'
})
const ErrorBoundary: React.FC = () => {
return (
<FlexContainer>
<Title fontWeight={'500'} fontSize={72} color={'gray'}>
<SvgIcon sx={{ fontSize: '200px' }}>
<ErrorIcon />
</SvgIcon>
</Title>
<Title fontWeight={'500'} fontSize={36} color={'gray'}>
An error occurred :\
</Title>
<Title fontWeight={'400'} fontSize={28} color={'gray'}>
Check your settings!
</Title>
<Link to={'/settings'} >
<Button variant='contained' sx={{ mt: 2 }}>
Goto Settings
</Button>
</Link>
</FlexContainer>
)
}
export default ErrorBoundary

View File

@@ -0,0 +1,29 @@
import StorageIcon from '@mui/icons-material/Storage'
import { useEffect, useState } from 'react'
import { formatGiB } from '../utils'
import { useRPC } from '../hooks/useRPC'
const FreeSpaceIndicator = () => {
const [freeSpace, setFreeSpace] = useState(0)
const { client } = useRPC()
useEffect(() => {
client.freeSpace().then(r => setFreeSpace(r.result))
}, [client])
return (
<div style={{
display: 'flex',
alignItems: 'center',
flexWrap: 'wrap',
}}>
<StorageIcon />
<span>
&nbsp;{formatGiB(freeSpace)}&nbsp;
</span>
</div>
)
}
export default FreeSpaceIndicator

View File

@@ -0,0 +1,31 @@
import { useState } from 'react'
import { useRecoilState } from 'recoil'
import { loadingAtom } from '../atoms/ui'
import DownloadDialog from './DownloadDialog'
import HomeSpeedDial from './HomeSpeedDial'
const HomeActions: React.FC = () => {
const [, setIsLoading] = useRecoilState(loadingAtom)
const [openDialog, setOpenDialog] = useState(false)
return (
<>
<HomeSpeedDial
onOpen={() => setOpenDialog(true)}
/>
<DownloadDialog
open={openDialog}
onClose={() => {
setOpenDialog(false)
setIsLoading(true)
}}
onDownloadStart={() => {
setOpenDialog(false)
setIsLoading(true)
}}
/>
</>
)
}
export default HomeActions

View File

@@ -0,0 +1,51 @@
import AddCircleIcon from '@mui/icons-material/AddCircle'
import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
import FormatListBulleted from '@mui/icons-material/FormatListBulleted'
import {
SpeedDial,
SpeedDialAction,
SpeedDialIcon
} from '@mui/material'
import { useRecoilState } from 'recoil'
import { listViewState } from '../atoms/settings'
import { useI18n } from '../hooks/useI18n'
import { useRPC } from '../hooks/useRPC'
type Props = {
onOpen: () => void
}
const HomeSpeedDial: React.FC<Props> = ({ onOpen }) => {
const [, setListView] = useRecoilState(listViewState)
const { i18n } = useI18n()
const { client } = useRPC()
const abort = () => client.killAll()
return (
<SpeedDial
ariaLabel="Home speed dial"
sx={{ position: 'absolute', bottom: 32, right: 32 }}
icon={<SpeedDialIcon />}
>
<SpeedDialAction
icon={<FormatListBulleted />}
tooltipTitle={`Table view`}
onClick={() => setListView(state => !state)}
/>
<SpeedDialAction
icon={<DeleteForeverIcon />}
tooltipTitle={i18n.t('abortAllButton')}
onClick={abort}
/>
<SpeedDialAction
icon={<AddCircleIcon />}
tooltipTitle={`New download`}
onClick={onOpen}
/>
</SpeedDial>
)
}
export default HomeSpeedDial

View File

@@ -0,0 +1,18 @@
import { Backdrop, CircularProgress } from '@mui/material'
import { useRecoilValue } from 'recoil'
import { loadingAtom } from '../atoms/ui'
const LoadingBackdrop: React.FC = () => {
const isLoading = useRecoilValue(loadingAtom)
return (
<Backdrop
sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }}
open={!isLoading}
>
<CircularProgress color="primary" />
</Backdrop>
)
}
export default LoadingBackdrop

View File

@@ -1,13 +1,15 @@
import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material' import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material'
import LogoutIcon from '@mui/icons-material/Logout' import LogoutIcon from '@mui/icons-material/Logout'
import { getHttpEndpoint } from '../utils'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { useRecoilValue } from 'recoil'
import { serverURL } from '../atoms/settings'
export default function Logout() { export default function Logout() {
const navigate = useNavigate() const navigate = useNavigate()
const url = useRecoilValue(serverURL)
const logout = async () => { const logout = async () => {
const res = await fetch(`${getHttpEndpoint()}/auth/logout`) const res = await fetch(`${url}/auth/logout`)
if (res.ok) { if (res.ok) {
navigate('/login') navigate('/login')
} }

View File

@@ -0,0 +1,66 @@
import { useMemo } from 'react'
import { useRecoilState, useRecoilValue } from 'recoil'
import { interval, share, take } from 'rxjs'
import { activeDownloadsState } from '../atoms/downloads'
import { serverAddressAndPortState } from '../atoms/settings'
import { connectedState } from '../atoms/status'
import { useSubscription } from '../hooks/observable'
import { useToast } from '../hooks/toast'
import { useI18n } from '../hooks/useI18n'
import { useRPC } from '../hooks/useRPC'
import { datetimeCompareFunc, isRPCResponse } from '../utils'
interface Props extends React.HTMLAttributes<HTMLBaseElement> { }
const SocketSubscriber: React.FC<Props> = ({ children }) => {
const [, setIsConnected] = useRecoilState(connectedState)
const [, setActive] = useRecoilState(activeDownloadsState)
const serverAddressAndPort = useRecoilValue(serverAddressAndPortState)
const { i18n } = useI18n()
const { client } = useRPC()
const { pushMessage } = useToast()
const sharedSocket$ = useMemo(() => client.socket$.pipe(share()), [])
const socketOnce$ = useMemo(() => sharedSocket$.pipe(take(1)), [])
useSubscription(socketOnce$, () => {
setIsConnected(true)
pushMessage(
`${i18n.t('toastConnected')} (${serverAddressAndPort})`,
"success"
)
})
useSubscription(sharedSocket$,
(event) => {
if (!isRPCResponse(event)) { return }
if (!Array.isArray(event.result)) { return }
setActive(
(event.result || [])
.filter(f => !!f.info.url)
.sort((a, b) => datetimeCompareFunc(
b.info.created_at,
a.info.created_at,
))
)
},
(err) => {
console.error(err)
pushMessage(
`${i18n.t('rpcConnErr')} (${serverAddressAndPort})`,
"error"
)
}
)
useSubscription(interval(1000), () => client.running())
return (
<>{children}</>
)
}
export default SocketSubscriber

View File

@@ -1,5 +1,8 @@
import CloudDownloadIcon from '@mui/icons-material/CloudDownload' import CloudDownloadIcon from '@mui/icons-material/CloudDownload'
import { Container, SvgIcon, Typography, styled } from '@mui/material' import { Container, SvgIcon, Typography, styled } from '@mui/material'
import { useRecoilValue } from 'recoil'
import { activeDownloadsState } from '../atoms/downloads'
import { useI18n } from '../hooks/useI18n'
const FlexContainer = styled(Container)({ const FlexContainer = styled(Container)({
display: 'flex', display: 'flex',
@@ -19,6 +22,13 @@ const Title = styled(Typography)({
}) })
export default function Splash() { export default function Splash() {
const { i18n } = useI18n()
const activeDownloads = useRecoilValue(activeDownloadsState)
if (!activeDownloads || activeDownloads.length !== 0) {
return null
}
return ( return (
<FlexContainer> <FlexContainer>
<Title fontWeight={'500'} fontSize={72} color={'gray'}> <Title fontWeight={'500'} fontSize={72} color={'gray'}>
@@ -27,7 +37,7 @@ export default function Splash() {
</SvgIcon> </SvgIcon>
</Title> </Title>
<Title fontWeight={'500'} fontSize={36} color={'gray'}> <Title fontWeight={'500'} fontSize={36} color={'gray'}>
No active downloads {i18n.t('splashText')}
</Title> </Title>
</FlexContainer> </FlexContainer>
) )

View File

@@ -12,50 +12,54 @@ import {
Stack, Stack,
Typography Typography
} from '@mui/material' } from '@mui/material'
import { useEffect, useState } from 'react' import { ellipsis, formatSpeedMiB, mapProcessStatus, roundMiB } from '../utils'
import { ellipsis, formatSpeedMiB, roundMiB } from '../utils'
type Props = { type Props = {
title: string, title: string
thumbnail: string, url: string
thumbnail: string
resolution: string resolution: string
percentage: string, percentage: string
size: number, size: number
speed: number, speed: number
stopCallback: VoidFunction, status: number
onStop: () => void
onCopy: () => void
} }
export function StackableResult({ export function StackableResult({
title, title,
url,
thumbnail, thumbnail,
resolution, resolution,
percentage, percentage,
speed, speed,
size, size,
stopCallback status,
onStop,
onCopy,
}: Props) { }: Props) {
const [isCompleted, setIsCompleted] = useState(false) const isCompleted = () => percentage === '-1'
useEffect(() => { const percentageToNumber = () => isCompleted()
if (percentage === '-1') { ? 100
setIsCompleted(true) : Number(percentage.replace('%', ''))
}
}, [percentage])
const percentageToNumber = () => isCompleted ? 100 : Number(percentage.replace('%', ''))
const guessResolution = (xByY: string): any => { const guessResolution = (xByY: string): any => {
if (!xByY) return null; if (!xByY) return null
if (xByY.includes('4320')) return (<EightK color="primary" />); if (xByY.includes('4320')) return (<EightK color="primary" />)
if (xByY.includes('2160')) return (<FourK color="primary" />); if (xByY.includes('2160')) return (<FourK color="primary" />)
if (xByY.includes('1080')) return (<Hd color="primary" />); if (xByY.includes('1080')) return (<Hd color="primary" />)
if (xByY.includes('720')) return (<Sd color="primary" />); if (xByY.includes('720')) return (<Sd color="primary" />)
return null; return null
} }
return ( return (
<Card> <Card>
<CardActionArea> <CardActionArea onClick={() => {
navigator.clipboard.writeText(url)
onCopy()
}}>
{thumbnail !== '' ? {thumbnail !== '' ?
<CardMedia <CardMedia
component="img" component="img"
@@ -73,12 +77,12 @@ export function StackableResult({
} }
<Stack direction="row" spacing={1} py={2}> <Stack direction="row" spacing={1} py={2}>
<Chip <Chip
label={isCompleted ? 'Completed' : 'Downloading'} label={isCompleted() ? 'Completed' : mapProcessStatus(status)}
color="primary" color="primary"
size="small" size="small"
/> />
<Typography>{!isCompleted ? percentage : ''}</Typography> <Typography>{!isCompleted() ? percentage : ''}</Typography>
<Typography> {!isCompleted ? formatSpeedMiB(speed) : ''}</Typography> <Typography> {!isCompleted() ? formatSpeedMiB(speed) : ''}</Typography>
<Typography>{roundMiB(size ?? 0)}</Typography> <Typography>{roundMiB(size ?? 0)}</Typography>
{guessResolution(resolution)} {guessResolution(resolution)}
</Stack> </Stack>
@@ -86,7 +90,7 @@ export function StackableResult({
<LinearProgress <LinearProgress
variant="determinate" variant="determinate"
value={percentageToNumber()} value={percentageToNumber()}
color={isCompleted ? "secondary" : "primary"} color={isCompleted() ? "secondary" : "primary"}
/> : /> :
null null
} }
@@ -97,9 +101,9 @@ export function StackableResult({
variant="contained" variant="contained"
size="small" size="small"
color="primary" color="primary"
onClick={stopCallback} onClick={onStop}
> >
{isCompleted ? "Clear" : "Stop"} {isCompleted() ? "Clear" : "Stop"}
</Button> </Button>
</CardActions> </CardActions>
</Card> </Card>

View File

@@ -1,22 +1,20 @@
import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material'
import { useDispatch, useSelector } from 'react-redux'
import { setTheme } from '../features/settings/settingsSlice'
import { RootState } from '../stores/store'
import { Brightness4, Brightness5 } from '@mui/icons-material' import { Brightness4, Brightness5 } from '@mui/icons-material'
import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material'
import { useRecoilState } from 'recoil'
import { themeState } from '../atoms/settings'
export default function ThemeToggler() { export default function ThemeToggler() {
const settings = useSelector((state: RootState) => state.settings) const [theme, setTheme] = useRecoilState(themeState)
const dispatch = useDispatch()
return ( return (
<ListItemButton onClick={() => { <ListItemButton onClick={() => {
settings.theme === 'light' theme === 'light'
? dispatch(setTheme('dark')) ? setTheme('dark')
: dispatch(setTheme('light')) : setTheme('light')
}}> }}>
<ListItemIcon> <ListItemIcon>
{ {
settings.theme === 'light' theme === 'light'
? <Brightness4 /> ? <Brightness4 />
: <Brightness5 /> : <Brightness5 />
} }

View File

@@ -1,7 +0,0 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit'
export interface FormatSelectionState {
bestFormat: string
audioFormat: string
videoFormat: string
}

View File

@@ -1,99 +0,0 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit"
export type LanguageUnion = "english" | "chinese" | "russian" | "italian" | "spanish" | "korean" | "japanese" | "catalan"
export type ThemeUnion = "light" | "dark"
export interface SettingsState {
serverAddr: string
serverPort: string
language: LanguageUnion
theme: ThemeUnion
cliArgs: string
formatSelection: boolean
ratelimit: string
fileRenaming: boolean
pathOverriding: boolean
enableCustomArgs: boolean
listView: boolean
}
const initialState: SettingsState = {
serverAddr: localStorage.getItem("server-addr") || window.location.hostname,
serverPort: localStorage.getItem("server-port") || window.location.port,
language: (localStorage.getItem("language") || "english") as LanguageUnion,
theme: (localStorage.getItem("theme") || "light") as ThemeUnion,
cliArgs: localStorage.getItem("cli-args") ?? "",
formatSelection: localStorage.getItem("format-selection") === "true",
ratelimit: localStorage.getItem("rate-limit") ?? "",
fileRenaming: localStorage.getItem("file-renaming") === "true",
pathOverriding: localStorage.getItem("path-overriding") === "true",
enableCustomArgs: localStorage.getItem("enable-custom-args") === "true",
listView: localStorage.getItem("listview") === "true",
}
export const settingsSlice = createSlice({
name: "settings",
initialState,
reducers: {
setServerAddr: (state, action: PayloadAction<string>) => {
state.serverAddr = action.payload
localStorage.setItem("server-addr", action.payload)
},
setServerPort: (state, action: PayloadAction<string>) => {
state.serverPort = action.payload
localStorage.setItem("server-port", action.payload)
},
setLanguage: (state, action: PayloadAction<LanguageUnion>) => {
state.language = action.payload
localStorage.setItem("language", action.payload)
},
setCliArgs: (state, action: PayloadAction<string>) => {
state.cliArgs = action.payload
localStorage.setItem("cli-args", action.payload)
},
setTheme: (state, action: PayloadAction<ThemeUnion>) => {
state.theme = action.payload
localStorage.setItem("theme", action.payload)
},
setFormatSelection: (state, action: PayloadAction<boolean>) => {
state.formatSelection = action.payload
localStorage.setItem("format-selection", action.payload.toString())
},
setRateLimit: (state, action: PayloadAction<string>) => {
state.ratelimit = action.payload
localStorage.setItem("rate-limit", action.payload)
},
setPathOverriding: (state, action: PayloadAction<boolean>) => {
state.pathOverriding = action.payload
localStorage.setItem("path-overriding", action.payload.toString())
},
setFileRenaming: (state, action: PayloadAction<boolean>) => {
state.fileRenaming = action.payload
localStorage.setItem("file-renaming", action.payload.toString())
},
setEnableCustomArgs: (state, action: PayloadAction<boolean>) => {
state.enableCustomArgs = action.payload
localStorage.setItem("enable-custom-args", action.payload.toString())
},
toggleListView: (state) => {
state.listView = !state.listView
localStorage.setItem("listview", state.listView.toString())
},
}
})
export const {
setLanguage,
setCliArgs,
setTheme,
setServerAddr,
setServerPort,
setFormatSelection,
setRateLimit,
setFileRenaming,
setPathOverriding,
setEnableCustomArgs,
toggleListView
} = settingsSlice.actions
export default settingsSlice.reducer

View File

@@ -1,55 +0,0 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit"
export interface StatusState {
connected: boolean,
updated: boolean,
downloading: boolean,
freeSpace: number,
}
const initialState: StatusState = {
connected: false,
updated: false,
downloading: false,
freeSpace: 0,
}
export const statusSlice = createSlice({
name: 'status',
initialState,
reducers: {
connected: (state) => {
state.connected = true
},
disconnected: (state) => {
state.connected = false
},
updated: (state) => {
state.updated = true
},
alreadyUpdated: (state) => {
state.updated = false
},
downloading: (state) => {
state.downloading = true
},
finished: (state) => {
state.downloading = false
},
setFreeSpace: (state, action: PayloadAction<number>) => {
state.freeSpace = action.payload
}
}
})
export const {
connected,
disconnected,
updated,
alreadyUpdated,
downloading,
finished,
setFreeSpace
} = statusSlice.actions
export default statusSlice.reducer

View File

@@ -0,0 +1,19 @@
import { AlertColor } from '@mui/material'
import { useRecoilState } from 'recoil'
import { toastListState } from '../atoms/toast'
export const useToast = () => {
const [toasts, setToasts] = useRecoilState(toastListState)
return {
pushMessage: (message: string, severity?: AlertColor) => {
setToasts([{
open: true,
message: message,
severity: severity,
autoClose: true,
createdAt: Date.now()
}, ...toasts])
}
}
}

View File

@@ -0,0 +1,10 @@
import { useRecoilValue } from 'recoil'
import { i18nBuilderState } from '../atoms/i18n'
export const useI18n = () => {
const instance = useRecoilValue(i18nBuilderState)
return {
i18n: instance
}
}

View File

@@ -0,0 +1,10 @@
import { useRecoilValue } from 'recoil'
import { rpcClientState } from '../atoms/rpc'
export const useRPC = () => {
const client = useRecoilValue(rpcClientState)
return {
client
}
}

View File

@@ -1,61 +1,61 @@
export class CliArguments { export class CliArguments {
private _extractAudio: boolean private _extractAudio: boolean
private _noMTime: boolean private _noMTime: boolean
private _proxy: string private _proxy: string
constructor(extractAudio = false, noMTime = true) { constructor(extractAudio = false, noMTime = true) {
this._extractAudio = extractAudio this._extractAudio = extractAudio
this._noMTime = noMTime this._noMTime = noMTime
this._proxy = "" this._proxy = ""
}
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 '
} }
public get extractAudio(): boolean { if (this._noMTime) {
return this._extractAudio args += '--no-mtime '
} }
public toggleExtractAudio() { return args.trim()
this._extractAudio = !this._extractAudio }
return this
} public fromString(str: string): CliArguments {
if (str) {
public disableExtractAudio() { if (str.includes('-x')) {
this._extractAudio = false this._extractAudio = true
return this }
}
if (str.includes('--no-mtime')) {
public get noMTime(): boolean { this._noMTime = true
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()
}
public fromString(str: string): CliArguments {
if (str) {
if (str.includes('-x')) {
this._extractAudio = true
}
if (str.includes('--no-mtime')) {
this._noMTime = true
}
}
return this
} }
return this
}
} }

View File

@@ -1,10 +0,0 @@
export function on(eventType: string, listener: any) {
document.addEventListener(eventType, listener)
}
export const serverStates = {
PROC_DOWNLOAD: 'download',
PROC_MERGING: 'merging',
PROC_ABORT: 'abort',
PROG_DONE: 'status_done',
}

View File

@@ -1,11 +1,3 @@
import * as E from 'fp-ts/Either'
import { pipe } from 'fp-ts/function'
type FetchInit = {
url: string,
opt?: RequestInit
}
export async function ffetch<T>( export async function ffetch<T>(
url: string, url: string,
onSuccess: (res: T) => void, onSuccess: (res: T) => void,

View File

@@ -2,27 +2,27 @@
import i18n from "../assets/i18n.yaml" import i18n from "../assets/i18n.yaml"
export default class I18nBuilder { export default class I18nBuilder {
private language: string private language: string
private textMap = i18n.languages private textMap = i18n.languages
constructor(language: string) { constructor(language: string) {
this.language = language this.language = language
} }
getLanguage(): string { getLanguage(): string {
return this.language return this.language
} }
setLanguage(language: string): void { setLanguage(language: string): void {
this.language = language this.language = language
} }
t(key: string): string { t(key: string): string {
const map = this.textMap[this.language] const map = this.textMap[this.language]
if (map) { if (map) {
const translation = map[key] const translation = map[key]
return translation ?? 'caption not defined' return translation ?? 'caption not defined'
}
return 'caption not defined'
} }
} return 'caption not defined'
}
}

View File

@@ -1,15 +1,21 @@
import type { DLMetadata, RPCRequest, RPCResponse } from '../types' import { Observable, share } from 'rxjs'
import type { DLMetadata, RPCRequest, RPCResponse, RPCResult } from '../types'
import { webSocket } from 'rxjs/webSocket' import { WebSocketSubject, webSocket } from 'rxjs/webSocket'
import { getHttpRPCEndpoint, getWebSocketEndpoint } from '../utils'
export const socket$ = webSocket<any>(getWebSocketEndpoint())
export class RPCClient { export class RPCClient {
private seq: number private seq: number
private httpEndpoint: string
private readonly _socket$: WebSocketSubject<any>
constructor() { constructor(httpEndpoint: string, webSocketEndpoint: string) {
this.seq = 0 this.seq = 0
this.httpEndpoint = httpEndpoint
this._socket$ = webSocket<any>(webSocketEndpoint)
}
public get socket$(): Observable<RPCResponse<RPCResult[]>> {
return this._socket$.asObservable()
} }
private incrementSeq() { private incrementSeq() {
@@ -17,14 +23,14 @@ export class RPCClient {
} }
private send(req: RPCRequest) { private send(req: RPCRequest) {
socket$.next({ this._socket$.next({
...req, ...req,
id: this.incrementSeq(), id: this.incrementSeq(),
}) })
} }
private async sendHTTP<T>(req: RPCRequest) { private async sendHTTP<T>(req: RPCRequest) {
const res = await fetch(getHttpRPCEndpoint(), { const res = await fetch(this.httpEndpoint, {
method: 'POST', method: 'POST',
body: JSON.stringify({ body: JSON.stringify({
...req, ...req,
@@ -36,18 +42,35 @@ export class RPCClient {
return data return data
} }
public download(url: string, args: string, pathOverride = '', renameTo = '') { public download(
if (url) { url: string,
this.send({ args: string,
method: 'Service.Exec', pathOverride = '',
renameTo = '',
playlist?: boolean
) {
if (!url) {
return
}
if (playlist) {
return this.sendHTTP({
method: 'Service.ExecPlaylist',
params: [{ params: [{
URL: url.split("?list").at(0)!, URL: url,
Params: args.split(" ").map(a => a.trim()), Params: args.split(" ").map(a => a.trim()),
Path: pathOverride, Path: pathOverride,
Rename: renameTo,
}] }]
}) })
} }
this.sendHTTP({
method: 'Service.Exec',
params: [{
URL: url.split("?list").at(0)!,
Params: args.split(" ").map(a => a.trim()),
Path: pathOverride,
Rename: renameTo,
}]
})
} }
public formats(url: string) { public formats(url: string) {
@@ -69,14 +92,14 @@ export class RPCClient {
} }
public kill(id: string) { public kill(id: string) {
this.send({ this.sendHTTP({
method: 'Service.Kill', method: 'Service.Kill',
params: [id], params: [id],
}) })
} }
public killAll() { public killAll() {
this.send({ this.sendHTTP({
method: 'Service.KillAll', method: 'Service.KillAll',
params: [], params: [],
}) })

View File

@@ -0,0 +1,35 @@
import { Alert, Snackbar } from "@mui/material"
import { useRecoilState } from 'recoil'
import { toastListState } from '../atoms/toast'
import { useEffect } from 'react'
const Toaster: React.FC = () => {
const [toasts, setToasts] = useRecoilState(toastListState)
useEffect(() => {
if (toasts.length > 0) {
const interval = setInterval(() => {
setToasts(t => t.filter((x) => (Date.now() - x.createdAt) < 1500))
}, 1500)
return () => clearInterval(interval)
}
}, [setToasts, toasts])
return (
<>
{toasts.map((toast, index) => (
<Snackbar
key={index}
open={toast.open}
>
<Alert variant="filled" severity={toast.severity}>
{toast.message}
</Alert>
</Snackbar>
))}
</>
)
}
export default Toaster

View File

@@ -8,6 +8,8 @@ const Login = lazy(() => import('./views/Login'))
const Archive = lazy(() => import('./views/Archive')) const Archive = lazy(() => import('./views/Archive'))
const Settings = lazy(() => import('./views/Settings')) const Settings = lazy(() => import('./views/Settings'))
const ErrorBoundary = lazy(() => import('./components/ErrorBoundary'))
export const router = createBrowserRouter([ export const router = createBrowserRouter([
{ {
path: '/', path: '/',
@@ -19,6 +21,11 @@ export const router = createBrowserRouter([
<Suspense fallback={<CircularProgress />}> <Suspense fallback={<CircularProgress />}>
<Home /> <Home />
</Suspense > </Suspense >
),
errorElement: (
<Suspense fallback={<CircularProgress />}>
<ErrorBoundary />
</Suspense >
) )
}, },
{ {
@@ -35,6 +42,11 @@ export const router = createBrowserRouter([
<Suspense fallback={<CircularProgress />}> <Suspense fallback={<CircularProgress />}>
<Archive /> <Archive />
</Suspense > </Suspense >
),
errorElement: (
<Suspense fallback={<CircularProgress />}>
<ErrorBoundary />
</Suspense >
) )
}, },
{ {

View File

@@ -1,15 +0,0 @@
import { configureStore } from '@reduxjs/toolkit'
import settingsReducer from '../features/settings/settingsSlice'
import statussReducer from '../features/status/statusSlice'
export const store = configureStore({
reducer: {
settings: settingsReducer,
status: statussReducer,
},
})
export type RootState = ReturnType<typeof store.getState>
export type AppDispatch = typeof store.dispatch

View File

@@ -6,6 +6,7 @@ export type RPCMethods =
| "Service.KillAll" | "Service.KillAll"
| "Service.FreeSpace" | "Service.FreeSpace"
| "Service.Formats" | "Service.Formats"
| "Service.ExecPlaylist"
| "Service.DirectoryTree" | "Service.DirectoryTree"
| "Service.UpdateExecutable" | "Service.UpdateExecutable"
@@ -37,6 +38,7 @@ type DownloadProgress = {
speed: number speed: number
eta: number eta: number
percentage: string percentage: string
process_status: number
} }
export type RPCResult = { export type RPCResult = {

View File

@@ -1,3 +1,5 @@
import type { RPCResponse } from "./types"
/** /**
* Validate an ip v4 via regex * Validate an ip v4 via regex
* @param {string} ipAddr * @param {string} ipAddr
@@ -68,22 +70,9 @@ export function toFormatArgs(codes: string[]): string {
return codes.reduce((v, a) => ` -f ${v}+${a}`) return codes.reduce((v, a) => ` -f ${v}+${a}`)
} }
if (codes.length === 1) { if (codes.length === 1) {
return ` -f ${codes[0]}`; return ` -f ${codes[0]}`
} }
return ''; return ''
}
export function getWebSocketEndpoint() {
const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws'
return `${protocol}://${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}/rpc/ws`
}
export function getHttpRPCEndpoint() {
return `${window.location.protocol}//${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}/rpc/http`
}
export function getHttpEndpoint() {
return `${window.location.protocol}//${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}`
} }
export function formatGiB(bytes: number) { export function formatGiB(bytes: number) {
@@ -93,4 +82,23 @@ export function formatGiB(bytes: number) {
export const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB` export const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB`
export const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s` export const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s`
export const dateTimeComparatorFunc = (a: string, b: string) => new Date(a).getTime() - new Date(b).getTime() export const datetimeCompareFunc = (a: string, b: string) => new Date(a).getTime() - new Date(b).getTime()
export function isRPCResponse(object: any): object is RPCResponse<any> {
return 'result' in object && 'id' in object
}
export function mapProcessStatus(status: number) {
switch (status) {
case 0:
return 'Pending'
case 1:
return 'Downloading'
case 2:
return 'Completed'
case 3:
return 'Error'
default:
return 'Pending'
}
}

View File

@@ -28,23 +28,23 @@ import VideoFileIcon from '@mui/icons-material/VideoFile'
import { Buffer } from 'buffer' import { Buffer } from 'buffer'
import { useEffect, useMemo, useState, useTransition } from 'react' import { useEffect, useMemo, useState, useTransition } from 'react'
import { useSelector } from 'react-redux' import { useNavigate } from 'react-router-dom'
import { useRecoilValue } from 'recoil'
import { BehaviorSubject, Subject, combineLatestWith, map, share } from 'rxjs' import { BehaviorSubject, Subject, combineLatestWith, map, share } from 'rxjs'
import { serverURL } from '../atoms/settings'
import { useObservable } from '../hooks/observable' import { useObservable } from '../hooks/observable'
import { RootState } from '../stores/store' import { useI18n } from '../hooks/useI18n'
import { ffetch } from '../lib/httpClient'
import { DeleteRequest, DirectoryEntry } from '../types' import { DeleteRequest, DirectoryEntry } from '../types'
import { roundMiB } from '../utils' import { roundMiB } from '../utils'
import { useNavigate } from 'react-router-dom'
import { ffetch } from '../lib/httpClient'
export default function Downloaded() { export default function Downloaded() {
const settings = useSelector((state: RootState) => state.settings) const serverAddr = useRecoilValue(serverURL)
const navigate = useNavigate() const navigate = useNavigate()
const [openDialog, setOpenDialog] = useState(false) const { i18n } = useI18n()
const serverAddr = const [openDialog, setOpenDialog] = useState(false)
`${window.location.protocol}//${settings.serverAddr}:${settings.serverPort}`
const files$ = useMemo(() => new Subject<DirectoryEntry[]>(), []) const files$ = useMemo(() => new Subject<DirectoryEntry[]>(), [])
const selected$ = useMemo(() => new BehaviorSubject<string[]>([]), []) const selected$ = useMemo(() => new BehaviorSubject<string[]>([]), [])
@@ -135,8 +135,7 @@ export default function Downloaded() {
useEffect(() => { useEffect(() => {
fetcher() fetcher()
}, [settings.serverAddr, settings.serverPort]) }, [serverAddr])
const onFileClick = (path: string) => startTransition(() => { const onFileClick = (path: string) => startTransition(() => {
window.open(`${serverAddr}/archive/d/${Buffer.from(path).toString('hex')}`) window.open(`${serverAddr}/archive/d/${Buffer.from(path).toString('hex')}`)
@@ -160,7 +159,7 @@ export default function Downloaded() {
flexDirection: 'column', flexDirection: 'column',
}}> }}>
<Typography py={1} variant="h5" color="primary"> <Typography py={1} variant="h5" color="primary">
{'Archive'} {i18n.t('archiveTitle')}
</Typography> </Typography>
<List sx={{ width: '100%', bgcolor: 'background.paper' }}> <List sx={{ width: '100%', bgcolor: 'background.paper' }}>
{selectable.length === 0 && 'No files found'} {selectable.length === 0 && 'No files found'}

View File

@@ -1,189 +1,18 @@
import AddCircleIcon from '@mui/icons-material/AddCircle'
import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
import FormatListBulleted from '@mui/icons-material/FormatListBulleted'
import { import {
Alert, Container
Backdrop,
CircularProgress,
Container,
Snackbar,
SpeedDial,
SpeedDialAction,
SpeedDialIcon,
styled
} from '@mui/material' } from '@mui/material'
import { useEffect, useMemo, useState } from 'react' import Downloads from '../components/Downloads'
import { useDispatch, useSelector } from 'react-redux' import HomeActions from '../components/HomeActions'
import DownloadDialog from '../components/DownloadDialog' import LoadingBackdrop from '../components/LoadingBackdrop'
import { DownloadsCardView } from '../components/DownloadsCardView'
import { DownloadsListView } from '../components/DownloadsListView'
import Splash from '../components/Splash' import Splash from '../components/Splash'
import { toggleListView } from '../features/settings/settingsSlice'
import { connected, setFreeSpace } from '../features/status/statusSlice'
import I18nBuilder from '../lib/intl'
import { RPCClient, socket$ } from '../lib/rpcClient'
import { RootState } from '../stores/store'
import type { RPCResponse, RPCResult } from '../types'
import { dateTimeComparatorFunc } from '../utils'
export default function Home() { export default function Home() {
// redux state
const settings = useSelector((state: RootState) => state.settings)
const status = useSelector((state: RootState) => state.status)
const dispatch = useDispatch()
// ephemeral state
const [activeDownloads, setActiveDownloads] = useState<RPCResult[]>()
const [showBackdrop, setShowBackdrop] = useState(true)
const [showToast, setShowToast] = useState(true)
const [openDialog, setOpenDialog] = useState(false)
const [socketHasError, setSocketHasError] = useState(false)
// memos
const i18n = useMemo(() => new I18nBuilder(settings.language), [settings.language])
const client = useMemo(() => new RPCClient(), [settings.serverAddr, settings.serverPort])
/* -------------------- Effects -------------------- */
/* WebSocket connect event handler*/
useEffect(() => {
if (status.connected) { return }
const sub = socket$.subscribe({
next: () => {
dispatch(connected())
},
error: () => {
setSocketHasError(true)
setShowBackdrop(false)
},
complete: () => {
setSocketHasError(true)
setShowBackdrop(false)
},
})
return () => sub.unsubscribe()
}, [socket$, status.connected])
useEffect(() => {
if (status.connected) {
client.running()
const interval = setInterval(() => client.running(), 1000)
return () => clearInterval(interval)
}
}, [status.connected])
useEffect(() => {
client.freeSpace().then(bytes => dispatch(setFreeSpace(bytes.result)))
}, [])
useEffect(() => {
if (!status.connected) { return }
const sub = socket$.subscribe((event: RPCResponse<RPCResult[]>) => {
switch (typeof event.result) {
case 'object':
setActiveDownloads(
(event.result ?? [])
.filter((r) => !!r.info.url)
.sort((a, b) => dateTimeComparatorFunc(
b.info.created_at,
a.info.created_at,
))
)
break
default:
break
}
})
return () => sub.unsubscribe()
}, [socket$, status.connected])
useEffect(() => {
if (activeDownloads && activeDownloads.length >= 0) {
setShowBackdrop(false)
}
}, [activeDownloads?.length])
/**
* Abort a specific download if id's provided, other wise abort all running ones.
* @param id The download id / pid
* @returns void
*/
const abort = (id?: string) => {
if (id) {
client.kill(id)
return
}
client.killAll()
}
/* -------------------- styled components -------------------- */
const Input = styled('input')({
display: 'none',
})
return ( return (
<Container maxWidth="lg" sx={{ mt: 4, mb: 4 }}> <Container maxWidth="lg" sx={{ mt: 4, mb: 4 }}>
<Backdrop <LoadingBackdrop />
sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }} <Splash />
open={showBackdrop} <Downloads />
> <HomeActions />
<CircularProgress color="primary" />
</Backdrop>
{activeDownloads?.length === 0 &&
<Splash />
}
{
settings.listView ?
<DownloadsListView downloads={activeDownloads ?? []} abortFunction={abort} /> :
<DownloadsCardView downloads={activeDownloads ?? []} abortFunction={abort} />
}
<Snackbar
open={showToast === status.connected}
autoHideDuration={1500}
onClose={() => setShowToast(false)}
>
<Alert variant="filled" severity="success">
{`Connected to (${settings.serverAddr}:${settings.serverPort})`}
</Alert>
</Snackbar>
<Snackbar open={socketHasError}>
<Alert variant="filled" severity="error">
{`${i18n.t('rpcConnErr')} (${settings.serverAddr}:${settings.serverPort})`}
</Alert>
</Snackbar>
<SpeedDial
ariaLabel="SpeedDial basic example"
sx={{ position: 'absolute', bottom: 32, right: 32 }}
icon={<SpeedDialIcon />}
>
<SpeedDialAction
icon={<FormatListBulleted />}
tooltipTitle={`Table view`}
onClick={() => dispatch(toggleListView())}
/>
<SpeedDialAction
icon={<DeleteForeverIcon />}
tooltipTitle={i18n.t('abortAllButton')}
onClick={() => abort()}
/>
<SpeedDialAction
icon={<AddCircleIcon />}
tooltipTitle={`New download`}
onClick={() => setOpenDialog(true)}
/>
</SpeedDial>
<DownloadDialog open={openDialog} onClose={() => {
setOpenDialog(false)
activeDownloads?.length === 0
? setShowBackdrop(false)
: setShowBackdrop(true)
}} />
</Container> </Container>
) )
} }

View File

@@ -11,9 +11,10 @@ import {
TextField, TextField,
Typography Typography
} from '@mui/material' } from '@mui/material'
import { getHttpEndpoint } from '../utils'
import { useState } from 'react' import { useState } from 'react'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { useRecoilValue } from 'recoil'
import { serverURL } from '../atoms/settings'
const LoginContainer = styled(Container)({ const LoginContainer = styled(Container)({
display: 'flex', display: 'flex',
@@ -35,10 +36,12 @@ export default function Login() {
const [secret, setSecret] = useState('') const [secret, setSecret] = useState('')
const [formHasError, setFormHasError] = useState(false) const [formHasError, setFormHasError] = useState(false)
const url = useRecoilValue(serverURL)
const navigate = useNavigate() const navigate = useNavigate()
const login = async () => { const login = async () => {
const res = await fetch(`${getHttpEndpoint()}/auth/login`, { const res = await fetch(`${url}/auth/login`, {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'

View File

@@ -11,14 +11,14 @@ import {
Paper, Paper,
Select, Select,
SelectChangeEvent, SelectChangeEvent,
Snackbar,
Stack, Stack,
Switch, Switch,
TextField, TextField,
Typography Typography,
capitalize
} from '@mui/material' } from '@mui/material'
import { useEffect, useMemo, useState } from 'react' import { useEffect, useMemo, useState } from 'react'
import { useDispatch, useSelector } from 'react-redux' import { useRecoilState } from 'recoil'
import { import {
Subject, Subject,
debounceTime, debounceTime,
@@ -26,38 +26,46 @@ import {
map, map,
takeWhile takeWhile
} from 'rxjs' } from 'rxjs'
import { CliArguments } from '../lib/argsParser'
import I18nBuilder from '../lib/intl'
import { RPCClient } from '../lib/rpcClient'
import { import {
LanguageUnion, Language,
ThemeUnion, Theme,
setCliArgs, enableCustomArgsState,
setEnableCustomArgs, fileRenamingState,
setFileRenaming, formatSelectionState,
setFormatSelection, languageState,
setLanguage, languages,
setPathOverriding, latestCliArgumentsState,
setServerAddr, pathOverridingState,
setServerPort, serverAddressState,
setTheme serverPortState,
} from '../features/settings/settingsSlice' themeState
import { updated } from '../features/status/statusSlice' } from '../atoms/settings'
import { RootState } from '../stores/store' 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' import { validateDomain, validateIP } from '../utils'
// NEED ABSOLUTELY TO BE SPLIT IN MULTIPLE COMPONENTS
export default function Settings() { export default function Settings() {
const dispatch = useDispatch() 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 [language, setLanguage] = useRecoilState(languageState)
const [cliArgs, setCliArgs] = useRecoilState(latestCliArgumentsState)
const [theme, setTheme] = useRecoilState(themeState)
const status = useSelector((state: RootState) => state.status) const [invalidIP, setInvalidIP] = useState(false)
const settings = useSelector((state: RootState) => state.settings)
const [invalidIP, setInvalidIP] = useState(false); const { i18n } = useI18n()
const { client } = useRPC()
const i18n = useMemo(() => new I18nBuilder(settings.language), [settings.language]) const { pushMessage } = useToast()
const client = useMemo(() => new RPCClient(), []) const argsBuilder = useMemo(() => new CliArguments().fromString(cliArgs), [])
const cliArgs = useMemo(() => new CliArguments().fromString(settings.cliArgs), [])
const serverAddr$ = useMemo(() => new Subject<string>(), []) const serverAddr$ = useMemo(() => new Subject<string>(), [])
const serverPort$ = useMemo(() => new Subject<string>(), []) const serverPort$ = useMemo(() => new Subject<string>(), [])
@@ -71,10 +79,10 @@ export default function Settings() {
.subscribe(addr => { .subscribe(addr => {
if (validateIP(addr)) { if (validateIP(addr)) {
setInvalidIP(false) setInvalidIP(false)
dispatch(setServerAddr(addr)) setServerAddr(addr)
} else if (validateDomain(addr)) { } else if (validateDomain(addr)) {
setInvalidIP(false) setInvalidIP(false)
dispatch(setServerAddr(addr)) setServerAddr(addr)
} else { } else {
setInvalidIP(true) setInvalidIP(true)
} }
@@ -90,7 +98,7 @@ export default function Settings() {
takeWhile(val => isFinite(val) && val <= 65535), takeWhile(val => isFinite(val) && val <= 65535),
) )
.subscribe(port => { .subscribe(port => {
dispatch(setServerPort(port.toString())) setServerPort(port)
}) })
return () => sub.unsubscribe() return () => sub.unsubscribe()
}, []) }, [])
@@ -98,22 +106,22 @@ export default function Settings() {
/** /**
* Language toggler handler * Language toggler handler
*/ */
const handleLanguageChange = (event: SelectChangeEvent<LanguageUnion>) => { const handleLanguageChange = (event: SelectChangeEvent<Language>) => {
dispatch(setLanguage(event.target.value as LanguageUnion)); setLanguage(event.target.value as Language)
} }
/** /**
* Theme toggler handler * Theme toggler handler
*/ */
const handleThemeChange = (event: SelectChangeEvent<ThemeUnion>) => { const handleThemeChange = (event: SelectChangeEvent<Theme>) => {
dispatch(setTheme(event.target.value as ThemeUnion)); setTheme(event.target.value as Theme)
} }
/** /**
* Send via WebSocket a message to update yt-dlp binary * Updates yt-dlp binary via RPC
*/ */
const updateBinary = () => { const updateBinary = () => {
client.updateExecutable().then(() => dispatch(updated())) client.updateExecutable().then(() => pushMessage(i18n.t('toastUpdated')))
} }
return ( return (
@@ -137,7 +145,7 @@ export default function Settings() {
<TextField <TextField
fullWidth fullWidth
label={i18n.t('serverAddressTitle')} label={i18n.t('serverAddressTitle')}
defaultValue={settings.serverAddr} defaultValue={serverAddr}
error={invalidIP} error={invalidIP}
onChange={(e) => serverAddr$.next(e.currentTarget.value)} onChange={(e) => serverAddr$.next(e.currentTarget.value)}
InputProps={{ InputProps={{
@@ -150,9 +158,9 @@ export default function Settings() {
<TextField <TextField
fullWidth fullWidth
label={i18n.t('serverPortTitle')} label={i18n.t('serverPortTitle')}
defaultValue={settings.serverPort} defaultValue={serverPort}
onChange={(e) => serverPort$.next(e.currentTarget.value)} onChange={(e) => serverPort$.next(e.currentTarget.value)}
error={isNaN(Number(settings.serverPort)) || Number(settings.serverPort) > 65535} error={isNaN(Number(serverPort)) || Number(serverPort) > 65535}
sx={{ mb: 2 }} sx={{ mb: 2 }}
/> />
</Grid> </Grid>
@@ -162,18 +170,15 @@ export default function Settings() {
<FormControl fullWidth> <FormControl fullWidth>
<InputLabel>{i18n.t('languageSelect')}</InputLabel> <InputLabel>{i18n.t('languageSelect')}</InputLabel>
<Select <Select
defaultValue={settings.language} defaultValue={language}
label={i18n.t('languageSelect')} label={i18n.t('languageSelect')}
onChange={handleLanguageChange} onChange={handleLanguageChange}
> >
<MenuItem value="english">English</MenuItem> {languages.map(l => (
<MenuItem value="spanish">Spanish</MenuItem> <MenuItem value={l} key={l}>
<MenuItem value="italian">Italian</MenuItem> {capitalize(l)}
<MenuItem value="chinese">Chinese</MenuItem> </MenuItem>
<MenuItem value="russian">Russian</MenuItem> ))}
<MenuItem value="korean">Korean</MenuItem>
<MenuItem value="japanese">Japanese</MenuItem>
<MenuItem value="catalan">Catalan</MenuItem>
</Select> </Select>
</FormControl> </FormControl>
</Grid> </Grid>
@@ -181,7 +186,7 @@ export default function Settings() {
<FormControl fullWidth> <FormControl fullWidth>
<InputLabel>{i18n.t('themeSelect')}</InputLabel> <InputLabel>{i18n.t('themeSelect')}</InputLabel>
<Select <Select
defaultValue={settings.theme} defaultValue={theme}
label={i18n.t('themeSelect')} label={i18n.t('themeSelect')}
onChange={handleThemeChange} onChange={handleThemeChange}
> >
@@ -194,8 +199,8 @@ export default function Settings() {
<FormControlLabel <FormControlLabel
control={ control={
<Switch <Switch
defaultChecked={cliArgs.noMTime} defaultChecked={argsBuilder.noMTime}
onChange={() => dispatch(setCliArgs(cliArgs.toggleNoMTime().toString()))} onChange={() => setCliArgs(argsBuilder.toggleNoMTime().toString())}
/> />
} }
label={i18n.t('noMTimeCheckbox')} label={i18n.t('noMTimeCheckbox')}
@@ -204,9 +209,9 @@ export default function Settings() {
<FormControlLabel <FormControlLabel
control={ control={
<Switch <Switch
defaultChecked={cliArgs.extractAudio} defaultChecked={argsBuilder.extractAudio}
onChange={() => dispatch(setCliArgs(cliArgs.toggleExtractAudio().toString()))} onChange={() => setCliArgs(argsBuilder.toggleExtractAudio().toString())}
disabled={settings.formatSelection} disabled={formatSelection}
/> />
} }
label={i18n.t('extractAudioCheckbox')} label={i18n.t('extractAudioCheckbox')}
@@ -214,10 +219,10 @@ export default function Settings() {
<FormControlLabel <FormControlLabel
control={ control={
<Switch <Switch
defaultChecked={settings.formatSelection} defaultChecked={formatSelection}
onChange={() => { onChange={() => {
dispatch(setCliArgs(cliArgs.disableExtractAudio().toString())) setCliArgs(argsBuilder.disableExtractAudio().toString())
dispatch(setFormatSelection(!settings.formatSelection)) setFormatSelection(!formatSelection)
}} }}
/> />
} }
@@ -231,9 +236,9 @@ export default function Settings() {
<FormControlLabel <FormControlLabel
control={ control={
<Switch <Switch
defaultChecked={settings.pathOverriding} defaultChecked={!!pathOverriding}
onChange={() => { onChange={() => {
dispatch(setPathOverriding(!settings.pathOverriding)) setPathOverriding(state => !state)
}} }}
/> />
} }
@@ -242,9 +247,9 @@ export default function Settings() {
<FormControlLabel <FormControlLabel
control={ control={
<Switch <Switch
defaultChecked={settings.fileRenaming} defaultChecked={fileRenaming}
onChange={() => { onChange={() => {
dispatch(setFileRenaming(!settings.fileRenaming)) setFileRenaming(state => !state)
}} }}
/> />
} }
@@ -253,9 +258,9 @@ export default function Settings() {
<FormControlLabel <FormControlLabel
control={ control={
<Switch <Switch
defaultChecked={settings.enableCustomArgs} defaultChecked={enableArgs}
onChange={() => { onChange={() => {
dispatch(setEnableCustomArgs(!settings.enableCustomArgs)) setEnableArgs(state => !state)
}} }}
/> />
} }
@@ -268,7 +273,7 @@ export default function Settings() {
<Button <Button
sx={{ mr: 1, mt: 3 }} sx={{ mr: 1, mt: 3 }}
variant="contained" variant="contained"
onClick={() => dispatch(updated())} onClick={() => updateBinary()}
> >
{i18n.t('updateBinButton')} {i18n.t('updateBinButton')}
</Button> </Button>
@@ -278,12 +283,6 @@ export default function Settings() {
</Paper> </Paper>
</Grid> </Grid>
</Grid> </Grid>
<Snackbar
open={status.updated}
autoHideDuration={1500}
message={i18n.t('toastUpdated')}
onClose={updateBinary}
/>
</Container> </Container>
); )
} }

21
go.mod
View File

@@ -3,29 +3,14 @@ module github.com/marcopeocchi/yt-dlp-web-ui
go 1.20 go 1.20
require ( require (
github.com/go-chi/chi/v5 v5.0.10
github.com/goccy/go-json v0.10.2 github.com/goccy/go-json v0.10.2
github.com/gofiber/fiber/v2 v2.47.0
github.com/gofiber/websocket/v2 v2.2.1
github.com/golang-jwt/jwt/v5 v5.0.0 github.com/golang-jwt/jwt/v5 v5.0.0
github.com/google/uuid v1.3.0 github.com/google/uuid v1.3.0
github.com/gorilla/websocket v1.5.0
github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa
golang.org/x/sys v0.9.0 golang.org/x/sys v0.9.0
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
) )
require ( require github.com/go-chi/cors v1.2.1
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/fasthttp/websocket v1.5.3 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
github.com/tinylib/msgp v1.1.8 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.48.0 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect
)

87
go.sum
View File

@@ -1,94 +1,19 @@
github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/fasthttp/websocket v1.5.3 h1:TPpQuLwJYfd4LJPXvHDYPMFWbLjsT91n3GpWtCQtdek= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
github.com/fasthttp/websocket v1.5.3/go.mod h1:46gg/UBmTU1kUaTcwQXpUxtRwG2PvIZYeA8oL6vF3Fs= github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/gofiber/fiber/v2 v2.47.0 h1:EN5lHVCc+Pyqh5OEsk8fzRiifgwpbrP0rulQ4iNf3fs=
github.com/gofiber/fiber/v2 v2.47.0/go.mod h1:mbFMVN1lQuzziTkkakgtKKdjfsXSw9BKR5lmcNksUoU=
github.com/gofiber/websocket/v2 v2.2.1 h1:C9cjxvloojayOp9AovmpQrk8VqvVnT8Oao3+IUygH7w=
github.com/gofiber/websocket/v2 v2.2.1/go.mod h1:Ao/+nyNnX5u/hIFPuHl28a+NIkrqK7PRimyKaj4JxVU=
github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa h1:uaAQLGhN4SesB9inOQ1Q6EH+BwTWHQOvwhR0TIJvnYc= github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa h1:uaAQLGhN4SesB9inOQ1Q6EH+BwTWHQOvwhR0TIJvnYc=
github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa/go.mod h1:RvfVo/6Sbnfra9kkvIxDW8NYOOaYsHjF0DdtMCs9cdo= github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa/go.mod h1:RvfVo/6Sbnfra9kkvIxDW8NYOOaYsHjF0DdtMCs9cdo=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 h1:rmMl4fXJhKMNWl+K+r/fq4FbbKI+Ia2m9hYBLm2h4G4=
github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94/go.mod h1:90zrgN3D/WJsDd1iXHT96alCoN2KJo6/4x1DZC3wZs8=
github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d/go.mod h1:Gy+0tqhJvgGlqnTF8CVGP0AaGRjwBtXs/a5PA0Y3+A4=
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk=
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g=
github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=
github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc=
github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA=
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

View File

@@ -5,6 +5,7 @@ import (
"flag" "flag"
"io/fs" "io/fs"
"log" "log"
"runtime"
"github.com/marcopeocchi/yt-dlp-web-ui/server" "github.com/marcopeocchi/yt-dlp-web-ui/server"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/server/config"
@@ -12,20 +13,23 @@ import (
var ( var (
port int port int
queueSize int
configFile string configFile string
downloadPath string downloadPath string
downloaderPath string downloaderPath string
requireAuth bool requireAuth bool
rpcSecret string rpcSecret string
//go:embed frontend/dist //go:embed frontend/dist
frontend embed.FS frontend embed.FS
) )
func init() { func init() {
flag.IntVar(&port, "port", 3033, "Port 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.StringVar(&configFile, "conf", "", "yt-dlp-WebUI config file path") flag.StringVar(&configFile, "conf", "", "Config file path")
flag.StringVar(&downloadPath, "out", ".", "Where files will be saved") flag.StringVar(&downloadPath, "out", ".", "Where files will be saved")
flag.StringVar(&downloaderPath, "driver", "yt-dlp", "yt-dlp executable path") flag.StringVar(&downloaderPath, "driver", "yt-dlp", "yt-dlp executable path")
@@ -45,6 +49,7 @@ func main() {
c := config.Instance() c := config.Instance()
c.SetPort(port) c.SetPort(port)
c.QueueSize(queueSize)
c.DownloadPath(downloadPath) c.DownloadPath(downloadPath)
c.DownloaderPath(downloaderPath) c.DownloaderPath(downloaderPath)

View File

@@ -1,7 +1,5 @@
package cli package cli
import "fmt"
const ( const (
// FG // FG
Red = "\033[31m" Red = "\033[31m"
@@ -12,12 +10,8 @@ const (
Cyan = "\033[36m" Cyan = "\033[36m"
Reset = "\033[0m" Reset = "\033[0m"
// BG // BG
BgRed = "\033[1;41m" BgRed = "\033[1;41m"
BgBlue = "\033[1;44m" BgBlue = "\033[1;44m"
BgGreen = "\033[1;42m" BgGreen = "\033[1;42m"
BgMagenta = "\033[1;45m"
) )
// Formats a message with the specified ascii escape code, then reset.
func Format(message string, code string) string {
return fmt.Sprintf("%s%s%s", code, message, Reset)
}

View File

@@ -15,6 +15,7 @@ type serverConfig struct {
DownloaderPath string `yaml:"downloaderPath"` DownloaderPath string `yaml:"downloaderPath"`
RequireAuth bool `yaml:"require_auth"` RequireAuth bool `yaml:"require_auth"`
RPCSecret string `yaml:"rpc_secret"` RPCSecret string `yaml:"rpc_secret"`
QueueSize int `yaml:"queue_size"`
} }
type config struct { type config struct {
@@ -51,10 +52,15 @@ func (c *config) DownloaderPath(path string) {
func (c *config) RequireAuth(value bool) { func (c *config) RequireAuth(value bool) {
c.cfg.RequireAuth = value c.cfg.RequireAuth = value
} }
func (c *config) RPCSecret(secret string) { func (c *config) RPCSecret(secret string) {
c.cfg.RPCSecret = secret c.cfg.RPCSecret = secret
} }
func (c *config) QueueSize(size int) {
c.cfg.QueueSize = size
}
var instance *config var instance *config
func Instance() *config { func Instance() *config {

157
server/handlers/archive.go Normal file
View File

@@ -0,0 +1,157 @@
package handlers
import (
"encoding/hex"
"net/http"
"os"
"path/filepath"
"sort"
"strings"
"time"
"github.com/go-chi/chi/v5"
"github.com/goccy/go-json"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
)
const (
TOKEN_COOKIE_NAME = "jwt"
)
type DirectoryEntry struct {
Name string `json:"name"`
Path string `json:"path"`
Size int64 `json:"size"`
SHASum string `json:"shaSum"`
ModTime time.Time `json:"modTime"`
IsVideo bool `json:"isVideo"`
IsDirectory bool `json:"isDirectory"`
}
func walkDir(root string) (*[]DirectoryEntry, error) {
files := []DirectoryEntry{}
dirs, err := os.ReadDir(root)
if err != nil {
return nil, err
}
for _, d := range dirs {
if !utils.IsValidEntry(d) {
continue
}
path := filepath.Join(root, d.Name())
info, err := d.Info()
if err != nil {
return nil, err
}
files = append(files, DirectoryEntry{
Path: path,
Name: d.Name(),
Size: info.Size(),
SHASum: utils.ShaSumString(path),
IsVideo: utils.IsVideo(d),
IsDirectory: d.IsDir(),
ModTime: info.ModTime(),
})
}
return &files, err
}
type ListRequest struct {
SubDir string `json:"subdir"`
OrderBy string `json:"orderBy"`
}
func ListDownloaded(w http.ResponseWriter, r *http.Request) {
root := config.Instance().GetConfig().DownloadPath
req := new(ListRequest)
err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
files, err := walkDir(filepath.Join(root, req.SubDir))
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
if req.OrderBy == "modtime" {
sort.SliceStable(*files, func(i, j int) bool {
return (*files)[i].ModTime.After((*files)[j].ModTime)
})
}
w.WriteHeader(http.StatusOK)
err = json.NewEncoder(w).Encode(files)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
}
type DeleteRequest = DirectoryEntry
func DeleteFile(w http.ResponseWriter, r *http.Request) {
req := new(DeleteRequest)
err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
sum := utils.ShaSumString(req.Path)
if sum != req.SHASum {
http.Error(w, "shasum mismatch", http.StatusBadRequest)
return
}
err = os.Remove(req.Path)
if err != nil {
http.Error(w, "shasum mismatch", http.StatusBadRequest)
return
}
w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode("ok")
}
func SendFile(w http.ResponseWriter, r *http.Request) {
path := chi.URLParam(r, "id")
if path == "" {
http.Error(w, "inexistent path", http.StatusBadRequest)
return
}
decoded, err := hex.DecodeString(path)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
decodedStr := string(decoded)
root := config.Instance().GetConfig().DownloadPath
// TODO: further path / file validations
if strings.Contains(filepath.Dir(decodedStr), root) {
// ctx.Response().Header.Set(
// "Content-Disposition",
// "inline; filename="+filepath.Base(decodedStr),
// )
http.ServeFile(w, r, decodedStr)
}
w.WriteHeader(http.StatusUnauthorized)
}

65
server/handlers/login.go Normal file
View File

@@ -0,0 +1,65 @@
package handlers
import (
"net/http"
"os"
"time"
"github.com/goccy/go-json"
"github.com/golang-jwt/jwt/v5"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
)
type LoginRequest struct {
Secret string `json:"secret"`
}
func Login(w http.ResponseWriter, r *http.Request) {
req := new(LoginRequest)
err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
if config.Instance().GetConfig().RPCSecret != req.Secret {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
expiresAt := time.Now().Add(time.Hour * 24 * 30)
token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
"expiresAt": expiresAt,
})
tokenString, err := token.SignedString([]byte(os.Getenv("JWT_SECRET")))
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
cookie := &http.Cookie{
Name: TOKEN_COOKIE_NAME,
HttpOnly: true,
Secure: false,
Expires: expiresAt, // 30 days
Value: tokenString,
Path: "/",
}
http.SetCookie(w, cookie)
}
func Logout(w http.ResponseWriter, r *http.Request) {
cookie := &http.Cookie{
Name: TOKEN_COOKIE_NAME,
HttpOnly: true,
Secure: false,
Expires: time.Now(),
Value: "",
Path: "/",
}
http.SetCookie(w, cookie)
}

View File

@@ -1,9 +1,10 @@
package server package internal
import "time" import "time"
// Progress for the Running call // Progress for the Running call
type DownloadProgress struct { type DownloadProgress struct {
Status int `json:"process_status"`
Percentage string `json:"percentage"` Percentage string `json:"percentage"`
Speed float32 `json:"speed"` Speed float32 `json:"speed"`
ETA int `json:"eta"` ETA int `json:"eta"`
@@ -11,15 +12,16 @@ type DownloadProgress struct {
// Used to deser the yt-dlp -J output // Used to deser the yt-dlp -J output
type DownloadInfo struct { type DownloadInfo struct {
URL string `json:"url"` URL string `json:"url"`
Title string `json:"title"` Title string `json:"title"`
Thumbnail string `json:"thumbnail"` Thumbnail string `json:"thumbnail"`
Resolution string `json:"resolution"` Resolution string `json:"resolution"`
Size int32 `json:"filesize_approx"` Size int32 `json:"filesize_approx"`
VCodec string `json:"vcodec"` VCodec string `json:"vcodec"`
ACodec string `json:"acodec"` ACodec string `json:"acodec"`
Extension string `json:"ext"` Extension string `json:"ext"`
CreatedAt time.Time `json:"created_at"` OriginalURL string `json:"original_url"`
CreatedAt time.Time `json:"created_at"`
} }
// Used to deser the formats in the -J output // Used to deser the formats in the -J output
@@ -63,7 +65,9 @@ type AbortRequest struct {
// struct representing the intent to start a download // struct representing the intent to start a download
type DownloadRequest struct { type DownloadRequest struct {
Url string `json:"url"` Id string
Params []string `json:"params"` URL string `json:"url"`
RenameTo string `json:"renameTo"` Path string `json:"path"`
Rename string `json:"rename"`
Params []string `json:"params"`
} }

View File

@@ -1,14 +1,13 @@
package server package internal
import ( import (
"encoding/gob"
"errors" "errors"
"fmt" "fmt"
"log" "log"
"os" "os"
"sync" "sync"
"github.com/goccy/go-json"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/marcopeocchi/yt-dlp-web-ui/server/cli" "github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
) )
@@ -20,7 +19,7 @@ type MemoryDB struct {
// Get a process pointer given its id // Get a process pointer given its id
func (m *MemoryDB) Get(id string) (*Process, error) { func (m *MemoryDB) Get(id string) (*Process, error) {
entry, ok := db.table.Load(id) entry, ok := m.table.Load(id)
if !ok { if !ok {
return nil, errors.New("no process found for the given key") return nil, errors.New("no process found for the given key")
} }
@@ -30,28 +29,33 @@ func (m *MemoryDB) Get(id string) (*Process, error) {
// Store a pointer of a process and return its id // Store a pointer of a process and return its id
func (m *MemoryDB) Set(process *Process) string { func (m *MemoryDB) Set(process *Process) string {
id := uuid.Must(uuid.NewRandom()).String() id := uuid.Must(uuid.NewRandom()).String()
db.table.Store(id, process) m.table.Store(id, process)
process.Id = id
return id return id
} }
// Update a process info/metadata, given the process id // Update a process info/metadata, given the process id
//
// Deprecated: will be removed anytime soon.
func (m *MemoryDB) UpdateInfo(id string, info DownloadInfo) error { func (m *MemoryDB) UpdateInfo(id string, info DownloadInfo) error {
entry, ok := db.table.Load(id) entry, ok := m.table.Load(id)
if ok { if ok {
entry.(*Process).Info = info entry.(*Process).Info = info
db.table.Store(id, entry) m.table.Store(id, entry)
return nil return nil
} }
return fmt.Errorf("can't update row with id %s", id) return fmt.Errorf("can't update row with id %s", id)
} }
// Update a process progress data, given the process id // Update a process progress data, given the process id
// Used for updating completition percentage or ETA // Used for updating completition percentage or ETA.
//
// Deprecated: will be removed anytime soon.
func (m *MemoryDB) UpdateProgress(id string, progress DownloadProgress) error { func (m *MemoryDB) UpdateProgress(id string, progress DownloadProgress) error {
entry, ok := db.table.Load(id) entry, ok := m.table.Load(id)
if ok { if ok {
entry.(*Process).Progress = progress entry.(*Process).Progress = progress
db.table.Store(id, entry) m.table.Store(id, entry)
return nil return nil
} }
return fmt.Errorf("can't update row with id %s", id) return fmt.Errorf("can't update row with id %s", id)
@@ -59,12 +63,12 @@ func (m *MemoryDB) UpdateProgress(id string, progress DownloadProgress) error {
// Removes a process progress, given the process id // Removes a process progress, given the process id
func (m *MemoryDB) Delete(id string) { func (m *MemoryDB) Delete(id string) {
db.table.Delete(id) m.table.Delete(id)
} }
func (m *MemoryDB) Keys() *[]string { func (m *MemoryDB) Keys() *[]string {
running := []string{} running := []string{}
db.table.Range(func(key, value any) bool { m.table.Range(func(key, value any) bool {
running = append(running, key.(string)) running = append(running, key.(string))
return true return true
}) })
@@ -74,7 +78,7 @@ func (m *MemoryDB) Keys() *[]string {
// Returns a slice of all currently stored processes progess // Returns a slice of all currently stored processes progess
func (m *MemoryDB) All() *[]ProcessResponse { func (m *MemoryDB) All() *[]ProcessResponse {
running := []ProcessResponse{} running := []ProcessResponse{}
db.table.Range(func(key, value any) bool { m.table.Range(func(key, value any) bool {
running = append(running, ProcessResponse{ running = append(running, ProcessResponse{
Id: key.(string), Id: key.(string),
Info: value.(*Process).Info, Info: value.(*Process).Info,
@@ -89,33 +93,51 @@ func (m *MemoryDB) All() *[]ProcessResponse {
func (m *MemoryDB) Persist() { func (m *MemoryDB) Persist() {
running := m.All() running := m.All()
session, err := json.Marshal(Session{ fd, err := os.Create("session.dat")
Processes: *running,
})
if err != nil { if err != nil {
log.Println(cli.Red, "Failed to persist database", cli.Reset) log.Println(cli.Red, "Failed to persist session", cli.Reset)
return
} }
err = os.WriteFile("session.dat", session, 0700) session := Session{
if err != nil { Processes: *running,
log.Println(cli.Red, "Failed to persist database", cli.Reset)
} }
err = gob.NewEncoder(fd).Encode(session)
if err != nil {
log.Println(cli.Red, "Failed to persist session", cli.Reset)
}
log.Println(cli.BgBlue, "Successfully serialized session", cli.Reset)
} }
// WIP: Restore a persisted state // WIP: Restore a persisted state
func (m *MemoryDB) Restore() { func (m *MemoryDB) Restore() {
feed, _ := os.ReadFile("session.dat") fd, err := os.Open("session.dat")
if err != nil {
return
}
session := Session{} session := Session{}
json.Unmarshal(feed, &session)
err = gob.NewDecoder(fd).Decode(&session)
if err != nil {
return
}
for _, proc := range session.Processes { for _, proc := range session.Processes {
db.table.Store(proc.Id, &Process{ restored := &Process{
id: proc.Id, Id: proc.Id,
url: proc.Info.URL, Url: proc.Info.URL,
Info: proc.Info, Info: proc.Info,
Progress: proc.Progress, Progress: proc.Progress,
mem: m, }
})
m.table.Store(proc.Id, restored)
if restored.Progress.Percentage != "-1" {
go restored.Start()
}
} }
log.Println(cli.BgGreen, "Successfully restored session", cli.Reset)
} }

View File

@@ -0,0 +1,65 @@
package internal
import (
"log"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
)
type MessageQueue struct {
producerCh chan *Process
consumerCh chan struct{}
}
// Creates a new message queue.
// By default it will be created with a size equals to nthe number of logical
// CPU cores.
// The queue size can be set via the qs flag.
func NewMessageQueue() *MessageQueue {
size := config.Instance().GetConfig().QueueSize
if size <= 0 {
log.Fatalln("invalid queue size")
}
return &MessageQueue{
producerCh: make(chan *Process, size),
consumerCh: make(chan struct{}, size),
}
}
// Publish a message to the queue and set the task to a peding state.
func (m *MessageQueue) Publish(p *Process) {
p.SetPending()
go p.SetMetadata()
m.producerCh <- p
}
// Publish a message to the queue and set the task to a peding state.
// ENSURE P IS PART OF A PLAYLIST
// Needs a further review
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() {
for msg := range m.producerCh {
m.consumerCh <- struct{}{}
go func(p *Process) {
p.Start()
<-m.consumerCh
}(msg)
}
}
// Empties the message queue
func (m *MessageQueue) Empty() {
for range m.producerCh {
<-m.producerCh
}
for range m.consumerCh {
<-m.consumerCh
}
}

View File

@@ -0,0 +1,81 @@
package internal
import (
"errors"
"log"
"os/exec"
"time"
"github.com/goccy/go-json"
"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
)
type metadata struct {
Entries []DownloadInfo `json:"entries"`
Count int `json:"playlist_count"`
Type string `json:"_type"`
}
func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB) error {
cmd := exec.Command(cfg.GetConfig().DownloaderPath, req.URL, "-J")
stdout, err := cmd.StdoutPipe()
if err != nil {
return err
}
m := metadata{}
err = cmd.Start()
if err != nil {
return err
}
log.Println(cli.BgRed, "Decoding metadata", cli.Reset, req.URL)
err = json.NewDecoder(stdout).Decode(&m)
if err != nil {
return err
}
log.Println(cli.BgGreen, "Decoded metadata", cli.Reset, req.URL)
if m.Type == "" {
cmd.Wait()
return errors.New("probably not a valid URL")
}
if m.Type == "playlist" {
log.Println(
cli.BgGreen, "Playlist detected", cli.Reset, m.Count, "entries",
)
for _, meta := range m.Entries {
proc := &Process{
Url: meta.OriginalURL,
Progress: DownloadProgress{},
Output: DownloadOutput{},
Info: meta,
Params: req.Params,
}
proc.Info.URL = meta.OriginalURL
proc.Info.CreatedAt = time.Now().Add(time.Second)
db.Set(proc)
proc.SetPending()
mq.PublishPlaylistEntry(proc)
}
err = cmd.Wait()
return err
}
proc := &Process{Url: req.URL, Params: req.Params}
mq.Publish(proc)
log.Println("Sending new process to message queue", proc.Url)
err = cmd.Wait()
return err
}

View File

@@ -1,9 +1,10 @@
package server package internal
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"regexp" "regexp"
"sync"
"syscall" "syscall"
"github.com/goccy/go-json" "github.com/goccy/go-json"
@@ -15,8 +16,8 @@ import (
"time" "time"
"github.com/marcopeocchi/fazzoletti/slices" "github.com/marcopeocchi/fazzoletti/slices"
"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/rx"
) )
const template = `download: const template = `download:
@@ -30,6 +31,13 @@ var (
cfg = config.Instance() cfg = config.Instance()
) )
const (
StatusPending = iota
StatusDownloading
StatusCompleted
StatusErrored
)
type ProgressTemplate struct { type ProgressTemplate struct {
Percentage string `json:"percentage"` Percentage string `json:"percentage"`
Speed float32 `json:"speed"` Speed float32 `json:"speed"`
@@ -39,54 +47,54 @@ type ProgressTemplate struct {
// Process descriptor // Process descriptor
type Process struct { type Process struct {
id string Id string
url string Url string
params []string Params []string
Info DownloadInfo Info DownloadInfo
Progress DownloadProgress Progress DownloadProgress
mem *MemoryDB Output DownloadOutput
proc *os.Process proc *os.Process
} }
type downloadOutput struct { type DownloadOutput struct {
path string Path string
filaneme string Filename string
} }
// Starts spawns/forks a new yt-dlp process and parse its stdout. // Starts spawns/forks a new yt-dlp process and parse its stdout.
// The process is spawned to outputting a custom progress text that // The process is spawned to outputting a custom progress text that
// Resembles a JSON Object in order to Unmarshal it later. // Resembles a JSON Object in order to Unmarshal it later.
// This approach is anyhow not perfect: quotes are not escaped properly. // This approach is anyhow not perfect: quotes are not escaped properly.
// Each process is not identified by its PID but by a UUIDv2 // Each process is not identified by its PID but by a UUIDv4
func (p *Process) Start(path, filename string) { func (p *Process) Start() {
// escape bash variable escaping and command piping, you'll never know // escape bash variable escaping and command piping, you'll never know
// what they might come with... // what they might come with...
p.params = slices.Filter(p.params, func(e string) bool { p.Params = slices.Filter(p.Params, func(e string) bool {
match, _ := regexp.MatchString(`(\$\{)|(\&\&)`, e) match, _ := regexp.MatchString(`(\$\{)|(\&\&)`, e)
return !match return !match
}) })
out := downloadOutput{ out := DownloadOutput{
path: cfg.GetConfig().DownloadPath, Path: cfg.GetConfig().DownloadPath,
filaneme: "%(title)s.%(ext)s", Filename: "%(title)s.%(ext)s",
} }
if path != "" { if p.Output.Path != "" {
out.path = path out.Path = p.Output.Path
} }
if filename != "" { if p.Output.Filename != "" {
out.filaneme = filename + ".%(ext)s" out.Filename = p.Output.Filename + ".%(ext)s"
} }
params := append([]string{ params := append([]string{
strings.Split(p.url, "?list")[0], //no playlist strings.Split(p.Url, "?list")[0], //no playlist
"--newline", "--newline",
"--no-colors", "--no-colors",
"--no-playlist", "--no-playlist",
"--progress-template", strings.ReplaceAll(template, "\n", ""), "--progress-template", strings.ReplaceAll(template, "\n", ""),
"-o", "-o",
fmt.Sprintf("%s/%s", out.path, out.filaneme), fmt.Sprintf("%s/%s", out.Path, out.Filename),
}, p.params...) }, p.Params...)
// ----------------- main block ----------------- // // ----------------- main block ----------------- //
cmd := exec.Command(cfg.GetConfig().DownloaderPath, params...) cmd := exec.Command(cfg.GetConfig().DownloaderPath, params...)
@@ -103,73 +111,67 @@ func (p *Process) Start(path, filename string) {
log.Panicln(err) log.Panicln(err)
} }
p.id = p.mem.Set(p)
p.proc = cmd.Process p.proc = cmd.Process
// ----------------- info block ----------------- // // ----------------- info block ----------------- //
// spawn a goroutine that retrieves the info for the download // spawn a goroutine that retrieves the info for the download
go func() {
cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.url, "-J")
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
stdout, err := cmd.Output()
if err != nil {
log.Println("Cannot retrieve info for", p.url)
}
info := DownloadInfo{
URL: p.url,
CreatedAt: time.Now(),
}
json.Unmarshal(stdout, &info)
p.mem.UpdateInfo(p.id, info)
}()
// --------------- progress block --------------- // // --------------- progress block --------------- //
// unbuffered channel connected to stdout // unbuffered channel connected to stdout
eventChan := make(chan string)
// spawn a goroutine that does the dirty job of parsing the stdout // spawn a goroutine that does the dirty job of parsing the stdout
// filling the channel with as many stdout line as yt-dlp produces (producer) // filling the channel with as many stdout line as yt-dlp produces (producer)
go func() { go func() {
defer r.Close() defer func() {
defer p.Complete() r.Close()
p.Complete()
}()
for scan.Scan() { for scan.Scan() {
eventChan <- scan.Text() stdout := ProgressTemplate{}
err := json.Unmarshal(scan.Bytes(), &stdout)
if err == nil {
p.Progress = DownloadProgress{
Status: StatusDownloading,
Percentage: stdout.Percentage,
Speed: stdout.Speed,
ETA: stdout.Eta,
}
log.Println(
cli.BgGreen, "DL", cli.Reset,
cli.BgBlue, p.getShortId(), cli.Reset,
p.Url, stdout.Percentage,
)
}
} }
cmd.Wait()
}() }()
// do the unmarshal operation every 250ms (consumer)
go rx.Debounce(time.Millisecond*250, eventChan, func(text string) {
stdout := ProgressTemplate{}
err := json.Unmarshal([]byte(text), &stdout)
if err == nil {
p.mem.UpdateProgress(p.id, DownloadProgress{
Percentage: stdout.Percentage,
Speed: stdout.Speed,
ETA: stdout.Eta,
})
shortId := strings.Split(p.id, "-")[0]
log.Printf("[%s] %s %s\n", shortId, p.url, p.Progress.Percentage)
}
})
// ------------- end progress block ------------- // // ------------- end progress block ------------- //
cmd.Wait()
} }
// Keep process in the memoryDB but marks it as complete // Keep process in the memoryDB but marks it as complete
// Convention: All completed processes has progress -1 // Convention: All completed processes has progress -1
// and speed 0 bps. // and speed 0 bps.
func (p *Process) Complete() { func (p *Process) Complete() {
p.mem.UpdateProgress(p.id, DownloadProgress{ p.Progress = DownloadProgress{
Status: StatusCompleted,
Percentage: "-1", Percentage: "-1",
Speed: 0, Speed: 0,
ETA: 0, ETA: 0,
}) }
shortId := p.getShortId()
log.Println(
cli.BgMagenta, "FINISH", cli.Reset,
cli.BgBlue, shortId, cli.Reset,
p.Url,
)
} }
// Kill a process and remove it from the memory // Kill a process and remove it from the memory
func (p *Process) Kill() error { func (p *Process) Kill() error {
p.mem.Delete(p.id)
// yt-dlp uses multiple child process the parent process // yt-dlp uses multiple child process the parent process
// has been spawned with setPgid = true. To properly kill // has been spawned with setPgid = true. To properly kill
// all subprocesses a SIGTERM need to be sent to the correct // all subprocesses a SIGTERM need to be sent to the correct
@@ -181,30 +183,108 @@ func (p *Process) Kill() error {
} }
err = syscall.Kill(-pgid, syscall.SIGTERM) err = syscall.Kill(-pgid, syscall.SIGTERM)
log.Println("Killed process", p.id) log.Println("Killed process", p.Id)
return err return err
} }
return nil return nil
} }
// Returns the available format for this URL // Returns the available format for this URL
func (p *Process) GetFormatsSync() (DownloadFormats, error) { func (p *Process) GetFormatsSync() (DownloadFormats, error) {
cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.url, "-J") cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.Url, "-J")
stdout, err := cmd.Output() stdout, err := cmd.StdoutPipe()
if err != nil { if err != nil {
return DownloadFormats{}, err return DownloadFormats{}, err
} }
cmd.Wait() info := DownloadFormats{URL: p.Url}
info := DownloadFormats{URL: p.url}
best := Format{} best := Format{}
json.Unmarshal(stdout, &info) var (
json.Unmarshal(stdout, &best) wg sync.WaitGroup
decodingError error
)
wg.Add(2)
err = cmd.Start()
if err != nil {
return DownloadFormats{}, err
}
log.Println(
cli.BgRed, "Metadata", cli.Reset,
cli.BgBlue, p.getShortId(), cli.Reset,
p.Url,
)
go func() {
decodingError = json.NewDecoder(stdout).Decode(&info)
wg.Done()
}()
go func() {
decodingError = json.NewDecoder(stdout).Decode(&best)
wg.Done()
}()
wg.Wait()
cmd.Wait()
if decodingError != nil {
return DownloadFormats{}, err
}
info.Best = best info.Best = best
return info, nil return info, nil
} }
func (p *Process) SetPending() {
p.Progress.Status = StatusPending
}
func (p *Process) SetMetadata() error {
cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.Url, "-J")
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
stdout, err := cmd.StdoutPipe()
if err != nil {
log.Println("Cannot retrieve info for", p.Url)
return err
}
info := DownloadInfo{
URL: p.Url,
CreatedAt: time.Now(),
}
err = cmd.Start()
if err != nil {
return err
}
log.Println(
cli.BgRed, "Metadata", cli.Reset,
cli.BgBlue, p.getShortId(), cli.Reset,
p.Url,
)
err = json.NewDecoder(stdout).Decode(&info)
if err != nil {
return err
}
p.Info = info
p.Progress.Status = StatusPending
err = cmd.Wait()
return err
}
func (p *Process) getShortId() string {
return strings.Split(p.Id, "-")[0]
}

View File

@@ -9,13 +9,19 @@ type Stack[T any] struct {
count int count int
} }
func (s *Stack[T]) Push(n *Node[T]) { func NewStack[T any]() *Stack[T] {
return &Stack[T]{
Nodes: make([]*Node[T], 10),
}
}
func (s *Stack[T]) Push(val T) {
if s.count >= len(s.Nodes) { if s.count >= len(s.Nodes) {
Nodes := make([]*Node[T], len(s.Nodes)*2) Nodes := make([]*Node[T], len(s.Nodes)*2)
copy(Nodes, s.Nodes) copy(Nodes, s.Nodes)
s.Nodes = Nodes s.Nodes = Nodes
} }
s.Nodes[s.count] = n s.Nodes[s.count] = &Node[T]{Value: val}
s.count++ s.count++
} }

15
server/middleware/cors.go Normal file
View File

@@ -0,0 +1,15 @@
package middlewares
import "net/http"
// Middleware for applying CORS policy for ALL hosts and for
// allowing ALL request headers.
func CORS(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
w.Header().Set("Access-Control-Allow-Headers", "*")
w.Header().Set("Access-Control-Allow-Credentials", "true")
next.ServeHTTP(w, r)
})
}

View File

@@ -2,10 +2,10 @@ package middlewares
import ( import (
"fmt" "fmt"
"net/http"
"os" "os"
"time" "time"
"github.com/gofiber/fiber/v2"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/server/config"
) )
@@ -14,37 +14,49 @@ const (
TOKEN_COOKIE_NAME = "jwt" TOKEN_COOKIE_NAME = "jwt"
) )
var Authenticated = func(c *fiber.Ctx) error { func Authenticated(next http.Handler) http.Handler {
if !config.Instance().GetConfig().RequireAuth { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
return c.Next() if !config.Instance().GetConfig().RequireAuth {
} next.ServeHTTP(w, r)
return
cookie := c.Cookies(TOKEN_COOKIE_NAME)
if cookie == "" {
return c.Status(fiber.StatusUnauthorized).SendString("invalid token")
}
token, _ := jwt.Parse(cookie, func(t *jwt.Token) (interface{}, error) {
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
} }
return []byte(os.Getenv("JWT_SECRET")), nil
})
if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid { cookie, err := r.Cookie(TOKEN_COOKIE_NAME)
expiresAt, err := time.Parse(time.RFC3339, claims["expiresAt"].(string))
if err != nil { if err != nil {
return c.SendStatus(fiber.StatusInternalServerError) http.Error(w, "invalid token", http.StatusBadRequest)
return
} }
if time.Now().After(expiresAt) { if cookie == nil {
return c.Status(fiber.StatusBadRequest).SendString("expired token") http.Error(w, "invalid token", http.StatusBadRequest)
return
} }
} else {
return c.Status(fiber.StatusUnauthorized).SendString("invalid token")
}
return c.Next() token, _ := jwt.Parse(cookie.Value, func(t *jwt.Token) (interface{}, error) {
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
}
return []byte(os.Getenv("JWTSECRET")), nil
})
if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid {
expiresAt, err := time.Parse(time.RFC3339, claims["expiresAt"].(string))
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
if time.Now().After(expiresAt) {
http.Error(w, "token expired", http.StatusBadRequest)
return
}
} else {
http.Error(w, "invalid token", http.StatusBadRequest)
return
}
next.ServeHTTP(w, r)
})
} }

View File

@@ -0,0 +1,93 @@
package middlewares
import (
"fmt"
"io"
"io/fs"
"mime"
"net/http"
"os"
"path/filepath"
"strings"
)
type SpaHandler struct {
Entrypoint string
Filesystem fs.FS
routes []string
}
func NewSpaHandler(index string, fs fs.FS) *SpaHandler {
return &SpaHandler{
Entrypoint: index,
Filesystem: fs,
}
}
func (s *SpaHandler) AddClientRoute(route string) *SpaHandler {
s.routes = append(s.routes, route)
return s
}
// Handler for serving a compiled react frontend
// each client-side routes must be provided
func (s *SpaHandler) Handler() http.HandlerFunc {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(
w,
http.StatusText(http.StatusMethodNotAllowed),
http.StatusMethodNotAllowed,
)
return
}
path := filepath.Clean(r.URL.Path)
// basically all frontend routes are needed :/
hasRoute := false
for _, route := range s.routes {
hasRoute = strings.HasPrefix(path, route)
if hasRoute {
break
}
}
if path == "/" || hasRoute {
path = s.Entrypoint
}
path = strings.TrimPrefix(path, "/")
file, err := s.Filesystem.Open(path)
if err != nil {
if os.IsNotExist(err) {
http.NotFound(w, r)
return
}
http.Error(
w,
http.StatusText(http.StatusInternalServerError),
http.StatusInternalServerError,
)
return
}
contentType := mime.TypeByExtension(filepath.Ext(path))
w.Header().Set("Content-Type", contentType)
if strings.HasPrefix(path, "assets/") {
w.Header().Set("Cache-Control", "public, max-age=2592000")
}
stat, err := file.Stat()
if err == nil && stat.Size() > 0 {
w.Header().Set("Content-Length", fmt.Sprintf("%d", stat.Size()))
}
w.WriteHeader(http.StatusOK)
io.Copy(w, file)
})
}

25
server/rest/container.go Normal file
View File

@@ -0,0 +1,25 @@
package rest
import (
"github.com/go-chi/chi/v5"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
)
func Container(db *internal.MemoryDB, mq *internal.MessageQueue) *Handler {
var (
service = ProvideService(db, mq)
handler = ProvideHandler(service)
)
return handler
}
func ApplyRouter(db *internal.MemoryDB, mq *internal.MessageQueue) func(chi.Router) {
h := Container(db, mq)
return func(r chi.Router) {
r.Use(middlewares.Authenticated)
r.Post("/exec", h.Exec())
r.Get("/running", h.Running())
}
}

View File

@@ -1,195 +1,56 @@
package rest package rest
import ( import (
"encoding/hex"
"errors"
"net/http" "net/http"
"os"
"path/filepath"
"sort"
"strings"
"time"
"github.com/gofiber/fiber/v2" "github.com/goccy/go-json"
"github.com/golang-jwt/jwt/v5" "github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
) )
const ( type Handler struct {
TOKEN_COOKIE_NAME = "jwt" service *Service
)
type DirectoryEntry struct {
Name string `json:"name"`
Path string `json:"path"`
Size int64 `json:"size"`
SHASum string `json:"shaSum"`
ModTime time.Time `json:"modTime"`
IsVideo bool `json:"isVideo"`
IsDirectory bool `json:"isDirectory"`
} }
func walkDir(root string) (*[]DirectoryEntry, error) { func (h *Handler) Exec() http.HandlerFunc {
files := []DirectoryEntry{} return func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
dirs, err := os.ReadDir(root) w.Header().Set("Content-Type", "application/json")
if err != nil {
return nil, err
}
for _, d := range dirs { req := internal.DownloadRequest{}
if !utils.IsValidEntry(d) {
continue if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
} }
path := filepath.Join(root, d.Name()) id, err := h.service.Exec(req)
info, err := d.Info()
if err != nil { if err != nil {
return nil, err http.Error(w, err.Error(), http.StatusInternalServerError)
return
} }
files = append(files, DirectoryEntry{ err = json.NewEncoder(w).Encode(id)
Path: path, if err != nil {
Name: d.Name(), http.Error(w, err.Error(), http.StatusInternalServerError)
Size: info.Size(), }
SHASum: utils.ShaSumString(path),
IsVideo: utils.IsVideo(d),
IsDirectory: d.IsDir(),
ModTime: info.ModTime(),
})
} }
return &files, err
} }
type ListRequest struct { func (h *Handler) Running() http.HandlerFunc {
SubDir string `json:"subdir"` return func(w http.ResponseWriter, r *http.Request) {
OrderBy string `json:"orderBy"` defer r.Body.Close()
}
w.Header().Set("Content-Type", "application/json")
func ListDownloaded(ctx *fiber.Ctx) error {
root := config.Instance().GetConfig().DownloadPath res, err := h.service.Running(r.Context())
req := new(ListRequest) if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
err := ctx.BodyParser(req) return
if err != nil { }
return err
} err = json.NewEncoder(w).Encode(res)
if err != nil {
files, err := walkDir(filepath.Join(root, req.SubDir)) http.Error(w, err.Error(), http.StatusInternalServerError)
if err != nil { }
return err }
}
if req.OrderBy == "modtime" {
sort.SliceStable(*files, func(i, j int) bool {
return (*files)[i].ModTime.After((*files)[j].ModTime)
})
}
ctx.Status(http.StatusOK)
return ctx.JSON(files)
}
type DeleteRequest = DirectoryEntry
func DeleteFile(ctx *fiber.Ctx) error {
req := new(DeleteRequest)
err := ctx.BodyParser(req)
if err != nil {
return err
}
sum := utils.ShaSumString(req.Path)
if sum != req.SHASum {
return errors.New("shasum mismatch")
}
err = os.Remove(req.Path)
if err != nil {
return err
}
ctx.Status(fiber.StatusOK)
return ctx.JSON("ok")
}
func SendFile(ctx *fiber.Ctx) error {
path := ctx.Params("id")
if path == "" {
return errors.New("inexistent path")
}
decoded, err := hex.DecodeString(path)
if err != nil {
return err
}
decodedStr := string(decoded)
root := config.Instance().GetConfig().DownloadPath
// TODO: further path / file validations
if strings.Contains(filepath.Dir(decodedStr), root) {
// ctx.Response().Header.Set(
// "Content-Disposition",
// "inline; filename="+filepath.Base(decodedStr),
// )
ctx.SendStatus(fiber.StatusOK)
return ctx.SendFile(decodedStr)
}
return ctx.SendStatus(fiber.StatusUnauthorized)
}
type LoginRequest struct {
Secret string `json:"secret"`
}
func Login(ctx *fiber.Ctx) error {
req := new(LoginRequest)
err := ctx.BodyParser(req)
if err != nil {
return ctx.SendStatus(fiber.StatusInternalServerError)
}
if config.Instance().GetConfig().RPCSecret != req.Secret {
return ctx.SendStatus(fiber.StatusBadRequest)
}
token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
"expiresAt": time.Now().Add(time.Minute * 30),
})
tokenString, err := token.SignedString([]byte(os.Getenv("JWT_SECRET")))
if err != nil {
return ctx.SendStatus(fiber.StatusInternalServerError)
}
ctx.Cookie(&fiber.Cookie{
Name: TOKEN_COOKIE_NAME,
HTTPOnly: true,
Secure: false,
Expires: time.Now().Add(time.Hour * 24 * 30), // 30 days
Value: tokenString,
Path: "/",
})
return ctx.SendStatus(fiber.StatusOK)
}
func Logout(ctx *fiber.Ctx) error {
ctx.Cookie(&fiber.Cookie{
Name: TOKEN_COOKIE_NAME,
HTTPOnly: true,
Secure: false,
Expires: time.Now(),
Value: "",
Path: "/",
})
return ctx.SendStatus(fiber.StatusOK)
} }

34
server/rest/provider.go Normal file
View File

@@ -0,0 +1,34 @@
package rest
import (
"sync"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
)
var (
service *Service
handler *Handler
serviceOnce sync.Once
handlerOnce sync.Once
)
func ProvideService(db *internal.MemoryDB, mq *internal.MessageQueue) *Service {
serviceOnce.Do(func() {
service = &Service{
db: db,
mq: mq,
}
})
return service
}
func ProvideHandler(svc *Service) *Handler {
handlerOnce.Do(func() {
handler = &Handler{
service: svc,
}
})
return handler
}

38
server/rest/service.go Normal file
View File

@@ -0,0 +1,38 @@
package rest
import (
"context"
"errors"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
)
type Service struct {
db *internal.MemoryDB
mq *internal.MessageQueue
}
func (s *Service) Exec(req internal.DownloadRequest) (string, error) {
p := &internal.Process{
Url: req.URL,
Params: req.Params,
Output: internal.DownloadOutput{
Path: req.Path,
Filename: req.Rename,
},
}
id := s.db.Set(p)
s.mq.Publish(p)
return id, nil
}
func (s *Service) Running(ctx context.Context) (*[]internal.ProcessResponse, error) {
select {
case <-ctx.Done():
return nil, errors.New("context cancelled")
default:
return s.db.All(), nil
}
}

24
server/rpc/container.go Normal file
View File

@@ -0,0 +1,24 @@
package rpc
import (
"github.com/go-chi/chi/v5"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
)
// Dependency injection container.
func Container(db *internal.MemoryDB, mq *internal.MessageQueue) *Service {
return &Service{
db: db,
mq: mq,
}
}
// RPC service must be registered before applying this router!
func ApplyRouter() func(chi.Router) {
return func(r chi.Router) {
r.Use(middlewares.Authenticated)
r.Get("/ws", WebSocket)
r.Post("/http", Post)
}
}

57
server/rpc/handlers.go Normal file
View File

@@ -0,0 +1,57 @@
package rpc
import (
"io"
"net/http"
"github.com/gorilla/websocket"
)
var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool {
return true
},
}
func WebSocket(w http.ResponseWriter, r *http.Request) {
c, err := upgrader.Upgrade(w, r, nil)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
defer c.Close()
// notify client that conn is open and ok
c.WriteJSON(struct{ Status string }{Status: "connected"})
for {
mtype, reader, err := c.NextReader()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
break
}
res := newRequest(reader).Call()
writer, err := c.NextWriter(mtype)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
break
}
io.Copy(writer, res)
}
}
func Post(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
res := newRequest(r.Body).Call()
_, err := io.Copy(w, res)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
}

159
server/rpc/service.go Normal file
View File

@@ -0,0 +1,159 @@
package rpc
import (
"log"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
"github.com/marcopeocchi/yt-dlp-web-ui/server/sys"
"github.com/marcopeocchi/yt-dlp-web-ui/server/updater"
)
type Service struct {
db *internal.MemoryDB
mq *internal.MessageQueue
}
type Running []internal.ProcessResponse
type Pending []string
type NoArgs struct{}
type Args struct {
Id string
URL string
Params []string
}
// Exec spawns a Process.
// The result of the execution is the newly spawned process Id.
func (s *Service) Exec(args internal.DownloadRequest, result *string) error {
p := &internal.Process{
Url: args.URL,
Params: args.Params,
Output: internal.DownloadOutput{
Path: args.Path,
Filename: args.Rename,
},
}
s.db.Set(p)
s.mq.Publish(p)
*result = p.Id
return nil
}
// Exec spawns a Process.
// The result of the execution is the newly spawned process Id.
func (s *Service) ExecPlaylist(args internal.DownloadRequest, result *string) error {
err := internal.PlaylistDetect(args, s.mq, s.db)
if err != nil {
return err
}
*result = ""
return nil
}
// Progess retrieves the Progress of a specific Process given its Id
func (s *Service) Progess(args Args, progress *internal.DownloadProgress) error {
proc, err := s.db.Get(args.Id)
if err != nil {
return err
}
*progress = proc.Progress
return nil
}
// Progess retrieves available format for a given resource
func (s *Service) Formats(args Args, progress *internal.DownloadFormats) error {
var err error
p := internal.Process{Url: args.URL}
*progress, err = p.GetFormatsSync()
return err
}
// Pending retrieves a slice of all Pending/Running processes ids
func (s *Service) Pending(args NoArgs, pending *Pending) error {
*pending = *s.db.Keys()
return nil
}
// Running retrieves a slice of all Processes progress
func (s *Service) Running(args NoArgs, running *Running) error {
*running = *s.db.All()
return nil
}
// Kill kills a process given its id and remove it from the memoryDB
func (s *Service) Kill(args string, killed *string) error {
log.Println("Trying killing process with id", args)
proc, err := s.db.Get(args)
if err != nil {
return err
}
if proc != nil {
err = proc.Kill()
s.db.Delete(proc.Id)
}
s.db.Delete(proc.Id)
return err
}
// KillAll kills all process unconditionally and removes them from
// the memory db
func (s *Service) KillAll(args NoArgs, killed *string) error {
log.Println("Killing all spawned processes", args)
keys := s.db.Keys()
var err error
for _, key := range *keys {
proc, err := s.db.Get(key)
if err != nil {
return err
}
if proc != nil {
proc.Kill()
s.db.Delete(proc.Id)
}
}
s.mq.Empty()
return err
}
// Remove a process from the db rendering it unusable if active
func (s *Service) Clear(args string, killed *string) error {
log.Println("Clearing process with id", args)
s.db.Delete(args)
return nil
}
// FreeSpace gets the available from package sys util
func (s *Service) FreeSpace(args NoArgs, free *uint64) error {
freeSpace, err := sys.FreeSpace()
*free = freeSpace
return err
}
// Return a flattned tree of the download directory
func (s *Service) DirectoryTree(args NoArgs, tree *[]string) error {
dfsTree, err := sys.DirectoryTree()
if dfsTree != nil {
*tree = *dfsTree
}
return err
}
// Updates the yt-dlp binary using its builtin function
func (s *Service) UpdateExecutable(args NoArgs, updated *bool) error {
log.Println("Updating yt-dlp executable to the latest release")
err := updater.UpdateExecutable()
if err != nil {
*updated = true
return err
}
*updated = false
return err
}

View File

@@ -1,4 +1,4 @@
package server package rpc
import ( import (
"bytes" "bytes"
@@ -13,7 +13,7 @@ type rpcRequest struct {
done chan bool done chan bool
} }
func NewRPCRequest(r io.Reader) *rpcRequest { func newRequest(r io.Reader) *rpcRequest {
var buf bytes.Buffer var buf bytes.Buffer
done := make(chan bool) done := make(chan bool)
return &rpcRequest{r, &buf, done} return &rpcRequest{r, &buf, done}

View File

@@ -3,7 +3,6 @@ package server
import ( import (
"context" "context"
"fmt" "fmt"
"io"
"io/fs" "io/fs"
"log" "log"
"net/http" "net/http"
@@ -13,93 +12,87 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/gofiber/fiber/v2" "github.com/go-chi/chi/v5"
"github.com/gofiber/fiber/v2/middleware/cors" "github.com/go-chi/chi/v5/middleware"
"github.com/gofiber/fiber/v2/middleware/filesystem" "github.com/go-chi/cors"
"github.com/gofiber/websocket/v2" "github.com/marcopeocchi/yt-dlp-web-ui/server/handlers"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware" middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
"github.com/marcopeocchi/yt-dlp-web-ui/server/rest" "github.com/marcopeocchi/yt-dlp-web-ui/server/rest"
ytdlpRPC "github.com/marcopeocchi/yt-dlp-web-ui/server/rpc"
) )
var db MemoryDB type serverConfig struct {
frontend fs.FS
func RunBlocking(port int, frontend fs.FS) { port int
db.Restore() db *internal.MemoryDB
mq *internal.MessageQueue
service := new(Service)
rpc.Register(service)
app := fiber.New()
app.Use(cors.New())
app.Use("/", filesystem.New(filesystem.Config{
Root: http.FS(frontend),
}))
// Client side routes
app.Get("/settings", func(c *fiber.Ctx) error {
return c.Redirect("/")
})
app.Get("/archive", func(c *fiber.Ctx) error {
return c.Redirect("/")
})
app.Get("/login", func(c *fiber.Ctx) error {
return c.Redirect("/")
})
// Archive routes
archive := app.Group("archive", middlewares.Authenticated)
archive.Post("/downloaded", rest.ListDownloaded)
archive.Post("/delete", rest.DeleteFile)
archive.Get("/d/:id", rest.SendFile)
// Authentication routes
app.Post("/auth/login", rest.Login)
app.Get("/auth/logout", rest.Logout)
// RPC handlers
// websocket
rpc := app.Group("/rpc", middlewares.Authenticated)
rpc.Get("/ws", websocket.New(func(c *websocket.Conn) {
c.WriteMessage(websocket.TextMessage, []byte(`{
"status": "connected"
}`))
for {
mtype, reader, err := c.NextReader()
if err != nil {
break
}
res := NewRPCRequest(reader).Call()
writer, err := c.NextWriter(mtype)
if err != nil {
break
}
io.Copy(writer, res)
}
}))
// http-post
rpc.Post("/http", func(c *fiber.Ctx) error {
reader := c.Context().RequestBodyStream()
writer := c.Response().BodyWriter()
res := NewRPCRequest(reader).Call()
io.Copy(writer, res)
return nil
})
app.Server().StreamRequestBody = true
go gracefulShutdown(app)
go autoPersist(time.Minute * 5)
log.Fatal(app.Listen(fmt.Sprintf(":%d", port)))
} }
func gracefulShutdown(app *fiber.App) { func RunBlocking(port int, frontend fs.FS) {
var db internal.MemoryDB
db.Restore()
mq := internal.NewMessageQueue()
go mq.Subscriber()
srv := newServer(serverConfig{
frontend: frontend,
port: port,
db: &db,
mq: mq,
})
// http-post
go gracefulShutdown(srv, &db)
go autoPersist(time.Minute*5, &db)
log.Fatal(srv.ListenAndServe())
}
func newServer(c serverConfig) *http.Server {
service := ytdlpRPC.Container(c.db, c.mq)
rpc.Register(service)
r := chi.NewRouter()
r.Use(cors.AllowAll().Handler)
r.Use(middleware.Logger)
sh := middlewares.NewSpaHandler("index.html", c.frontend)
sh.AddClientRoute("/settings")
sh.AddClientRoute("/archive")
sh.AddClientRoute("/login")
r.Get("/*", sh.Handler())
// Archive routes
r.Route("/archive", func(r chi.Router) {
r.Use(middlewares.Authenticated)
r.Post("/downloaded", handlers.ListDownloaded)
r.Post("/delete", handlers.DeleteFile)
r.Get("/d/{id}", handlers.SendFile)
})
// Authentication routes
r.Route("/auth", func(r chi.Router) {
r.Post("/login", handlers.Login)
r.Get("/logout", handlers.Logout)
})
// RPC handlers
r.Route("/rpc", ytdlpRPC.ApplyRouter())
// REST API handlers
r.Route("/api/v1", rest.ApplyRouter(c.db, c.mq))
return &http.Server{
Addr: fmt.Sprintf(":%d", c.port),
Handler: r,
}
}
func gracefulShutdown(srv *http.Server, db *internal.MemoryDB) {
ctx, stop := signal.NotifyContext(context.Background(), ctx, stop := signal.NotifyContext(context.Background(),
os.Interrupt, os.Interrupt,
syscall.SIGTERM, syscall.SIGTERM,
@@ -113,12 +106,12 @@ func gracefulShutdown(app *fiber.App) {
defer func() { defer func() {
db.Persist() db.Persist()
stop() stop()
app.ShutdownWithTimeout(time.Second * 5) srv.Shutdown(context.TODO())
}() }()
}() }()
} }
func autoPersist(d time.Duration) { func autoPersist(d time.Duration, db *internal.MemoryDB) {
for { for {
db.Persist() db.Persist()
time.Sleep(d) time.Sleep(d)

View File

@@ -1,136 +0,0 @@
package server
import (
"log"
"github.com/marcopeocchi/yt-dlp-web-ui/server/sys"
"github.com/marcopeocchi/yt-dlp-web-ui/server/updater"
)
type Service int
type Running []ProcessResponse
type Pending []string
type NoArgs struct{}
type Args struct {
Id string
URL string
Params []string
}
type DownloadSpecificArgs struct {
Id string
URL string
Path string
Rename string
Params []string
}
// Exec spawns a Process.
// The result of the execution is the newly spawned process Id.
func (t *Service) Exec(args DownloadSpecificArgs, result *string) error {
log.Println("Spawning new process for", args.URL)
p := Process{mem: &db, url: args.URL, params: args.Params}
p.Start(args.Path, args.Rename)
*result = p.id
return nil
}
// Progess retrieves the Progress of a specific Process given its Id
func (t *Service) Progess(args Args, progress *DownloadProgress) error {
proc, err := db.Get(args.Id)
if err != nil {
return err
}
*progress = proc.Progress
return nil
}
// Progess retrieves the Progress of a specific Process given its Id
func (t *Service) Formats(args Args, progress *DownloadFormats) error {
var err error
p := Process{url: args.URL}
*progress, err = p.GetFormatsSync()
return err
}
// Pending retrieves a slice of all Pending/Running processes ids
func (t *Service) Pending(args NoArgs, pending *Pending) error {
*pending = *db.Keys()
return nil
}
// Running retrieves a slice of all Processes progress
func (t *Service) Running(args NoArgs, running *Running) error {
*running = *db.All()
return nil
}
// Kill kills a process given its id and remove it from the memoryDB
func (t *Service) Kill(args string, killed *string) error {
log.Println("Trying killing process with id", args)
proc, err := db.Get(args)
if err != nil {
return err
}
if proc != nil {
err = proc.Kill()
}
db.Delete(proc.id)
return err
}
// KillAll kills all process unconditionally and removes them from
// the memory db
func (t *Service) KillAll(args NoArgs, killed *string) error {
log.Println("Killing all spawned processes", args)
keys := db.Keys()
var err error
for _, key := range *keys {
proc, err := db.Get(key)
if err != nil {
return err
}
if proc != nil {
proc.Kill()
}
}
return err
}
// Remove a process from the db rendering it unusable if active
func (t *Service) Clear(args string, killed *string) error {
log.Println("Clearing process with id", args)
db.Delete(args)
return nil
}
// FreeSpace gets the available from package sys util
func (t *Service) FreeSpace(args NoArgs, free *uint64) error {
freeSpace, err := sys.FreeSpace()
*free = freeSpace
return err
}
// Return a flattned tree of the download directory
func (t *Service) DirectoryTree(args NoArgs, tree *[]string) error {
dfsTree, err := sys.DirectoryTree()
*tree = *dfsTree
return err
}
// Updates the yt-dlp binary using its builtin function
func (t *Service) UpdateExecutable(args NoArgs, updated *bool) error {
log.Println("Updating yt-dlp executable to the latest release")
err := updater.UpdateExecutable()
if err != nil {
*updated = true
return err
}
*updated = false
return err
}

View File

@@ -28,15 +28,11 @@ func DirectoryTree() (*[]string, error) {
rootPath := config.Instance().GetConfig().DownloadPath rootPath := config.Instance().GetConfig().DownloadPath
stack := internal.Stack[Node]{ stack := internal.NewStack[Node]()
Nodes: make([]*internal.Node[Node], 5),
}
flattened := make([]string, 0) flattened := make([]string, 0)
root := Node{path: rootPath} stack.Push(Node{path: rootPath})
stack.Push(&internal.Node[Node]{
Value: root,
})
flattened = append(flattened, rootPath) flattened = append(flattened, rootPath)
for stack.IsNotEmpty() { for stack.IsNotEmpty() {
@@ -51,9 +47,7 @@ func DirectoryTree() (*[]string, error) {
if entry.IsDir() { if entry.IsDir() {
current.children = append(current.children, childNode) current.children = append(current.children, childNode)
stack.Push(&internal.Node[Node]{ stack.Push(childNode)
Value: childNode,
})
flattened = append(flattened, childNode.path) flattened = append(flattened, childNode.path)
} }
} }

View File

@@ -1,45 +0,0 @@
package updater
import (
"io"
"log"
"net/http"
"github.com/goccy/go-json"
)
const (
gitHubAPILatest = "https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest"
gitHubAPIDownload = "https://api.github.com/repos/yt-dlp/yt-dlp/releases/download"
)
var (
client = &http.Client{
CheckRedirect: http.DefaultClient.CheckRedirect,
}
)
func getLatestReleaseTag() (string, error) {
res, err := client.Get(gitHubAPILatest)
if err != nil {
log.Println("Cannot get release tag from GitHub API")
return "", err
}
defer res.Body.Close()
body, err := io.ReadAll(res.Body)
if err != nil {
log.Println("Cannot parse response from GitHub API")
return "", err
}
tag := ReleaseLatestResponse{}
json.Unmarshal(body, &tag)
return tag.TagName, nil
}
func ForceUpdate() {
getLatestReleaseTag()
}

View File

@@ -1,6 +0,0 @@
package updater
type ReleaseLatestResponse struct {
Name string `json:"name"`
TagName string `json:"tag_name"`
}

View File

@@ -6,13 +6,14 @@ import (
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/server/config"
) )
var path = config.Instance().GetConfig().DownloaderPath
// Update using the builtin function of yt-dlp // Update using the builtin function of yt-dlp
func UpdateExecutable() error { func UpdateExecutable() error {
cmd := exec.Command(path, "-U") cmd := exec.Command(config.Instance().GetConfig().DownloaderPath, "-U")
cmd.Start()
err := cmd.Wait() err := cmd.Start()
return err if err != nil {
return err
}
return cmd.Wait()
} }