diff --git a/Dockerfile b/Dockerfile
index ed018ac..27ae8d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN sh ./ffmpeg-fetch.sh
# Create our Ubuntu 22.04 with node 16
# Go to 20.04
FROM ubuntu:20.04 AS base
-ENV DEBIAN_FRONTEND=noninteractive
+ARG DEBIAN_FRONTEND=noninteractive
ENV UID=1000
ENV GID=1000
ENV USER=youtube
@@ -18,7 +18,7 @@ ENV PM2_HOME=/app/pm2
ENV ALLOW_CONFIG_MUTATIONS=true
RUN groupadd -g $GID $USER && useradd --system -m -g $USER --uid $UID $USER && \
apt update && \
- apt install -y --no-install-recommends curl ca-certificates && \
+ apt install -y --no-install-recommends curl ca-certificates tzdata && \
curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
apt install -y --no-install-recommends nodejs && \
npm -g install npm && \
diff --git a/backend/app.js b/backend/app.js
index ed1823b..48c0b95 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -68,7 +68,8 @@ db.defaults(
configWriteFlag: false,
downloads: {},
subscriptions: [],
- files_to_db_migration_complete: false
+ files_to_db_migration_complete: false,
+ tasks_manager_role_migration_complete: false
}).write();
users_db.defaults(
@@ -189,6 +190,15 @@ async function checkMigrations() {
else { logger.error('Migration failed: 4.2->4.3+'); }
}
+ const tasks_manager_role_migration_complete = db.get('tasks_manager_role_migration_complete').value();
+ if (!tasks_manager_role_migration_complete) {
+ logger.info('Checking if tasks manager role permissions exist for admin user...');
+ const success = await auth_api.changeRolePermissions('admin', 'tasks_manager', 'yes');
+ if (success) logger.info('Task manager permissions check complete!');
+ else logger.error('Failed to auto add tasks manager permissions to admin role!');
+ db.set('tasks_manager_role_migration_complete', true).write();
+ }
+
return true;
}
diff --git a/backend/authentication/auth.js b/backend/authentication/auth.js
index e6fa23c..92740d1 100644
--- a/backend/authentication/auth.js
+++ b/backend/authentication/auth.js
@@ -361,7 +361,6 @@ exports.userHasPermission = async function(user_uid, permission) {
logger.error('Invalid role ' + role);
return false;
}
- const role_permissions = (await db_api.getRecords('roles'))['permissions'];
const user_has_explicit_permission = user_obj['permissions'].includes(permission);
const permission_in_overrides = user_obj['permission_overrides'].includes(permission);
@@ -376,7 +375,8 @@ exports.userHasPermission = async function(user_uid, permission) {
}
// no overrides, let's check if the role has the permission
- if (role_permissions.includes(permission)) {
+ const role_has_permission = await exports.roleHasPermissions(role, permission);
+ if (role_has_permission) {
return true;
} else {
logger.verbose(`User ${user_uid} failed to get permission ${permission}`);
@@ -384,6 +384,16 @@ exports.userHasPermission = async function(user_uid, permission) {
}
}
+exports.roleHasPermissions = async function(role, permission) {
+ const role_obj = await db_api.getRecord('roles', {key: role})
+ if (!role) {
+ logger.error(`Role ${role} does not exist!`);
+ }
+ const role_permissions = role_obj['permissions'];
+ if (role_permissions && role_permissions.includes(permission)) return true;
+ else return false;
+}
+
exports.userPermissions = async function(user_uid) {
let user_permissions = [];
const user_obj = await db_api.getRecord('users', ({uid: user_uid}));
diff --git a/backend/consts.js b/backend/consts.js
index f473e07..bf1ed47 100644
--- a/backend/consts.js
+++ b/backend/consts.js
@@ -221,7 +221,8 @@ exports.AVAILABLE_PERMISSIONS = [
'subscriptions',
'sharing',
'advanced_download',
- 'downloads_manager'
+ 'downloads_manager',
+ 'tasks_manager'
];
exports.DETAILS_BIN_PATH = 'node_modules/youtube-dl/bin/details'
diff --git a/backend/utils.js b/backend/utils.js
index 3aac116..78d02f1 100644
--- a/backend/utils.js
+++ b/backend/utils.js
@@ -172,7 +172,7 @@ function getExpectedFileSize(input_info_jsons) {
const formats = info_json['format_id'].split('+');
let individual_expected_filesize = 0;
formats.forEach(format_id => {
- if(info_json.formats !== undefined) {
+ if (info_json.formats !== undefined) {
info_json.formats.forEach(available_format => {
if (available_format.format_id === format_id && (available_format.filesize || available_format.filesize_approx)) {
individual_expected_filesize += (available_format.filesize ? available_format.filesize : available_format.filesize_approx);
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ab792a..0a9133d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,11 +19,9 @@ services:
image: tzahi12345/youtubedl-material:latest
ytdl-mongo-db:
image: mongo
- ports:
- - "27017:27017"
logging:
driver: "none"
container_name: mongo-db
restart: always
volumes:
- - ./db/:/data/db
\ No newline at end of file
+ - ./db/:/data/db
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 278b8fe..c2d79a2 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -44,7 +44,7 @@
Login
Subscriptions
Downloads
- Tasks
+ Tasks
Settings
diff --git a/src/app/components/manage-role/manage-role.component.ts b/src/app/components/manage-role/manage-role.component.ts
index dbe2511..2f13e0a 100644
--- a/src/app/components/manage-role/manage-role.component.ts
+++ b/src/app/components/manage-role/manage-role.component.ts
@@ -14,12 +14,13 @@ export class ManageRoleComponent implements OnInit {
permissions = null;
permissionToLabel = {
- 'filemanager': 'File manager',
- 'settings': 'Settings access',
- 'subscriptions': 'Subscriptions',
- 'sharing': 'Share files',
- 'advanced_download': 'Use advanced download mode',
- 'downloads_manager': 'Use downloads manager'
+ 'filemanager': $localize`File manager`,
+ 'settings': $localize`Settings access`,
+ 'subscriptions': $localize`Subscriptions`,
+ 'sharing': $localize`Share files`,
+ 'advanced_download': $localize`Use advanced download mode`,
+ 'downloads_manager': $localize`Use downloads manager`,
+ 'tasks_manager': $localize`Use tasks manager`,
}
constructor(public postsService: PostsService, private dialogRef: MatDialogRef,
diff --git a/src/app/posts.services.ts b/src/app/posts.services.ts
index 9115437..8e74bed 100644
--- a/src/app/posts.services.ts
+++ b/src/app/posts.services.ts
@@ -4,7 +4,7 @@ import 'rxjs/add/operator/map';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { THEMES_CONFIG } from '../themes';
-import { Router, CanActivate } from '@angular/router';
+import { Router, CanActivate, ActivatedRouteSnapshot } from '@angular/router';
import { DOCUMENT } from '@angular/common';
import { BehaviorSubject } from 'rxjs';
import { MatSnackBar } from '@angular/material/snack-bar';
@@ -229,12 +229,15 @@ export class PostsService implements CanActivate {
}
}
- canActivate(route, state): Promise {
- return new Promise(resolve => {
- resolve(true);
- })
- console.log(route);
- throw new Error('Method not implemented.');
+ canActivate(route: ActivatedRouteSnapshot, state): Promise {
+ const PATH_TO_REQUIRED_PERM = {
+ settings: 'settings',
+ subscriptions: 'subscriptions',
+ downloads: 'downloads_manager',
+ tasks: 'tasks_manager'
+ }
+ const required_perm = PATH_TO_REQUIRED_PERM[route.routeConfig.path];
+ return required_perm ? this.hasPermission(required_perm) : true;
}
setTheme(theme) {
diff --git a/src/assets/i18n/messages.en.xlf b/src/assets/i18n/messages.en.xlf
index e561642..99b9861 100644
--- a/src/assets/i18n/messages.en.xlf
+++ b/src/assets/i18n/messages.en.xlf
@@ -645,6 +645,55 @@
Close
+
+ File manager
+
+ src/app/components/manage-role/manage-role.component.ts
+ 17
+
+
+
+ Settings access
+
+ src/app/components/manage-role/manage-role.component.ts
+ 18
+
+
+
+ Subscriptions
+
+ src/app/components/manage-role/manage-role.component.ts
+ 19
+
+
+
+ Share files
+
+ src/app/components/manage-role/manage-role.component.ts
+ 20
+
+
+
+ Use advanced download mode
+
+ src/app/components/manage-role/manage-role.component.ts
+ 21
+
+
+
+ Use downloads manager
+
+ src/app/components/manage-role/manage-role.component.ts
+ 22
+
+
+
+ Use tasks manager
+
+ src/app/components/manage-role/manage-role.component.ts
+ 23
+
+
Manage user
diff --git a/src/assets/i18n/messages.it.xlf b/src/assets/i18n/messages.it.xlf
index d02bf02..076bc0f 100644
--- a/src/assets/i18n/messages.it.xlf
+++ b/src/assets/i18n/messages.it.xlf
@@ -3332,7 +3332,7 @@
Database information could not be retrieved. Check the server logs for more information.
- Impossibile recuperare le informazioni del database. Controllare i registri del server per ulteriori informazioni.
+ Impossibile recuperare le informazioni del database. Controllare il registro del server per ulteriori informazioni.
src/app/settings/settings.component.html
333
@@ -3347,6 +3347,698 @@
48
+
+ Playlist successfully removed.', '
+ Playlist rimossa con successo.', '
+
+ src/app/components/custom-playlists/custom-playlists.component.ts
+ 99
+
+
+
+ Select downloads to clear
+ Seleziona i download da cancellare
+
+ src/app/components/downloads/downloads.component.ts
+ 132
+
+
+
+ Errored downloads
+ Download errati
+
+ src/app/components/downloads/downloads.component.ts
+ 146
+
+
+
+ Failed to clear finished downloads!
+ Cancellazione dei download finiti non riuscita!
+
+ src/app/components/downloads/downloads.component.ts
+ 157
+
+
+
+ Cleared downloads!
+ Download cancellati!
+
+ src/app/components/downloads/downloads.component.ts
+ 159
+
+
+
+ Logs successfully cleared!
+ Registro cancellato con successo!
+
+ src/app/components/logs-viewer/logs-viewer.component.ts
+ 75
+
+
+
+ Failed to clear logs!
+ Impossibile cancellare il registro!
+
+ src/app/components/logs-viewer/logs-viewer.component.ts
+ 77
+
+
+ src/app/components/logs-viewer/logs-viewer.component.ts
+ 80
+
+
+
+ My files
+ I miei file
+
+ src/app/components/recent-videos/recent-videos.component.html
+ 20
+
+ My files title
+
+
+ No files found.
+ Nessun file trovato.
+
+ src/app/components/recent-videos/recent-videos.component.html
+ 40
+
+ No files found
+
+
+ Order
+ Ordina
+
+ src/app/components/recent-videos/recent-videos.component.html
+ 53
+
+ Order
+
+
+ Select files
+ Seleziona file
+
+ src/app/components/recent-videos/recent-videos.component.html
+ 71
+
+ Select files
+
+
+ Cancel
+ Annulla
+
+ src/app/dialogs/confirm-dialog/confirm-dialog.component.ts
+ 15
+
+
+
+ Cookies successfully uploaded!
+ Cookie caricati con successo!
+
+ src/app/dialogs/cookies-uploader-dialog/cookies-uploader-dialog.component.ts
+ 42
+
+
+
+ Database successfully restored!
+ Database ripristinato con successo!
+
+ src/app/dialogs/restore-db-dialog/restore-db-dialog.component.ts
+ 39
+
+
+
+ Failed to restore database! See browser console for more info.
+ Ripristino del database non riuscito! Guarda la console del browser per più informazioni.
+
+ src/app/dialogs/restore-db-dialog/restore-db-dialog.component.ts
+ 46
+
+
+
+ Sharing enabled.
+ Condivisione abilitata.
+
+ src/app/dialogs/share-media-dialog/share-media-dialog.component.ts
+ 68
+
+
+
+ Failed to enable sharing.
+ Abilitazione della condivisione non riuscita.
+
+ src/app/dialogs/share-media-dialog/share-media-dialog.component.ts
+ 71
+
+
+
+ You must specify an amount of time
+ Devi specificare un periodo di tempo
+
+ src/app/dialogs/subscribe-dialog/subscribe-dialog.component.ts
+ 79
+
+
+
+ ERROR:
+ ERRORE:
+
+ src/app/dialogs/subscribe-dialog/subscribe-dialog.component.ts
+ 95
+
+
+
+ Thumbnail URL
+ URL della miniatura
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 29
+
+ Thumbnail URL
+
+
+ Category
+ Categoria
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 32
+
+ Category
+
+
+ View count
+ Numero di visualizzazioni
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 42
+
+ View count
+
+
+ Local view count
+ Numero di visualizzazioni locale
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 45
+
+ Local view count
+
+
+ Resolution:
+ Risoluzione:
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 51
+
+ Video resolution property
+
+
+ Audio bitrate:
+ Bitrate audio:
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 55
+
+ Video audio bitrate property
+
+
+ Failed to get file information from the server.
+ Impossibile ottenere le informazioni del file dal server.
+
+ src/app/player/player.component.ts
+ 149
+
+
+
+ Twitch Client ID
+ ID Client Twitch
+
+ src/app/settings/settings.component.html
+ 266
+
+ Twitch Client ID setting placeholder
+
+
+ Failed to update categories!
+ Aggiornamento delle categorie non riuscito!
+
+ src/app/settings/settings.component.ts
+ 134
+
+
+
+ Language successfully changed! Reload to update the page.
+ Lingua cambiata con successo! Ricarica per aggiornare la pagina.
+
+ src/app/settings/settings.component.ts
+ 209
+
+
+
+ Successfully transfered DB! Reloading info...
+ DB trasferito con successo! Ricaricando informazioni...
+
+ src/app/settings/settings.component.ts
+ 340
+
+
+
+ Failed to transfer DB -- transfer was aborted. Error:
+ Trasferimento del DB non riuscito -- transferimento interrotto. Errore:
+
+ src/app/settings/settings.component.ts
+ 343
+
+
+
+ Connection failed! Error: Server error. See logs for more info.
+ Connessione non riuscita! Errore: Errore server. Guarda il registro per più informazioni.
+
+ src/app/settings/settings.component.ts
+ 363
+
+
+
+ Successfully created playlist!', '
+ Playlist creata con successo!', '
+
+ src/app/components/custom-playlists/custom-playlists.component.ts
+ 56
+
+
+
+ Failed to pause download! See server logs for more info.
+ Interruzione del download non riuscita! Guarda il registro del server per più informazioni.
+
+ src/app/components/downloads/downloads.component.ts
+ 170
+
+
+ src/app/components/downloads/downloads.component.ts
+ 218
+
+
+
+ OK.
+ OK.
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 270
+
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 273
+
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 276
+
+
+
+ Upload date
+ Data caricamento
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 20
+
+ Upload date
+
+
+ Failed to retrieve logs!
+ Recupero dei registro non riuscito!
+
+ src/app/components/logs-viewer/logs-viewer.component.ts
+ 46
+
+
+ src/app/components/logs-viewer/logs-viewer.component.ts
+ 51
+
+
+
+ VOD url for this video is not supported. VOD ID must be after "twitch.tv/videos/"
+ L'url del VOD di questo video non è supportato. L'ID del VOD deve essere dopo "twitch.tv/videos/"
+
+ src/app/components/twitch-chat/twitch-chat.component.ts
+ 99
+
+
+
+ ERROR: failed to create playlist!', '
+ ERRORE: creazione della playlist non riuscita!', '
+
+ src/app/components/custom-playlists/custom-playlists.component.ts
+ 58
+
+
+
+ Clear downloads
+ Cancella i download
+
+ src/app/components/downloads/downloads.component.html
+ 85
+
+ Clear downloads
+
+
+ Clear downloads
+ Cancella i download
+
+ src/app/components/downloads/downloads.component.ts
+ 131
+
+
+
+ Delete success!
+ Cancellazione avvenuta con successo!
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 270
+
+
+
+ Delete failed!
+ Cancellazione non riuscita!
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 273
+
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 276
+
+
+
+ Finished downloads
+ Download terminati
+
+ src/app/components/downloads/downloads.component.ts
+ 138
+
+
+
+ Failed to pause all downloads! See server logs for more info.
+ Interruzione di tutti i download non riuscita! Guarda il registro del server per più informazioni.
+
+ src/app/components/downloads/downloads.component.ts
+ 178
+
+
+
+ Paused downloads
+ Download interrotti
+
+ src/app/components/downloads/downloads.component.ts
+ 142
+
+
+
+ Chat could not be downloaded.
+ Impossibile scaricare la chat.
+
+ src/app/components/twitch-chat/twitch-chat.component.ts
+ 110
+
+
+
+ Logs copied to clipboard!
+ Registro copiato negli appunti!
+
+ src/app/components/logs-viewer/logs-viewer.component.ts
+ 56
+
+
+
+ Failed to resume download! See server logs for more info.
+ Ripresa del download non riuscita! Guarda il registro del server per più informazioni.
+
+ src/app/components/downloads/downloads.component.ts
+ 186
+
+
+
+ Failed to resume all downloads! See server logs for more info.
+ Ripresa di tutti i download non riuscita! Guarda il registro del server per più informazioni.
+
+ src/app/components/downloads/downloads.component.ts
+ 194
+
+
+
+ Failed to restart download! See server logs for more info.
+ Riavvio del download non riuscito! Guarda il registro del server per più informazioni.
+
+ src/app/components/downloads/downloads.component.ts
+ 202
+
+
+
+ Failed to cancel download! See server logs for more info.
+ Annullamento del download non riuscito! Guarda il registro del server per più informazioni.
+
+ src/app/components/downloads/downloads.component.ts
+ 210
+
+
+
+ Confirm Password
+ Conferma password
+
+ src/app/components/login/login.component.html
+ 28
+
+ Confirm Password
+
+
+ Successfully deleted file:
+ File eliminati con successo:
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 291
+
+
+ src/app/components/recent-videos/recent-videos.component.ts
+ 299
+
+
+
+ Delete and don't download again
+ Elimina e non scaricare di nuovo
+
+ src/app/components/unified-file-card/unified-file-card.component.html
+ 37
+
+
+ src/app/components/unified-file-card/unified-file-card.component.html
+ 40
+
+ Delete forever subscription video button
+
+
+ Playlist updated successfully.
+ Playlist aggiornata con successo.
+
+ src/app/create-playlist/create-playlist.component.ts
+ 69
+
+
+ src/app/create-playlist/create-playlist.component.ts
+ 75
+
+
+
+ Download failed.
+ Download non riuscito.
+
+ src/app/components/twitch-chat/twitch-chat.component.ts
+ 106
+
+
+
+ Failed to restore database! See logs for more info.
+ Ripristino del database non riuscito! Guarda il registro del server per più informazioni.
+
+ src/app/dialogs/restore-db-dialog/restore-db-dialog.component.ts
+ 42
+
+
+
+ Failed to enable sharing - server error.
+ Abilitazione della condivisione non riuscita - errore server.
+
+ src/app/dialogs/share-media-dialog/share-media-dialog.component.ts
+ 74
+
+
+
+ Sharing disabled.
+ Condivisione disabilitata.
+
+ src/app/dialogs/share-media-dialog/share-media-dialog.component.ts
+ 79
+
+
+
+ Failed to disable sharing - server error.
+ Disabilitazione della condivisione non riuscita - errore server.
+
+ src/app/dialogs/share-media-dialog/share-media-dialog.component.ts
+ 85
+
+
+
+ Update failed. Check logs for more details.
+ Aggiornamento non riuscito. Guarda il registro per più dettagli.
+
+ src/app/dialogs/update-progress-dialog/update-progress-dialog.component.ts
+ 30
+
+
+
+ Choose a date
+ Seleziona una data
+
+ src/app/dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component.html
+ 22
+
+ Choose a date
+
+
+ Failed to disable sharing.
+ Disabilitazione della condivisione non riuscita.
+
+ src/app/dialogs/share-media-dialog/share-media-dialog.component.ts
+ 82
+
+
+
+ Uploader
+ Caricato da
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 17
+
+ Uploader
+
+
+ Thumbnail path
+ Percorso della miniatura
+
+ src/app/dialogs/video-info-dialog/video-info-dialog.component.html
+ 26
+
+ Thumbnail path
+
+
+ Download failed!
+ Download non riuscito!
+
+ src/app/main/main.component.ts
+ 387
+
+
+ src/app/main/main.component.ts
+ 775
+
+
+
+ Failed to load playlist!
+ Caricamento della playlist non riuscito!
+
+ src/app/player/player.component.ts
+ 186
+
+
+ src/app/player/player.component.ts
+ 189
+
+
+
+ Generating an ID/secret is easy!
+ Generare un ID/secret è facile!
+
+ src/app/settings/settings.component.html
+ 267
+
+ Twitch Client ID setting hint
+
+
+ Twitch Client Secret
+ Secret Client Twitch
+
+ src/app/settings/settings.component.html
+ 272
+
+ Twitch Client Secret setting placeholder
+
+
+ Chrome users must drag the 'Alternate URL' link to your bookmarks.
+ Gli utenti di Chrome devono trascinare il link del 'Alternate URL' nei preferiti.
+
+ src/app/settings/settings.component.ts
+ 237
+
+
+
+ Successfully killed all downloads!
+ Uccisi con successo tutti i download!
+
+ src/app/settings/settings.component.ts
+ 292
+
+
+
+ Restarting!
+ Riavviando!
+
+ src/app/settings/settings.component.ts
+ 307
+
+
+
+ Failed to restart the server.
+ Riavvio del server non riuscito.
+
+ src/app/settings/settings.component.ts
+ 309
+
+
+
+ Failed to kill all downloads! Check logs for details.
+ Impossibile uccidere tutti i download! Guarda il registro per più informazioni.
+
+ src/app/settings/settings.component.ts
+ 295
+
+
+ src/app/settings/settings.component.ts
+ 299
+
+
+
+ Failed to transfer DB -- API call failed. See browser logs for details.
+ Trasferimento del DB non riuscito -- Errore chiamata API. Guarda il registro del browser per più informazioni.
+
+ src/app/settings/settings.component.ts
+ 347
+
+
+
+ Connection successful!
+ Connessione avvenuta con successo!
+
+ src/app/settings/settings.component.ts
+ 357
+
+
+
+ Connection failed! Error:
+ Connessione non riuscita! Errore:
+
+ src/app/settings/settings.component.ts
+ 359
+
+
diff --git a/src/assets/i18n/messages.sv.xlf b/src/assets/i18n/messages.sv.xlf
index cc963f4..5f3f45c 100644
--- a/src/assets/i18n/messages.sv.xlf
+++ b/src/assets/i18n/messages.sv.xlf
@@ -4,6 +4,7 @@