Updated express and moment

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - name: setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '12'
           cache: 'npm'
       - name: install dependencies
         run: |

.vscode/extensions.json

@@ -1,11 +0,0 @@
-{
-    "recommendations": [
-        "angular.ng-template",
-        "dbaeumer.vscode-eslint",
-        "waderyan.gitblame",
-        "42crunch.vscode-openapi",
-        "redhat.vscode-yaml",
-        "christian-kohler.npm-intellisense",
-        "hbenl.vscode-mocha-test-adapter"
-    ]
-}

.vscode/settings.json

@@ -1,8 +0,0 @@
-{
-    "mochaExplorer.files": "backend/test/**/*.js",
-    "mochaExplorer.cwd": "backend",
-    "mochaExplorer.globImplementation": "vscode",
-    "mochaExplorer.env": {
-        "YTDL_MODE": "debug"
-    }
-}

.vscode/tasks.json

@@ -1,60 +1,25 @@
 {
 	"version": "2.0.0",
-	"windows": {
-        "options": {
-            "shell": {
-                "executable": "cmd.exe",
-                "args": [
-                    "/d", "/c"
-                ]
-            }
-        }
-    },
 	"tasks": [
 		{
 			"type": "npm",
 			"script": "start",
 			"problemMatcher": [],
 			"label": "Dev: start frontend",
-			"detail": "ng serve",
-			"presentation": {
-				"echo": true,
-				"reveal": "always",
-				"focus": true,
-				"panel": "shared",
-				"showReuseMessage": true,
-				"clear": false
-			}
+			"detail": "ng serve"
 		},
 		{
 			"label": "Dev: start backend",
 			"type": "shell",
-			"command": "node app.js",
+			"command": "set YTDL_MODE=debug && node app.js",
 			"options": {
-				"cwd": "./backend",
-				"env": {
-					"YTDL_MODE": "debug"
-				}
+				"cwd": "./backend"
 			},
 			"presentation": {
-				"echo": true,
 				"reveal": "always",
-				"focus": true,
-				"panel": "shared",
-				"showReuseMessage": true,
-				"clear": false
+				"panel": "new"
 			},
-			"problemMatcher": [],
-			"dependsOn": ["Dev: post-build"]
-		},
-		{
-			"label": "Dev: post-build",
-			"type": "shell",
-			"command": "node src/postbuild.mjs"
-		},
-		{
-			"label": "Dev: run all",
-			"dependsOn": ["Dev: start backend", "Dev: start frontend"]
+			"problemMatcher": []
 		}
 	]
 }

Dockerfile

@@ -3,11 +3,10 @@ FROM ubuntu:22.04 AS ffmpeg
 ENV DEBIAN_FRONTEND=noninteractive
 # Use script due local build compability
 COPY ffmpeg-fetch.sh .
-RUN chmod +x ffmpeg-fetch.sh
 RUN sh ./ffmpeg-fetch.sh
 
 
-# Create our Ubuntu 22.04 with node 16.14.2 (that specific version is required as per: https://stackoverflow.com/a/72855258/8088021)
+# Create our Ubuntu 22.04 with node 16
 # Go to 20.04
 FROM ubuntu:20.04 AS base
 ARG DEBIAN_FRONTEND=noninteractive
@@ -22,8 +21,7 @@ RUN groupadd -g $GID $USER && useradd --system -m -g $USER --uid $UID $USER && \
     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 n && \
-    n 16.14.2 && \
+    npm -g install npm && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 

Public API v1.yaml

@@ -111,37 +111,6 @@ paths:
                 $ref: '#/components/schemas/GetAllFilesResponse'
       security:
         - Auth query parameter: []
-  /api/rss:
-    get:
-      tags:
-        - files
-      summary: Generates an RSS feed
-      description: Generates an RSS feed for downloaded files
-      operationId: get-rss
-      parameters:
-        - in: query
-          name: params
-          schema:
-            allOf:
-            - $ref: '#/components/schemas/GetAllFilesRequest'
-            - type: object
-              properties:
-                uuid:
-                  type: string
-                  description: user uid
-                  default: null
-          style: form
-          explode: true
-      responses:
-        '200':
-          description: OK
-          content:
-            text/plain:
-              schema:
-                type: string
-                description: RSS feed
-      security:
-        - Auth query parameter: []
   /api/getFile:
     post:
       tags:
@@ -578,69 +547,6 @@ paths:
           description: If the archive dir is not found, 404 is sent as a response
       security:
         - Auth query parameter: []
-  /api/deleteArchiveItems:
-    post:
-      tags:
-        - archive
-      summary: Delete item from archive
-      description: 'Deletes an item from the archive'
-      operationId: post-api-deleteArchiveItems
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/DeleteArchiveItemsRequest'
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/SuccessObject'
-      security:
-        - Auth query parameter: []
-  /api/importArchive:
-    post:
-      tags:
-        - archive
-      summary: Imports archive
-      description: 'Imports an existing archive.txt file'
-      operationId: post-api-importArchive
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ImportArchiveRequest'
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/SuccessObject'
-      security:
-        - Auth query parameter: []
-  /api/uploadCookies:
-    post:
-      tags:
-        - downloader
-      summary: Upload cookies
-      description: 'Uploads cookies file to be used during downloading'
-      operationId: post-api-uploadCookies
-      requestBody:
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/UploadCookiesRequest'
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/SuccessObject'
-      security:
-        - Auth query parameter: []
   /api/updaterStatus:
     get:
       tags:
@@ -905,7 +811,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/RestartDownloadResponse'
+                $ref: '#/components/schemas/SuccessObject'
       requestBody:
         content:
           application/json:
@@ -1683,10 +1589,6 @@ components:
           type: string
           description: Height of the video, if known
           example: '1080'
-        maxHeight:
-          type: string
-          description: Max height that should be used, useful for playlists. selectedHeight will override this.
-          example: '1080'
         maxBitrate:
           type: string
           description: Specify ffmpeg/avconv audio quality
@@ -1695,9 +1597,6 @@ components:
           $ref: '#/components/schemas/FileType'
         cropFileSettings:
           $ref: '#/components/schemas/CropFileSettings'
-        ignoreArchive:
-          type: boolean
-          description: If using youtube-dl archive, download will ignore it
     DownloadResponse:
       type: object
       properties:
@@ -1722,13 +1621,6 @@ components:
       properties:
         download:
           $ref: '#/components/schemas/Download'
-    RestartDownloadResponse:
-      allOf:
-        - $ref: '#/components/schemas/SuccessObject'
-        - type: object
-          properties:
-            new_download_uid:
-              type: string
     GetAllDownloadsRequest:
       type: object
       properties:
@@ -1781,16 +1673,6 @@ components:
       required:
         - task_key
         - new_data
-    UpdateTaskOptionsRequest:
-      type: object
-      properties:
-        task_key:
-          type: string
-        new_options:
-          type: object
-      required:
-        - task_key
-        - new_options
     GetTaskResponse:
       type: object
       properties:
@@ -1859,39 +1741,29 @@ components:
             description: Two elements allowed, start index and end index
           minItems: 2
           maxItems: 2
-          default: null
         text_search:
           type: string
           description: Filter files by title
-          default: null
         file_type_filter:
           $ref: '#/components/schemas/FileTypeFilter'
-        favorite_filter:
-          type: boolean
-          description: If set to true, only gets favorites
-          default: false
         sub_id:
           type: string
           description: Include if you want to filter by subscription
-          default: null
     Sort:
       type: object
       properties:
         by:
           type: string
           description: Property to sort by
-          default: registered
         order:
           type: number
           description: 1 for ascending, -1 for descending
-          default: -1
     FileTypeFilter:
       type: string
       enum:
         - audio_only
         - video_only
         - both
-      default: both
     GetAllFilesResponse:
       required:
         - files
@@ -2009,11 +1881,16 @@ components:
           description: Number of files removed
     DeleteSubscriptionFileRequest:
       required:
-        - file_uid
+        - file
+        - sub
       type: object
       properties:
+        file:
+          type: string
         file_uid:
           type: string
+        sub:
+          $ref: '#/components/schemas/SubscriptionRequestData'
         deleteForever:
           type: boolean
           description: 'If true, does not remove id from archive. Only valid if youtube-dl archive is enabled in settings.'
@@ -2153,83 +2030,17 @@ components:
         type:
           $ref: '#/components/schemas/FileType'
     DownloadArchiveRequest:
-      type: object
-      properties:
-        type:
-          $ref: '#/components/schemas/FileType'
-        sub_id:
-          type: string
-    Archive:
       required:
-        - extractor
-        - id
-        - type
-        - title
-        - timestamp
-        - uid
+        - sub
       type: object
       properties:
-        extractor:
-          type: string
-        id:
-          type: string
-        type:
-          $ref: '#/components/schemas/FileType'
-        title:
-          type: string
-        user_uid:
-          type: string
-        sub_id:
-          type: string
-        timestamp:
-          type: number
-        uid:
-          type: string
-    DeleteArchiveItemsRequest:
-      type: object
-      required:
-        - archives
-      properties:
-        archives:
-          type: array
-          items:
-            $ref: '#/components/schemas/Archive'
-    ImportArchiveRequest:
-      type: object
-      required:
-        - archive
-        - type
-      properties:
-        archive:
-          type: string
-        type:
-          $ref: '#/components/schemas/FileType'
-        sub_id:
-          type: string
-    GetArchivesRequest:
-      type: object
-      properties:
-        type:
-          $ref: '#/components/schemas/FileType'
-        sub_id:
-          type: string
-    GetArchivesResponse:
-      type: object
-      required:
-        - archives
-      properties:
-        archives:
-          type: array
-          items:
-            $ref: '#/components/schemas/Archive'
-    UploadCookiesRequest:
-      type: object
-      required:
-        - cookies
-      properties:
-        cookies:
-          type: string
-          format: binary
+        sub:
+          required:
+            - archive_dir
+          type: object
+          properties:
+            archive_dir:
+              type: string
     UpdaterStatus:
       required:
         - details
@@ -2250,6 +2061,8 @@ components:
         tag:
           type: string
     DBInfoResponse:
+      required:
+        - db_info
       type: object
       properties:
         using_local_db:
@@ -2271,8 +2084,6 @@ components:
               $ref: '#/components/schemas/TableInfo'
             download_queue:
               $ref: '#/components/schemas/TableInfo'
-            archives:
-              $ref: '#/components/schemas/TableInfo'
     TransferDBResponse:
       required:
         - success
@@ -2572,7 +2383,6 @@ components:
         - upload_date
         - uploader
         - url
-        - favorite
       type: object
       properties:
         id:
@@ -2602,8 +2412,6 @@ components:
           type: string
         uid:
           type: string
-        user_uid:
-          type: string
         sharingEnabled:
           type: boolean
         category:
@@ -2622,8 +2430,6 @@ components:
         abr:
           type: number
           description: In Kbps
-        favorite:
-          type: boolean
     Playlist:
       required:
         - uids
@@ -2655,8 +2461,6 @@ components:
           type: string
         auto:
           type: boolean
-        sharingEnabled:
-          type: boolean
     Download:
       required:
         - url
@@ -2701,10 +2505,6 @@ components:
           type: string
           description: Error text, set if download fails.
           nullable: true
-        error_type:
-          type: string
-          description: Error type, may or may not be set in case of an error
-          nullable: true
         user_uid:
           type: string
         sub_id:
@@ -2743,8 +2543,6 @@ components:
           type: string
         schedule:
           type: object
-        options:
-          type: object
     Schedule:
       required:
         - type
@@ -2769,8 +2567,6 @@ components:
               type: number
             timestamp:
               type: number
-            tz:
-              type: string
     DBBackup:
       required:
         - name
@@ -2959,44 +2755,6 @@ components:
           type: string
         date:
           type: string
-    Notification:
-      required:
-        - uid
-        - type
-        - text
-        - read
-        - timestamp
-      type: object
-      properties:
-        type:
-          $ref: '#/components/schemas/NotificationType'
-        uid:
-          type: string
-        user_uid:
-          type: string
-        action:
-          type: array
-          items:
-            $ref: '#/components/schemas/NotificationAction'
-        read:
-          type: boolean
-        data:
-          type: object
-        timestamp:
-          type: number
-    NotificationAction:
-      type: string
-      enum:
-      - play
-      - retry_download
-      - view_download_error
-      - view_tasks
-    NotificationType:
-      type: string
-      enum:
-      - download_complete
-      - download_error
-      - task_finished
     BaseChangePermissionsRequest:
       required:
         - permission
@@ -3128,29 +2886,6 @@ components:
                   type: array
                   items:
                     $ref: '#/components/schemas/UserPermission'
-    DeleteNotificationRequest:
-      required:
-        - uid
-      type: object
-      properties:
-        uid:
-          type: string
-    SetNotificationsToReadRequest:
-      required:
-        - uids
-      type: object
-      properties:
-        uids:
-          type: array
-          items:
-            type: string
-    GetNotificationsResponse:
-      type: object
-      properties:
-        notifications:
-          type: array
-          items:
-            $ref: '#/components/schemas/Notification'
   securitySchemes:
     Auth query parameter:
       name: apiKey

angular.json

@@ -182,6 +182,7 @@
       }
     }
   },
+  "defaultProject": "youtube-dl-material",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
@@ -190,8 +191,5 @@
     "@schematics/angular:directive": {
       "prefix": "app"
     }
-  },
-  "cli": {
-    "analytics": false
   }
 }

backend/app.js

@@ -7,6 +7,7 @@ const path = require('path');
 const compression = require('compression');
 const multer  = require('multer');
 const express = require("express");
+const session = require("express-session");
 const bodyParser = require("body-parser");
 const archiver = require('archiver');
 const unzipper = require('unzipper');
@@ -18,7 +19,6 @@ const URL = require('url').URL;
 const CONSTS = require('./consts')
 const read_last_lines = require('read-last-lines');
 const ps = require('ps-node');
-const Feed = require('feed').Feed;
 
 // needed if bin/details somehow gets deleted
 if (!fs.existsSync(CONSTS.DETAILS_BIN_PATH)) fs.writeJSONSync(CONSTS.DETAILS_BIN_PATH, {"version":"2000.06.06","path":"node_modules\\youtube-dl\\bin\\youtube-dl.exe","exec":"youtube-dl.exe","downloader":"youtube-dl"})
@@ -33,7 +33,6 @@ const subscriptions_api = require('./subscriptions');
 const categories_api = require('./categories');
 const twitch_api = require('./twitch');
 const youtubedl_api = require('./youtube-dl');
-const archive_api = require('./archive');
 
 var app = express();
 
@@ -71,8 +70,7 @@ db.defaults(
         downloads: {},
         subscriptions: [],
         files_to_db_migration_complete: false,
-        tasks_manager_role_migration_complete: false,
-        archives_migration_complete: false
+        tasks_manager_role_migration_complete: false
 }).write();
 
 users_db.defaults(
@@ -161,7 +159,13 @@ app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
 
 // use passport
+app.use(session({
+    resave: false,
+    saveUninitialized: true,
+    secret: 'ytdl-material-secret' 
+}));
 app.use(auth_api.passport.initialize());
+app.use(auth_api.passport.session());
 
 // actual functions
 
@@ -202,15 +206,6 @@ async function checkMigrations() {
         db.set('tasks_manager_role_migration_complete', true).write();
     }
 
-    const archives_migration_complete = db.get('archives_migration_complete').value();
-    if (!archives_migration_complete) {
-        logger.info('Checking if archives have been migrated...');
-        const imported_archives = await archive_api.importArchives();
-        if (imported_archives) logger.info('Archives migration complete!');
-        else logger.error('Failed to migrate archives!');
-        db.set('archives_migration_complete', true).write();
-    }
-
     return true;
 }
 
@@ -522,6 +517,9 @@ async function loadConfig() {
     db_api.database_initialized = true;
     db_api.database_initialized_bs.next(true);
 
+    // creates archive path if missing
+    await fs.ensureDir(utils.getArchiveFolder());
+
     // check migrations
     await checkMigrations();
 
@@ -709,7 +707,7 @@ app.use(function(req, res, next) {
         next();
     } else if (req.query.apiKey && config_api.getConfigItem('ytdl_use_api_key') && req.query.apiKey === config_api.getConfigItem('ytdl_api_key')) {
         next();
-    } else if (req.path.includes('/api/stream/') || req.path.includes('/api/thumbnail/') || req.path.includes('/api/rss')) {
+    } else if (req.path.includes('/api/stream/') || req.path.includes('/api/thumbnail/')) {
         next();
     } else {
         logger.verbose(`Rejecting request - invalid API use for endpoint: ${req.path}. API key received: ${req.query.apiKey}`);
@@ -782,7 +780,7 @@ app.post('/api/restartServer', optionalJwt, (req, res) => {
 
 app.get('/api/getDBInfo', optionalJwt, async (req, res) => {
     const db_info = await db_api.getDBStats();
-    res.send(db_info);
+    res.send({db_info: db_info});
 });
 
 app.post('/api/transferDB', optionalJwt, async (req, res) => {
@@ -822,13 +820,11 @@ app.post('/api/downloadFile', optionalJwt, async function(req, res) {
         additionalArgs: req.body.additionalArgs,
         customOutput: req.body.customOutput,
         selectedHeight: req.body.selectedHeight,
-        maxHeight: req.body.maxHeight,
         customQualityConfiguration: req.body.customQualityConfiguration,
         youtubeUsername: req.body.youtubeUsername,
         youtubePassword: req.body.youtubePassword,
         ui_uid: req.body.ui_uid,
-        cropFileSettings: req.body.cropFileSettings,
-        ignoreArchive: req.body.ignoreArchive
+        cropFileSettings: req.body.cropFileSettings
     };
 
     const download = await downloader_api.createDownload(url, type, options, user_uid);
@@ -854,7 +850,6 @@ app.post('/api/generateArgs', optionalJwt, async function(req, res) {
         additionalArgs: req.body.additionalArgs,
         customOutput: req.body.customOutput,
         selectedHeight: req.body.selectedHeight,
-        maxHeight: req.body.maxHeight,
         customQualityConfiguration: req.body.customQualityConfiguration,
         youtubeUsername: req.body.youtubeUsername,
         youtubePassword: req.body.youtubePassword,
@@ -933,15 +928,35 @@ app.post('/api/getFile', optionalJwt, async function (req, res) {
 
 app.post('/api/getAllFiles', optionalJwt, async function (req, res) {
     // these are returned
+    let files = null;
     const sort = req.body.sort;
     const range = req.body.range;
     const text_search = req.body.text_search;
     const file_type_filter = req.body.file_type_filter;
-    const favorite_filter = req.body.favorite_filter;
     const sub_id = req.body.sub_id;
     const uuid = req.isAuthenticated() ? req.user.uid : null;
 
-    const {files, file_count} = await db_api.getAllFiles(sort, range, text_search, file_type_filter, favorite_filter, sub_id, uuid);
+    const filter_obj = {user_uid: uuid};
+    const regex = true;
+    if (text_search) {
+        if (regex) {
+            filter_obj['title'] = {$regex: `.*${text_search}.*`, $options: 'i'};
+        } else {
+            filter_obj['$text'] = { $search: utils.createEdgeNGrams(text_search) };
+        }
+    }
+
+    if (sub_id) {
+        filter_obj['sub_id'] = sub_id;
+    }
+
+    if (file_type_filter === 'audio_only') filter_obj['isAudio'] = true;
+    else if (file_type_filter === 'video_only') filter_obj['isAudio'] = false;
+    
+    files = await db_api.getRecords('files', filter_obj, false, sort, range, text_search);
+    const file_count = await db_api.getRecords('files', filter_obj, true);
+
+    files = JSON.parse(JSON.stringify(files));
 
     res.send({
         files: files,
@@ -1084,6 +1099,9 @@ app.post('/api/disableSharing', optionalJwt, async function(req, res) {
             await db_api.updateRecord('files', {uid: uid}, {sharingEnabled: false})
         } else if (is_playlist) {
             await db_api.updateRecord(`playlists`, {id: uid}, {sharingEnabled: false});
+        } else if (type === 'subscription') {
+            // TODO: Implement. Main blocker right now is subscription videos are not stored in the DB, they are searched for every
+            //          time they are requested from the subscription directory.
         } else {
             // error
             success = false;
@@ -1098,7 +1116,7 @@ app.post('/api/disableSharing', optionalJwt, async function(req, res) {
     });
 });
 
-app.post('/api/incrementViewCount', async (req, res) => {
+app.post('/api/incrementViewCount', optionalJwt, async (req, res) => {
     let file_uid = req.body.file_uid;
     let sub_id = req.body.sub_id;
     let uuid = req.body.uuid;
@@ -1233,9 +1251,12 @@ app.post('/api/unsubscribe', optionalJwt, async (req, res) => {
 
 app.post('/api/deleteSubscriptionFile', optionalJwt, async (req, res) => {
     let deleteForever = req.body.deleteForever;
+    let file = req.body.file;
     let file_uid = req.body.file_uid;
+    let sub = req.body.sub;
+    let user_uid = req.isAuthenticated() ? req.user.uid : null;
 
-    let success = await db_api.deleteFile(file_uid, deleteForever);
+    let success = await subscriptions_api.deleteSubscriptionFile(sub, file, deleteForever, file_uid, user_uid);
 
     if (success) {
         res.send({
@@ -1416,9 +1437,10 @@ app.post('/api/deletePlaylist', optionalJwt, async (req, res) => {
 app.post('/api/deleteFile', optionalJwt, async (req, res) => {
     const uid = req.body.uid;
     const blacklistMode = req.body.blacklistMode;
+    const uuid = req.isAuthenticated() ? req.user.uid : null;
 
     let wasDeleted = false;
-    wasDeleted = await db_api.deleteFile(uid, blacklistMode);
+    wasDeleted = await db_api.deleteFile(uid, uuid, blacklistMode);
     res.send(wasDeleted);
 });
 
@@ -1450,7 +1472,7 @@ app.post('/api/deleteAllFiles', optionalJwt, async (req, res) => {
 
     for (let i = 0; i < files.length; i++) {    
         let wasDeleted = false;
-        wasDeleted = await db_api.deleteFile(files[i].uid, blacklistMode);
+        wasDeleted = await db_api.deleteFile(files[i].uid, uuid, blacklistMode);
         if (wasDeleted) {
             delete_count++;
         }
@@ -1511,69 +1533,20 @@ app.post('/api/downloadFileFromServer', optionalJwt, async (req, res) => {
     });
 });
 
-app.post('/api/getArchives', optionalJwt, async (req, res) => {
-    const uuid = req.isAuthenticated() ? req.user.uid : null;
-    const sub_id = req.body.sub_id;
-    const filter_obj = {user_uid: uuid, sub_id: sub_id};
-    const type = req.body.type;
-
-    // we do this for file types because if type is null, that means get files of all types
-    if (type) filter_obj['type'] = type;
-
-    const archives = await db_api.getRecords('archives', filter_obj);
-
-    res.send({
-        archives: archives
-    });
-});
-
 app.post('/api/downloadArchive', optionalJwt, async (req, res) => {
-    const uuid = req.isAuthenticated() ? req.user.uid : null;
-    const sub_id = req.body.sub_id; 
-    const type = req.body.type;
+    let sub = req.body.sub;
+    let archive_dir = sub.archive;
 
-    const archive_text = await archive_api.generateArchive(type, uuid, sub_id);
+    let full_archive_path = path.join(archive_dir, 'archive.txt');
 
-    if (archive_text !== null && archive_text !== undefined) {
-        res.setHeader('Content-type', "application/octet-stream");
-        res.setHeader('Content-disposition', 'attachment; filename=archive.txt');
-        res.send(archive_text);
+    if (await fs.pathExists(full_archive_path)) {
+        res.sendFile(full_archive_path);
     } else {
-        res.sendStatus(400);
+        res.sendStatus(404);
     }
 
 });
 
-app.post('/api/importArchive', optionalJwt, async (req, res) => {
-    const uuid = req.isAuthenticated() ? req.user.uid : null;
-    const archive = req.body.archive;
-    const sub_id = req.body.sub_id; 
-    const type = req.body.type;
-
-    const archive_text = Buffer.from(archive.split(',')[1], 'base64').toString();
-
-    const imported_count = await archive_api.importArchiveFile(archive_text, type, uuid, sub_id);
-
-    res.send({
-        success: !!imported_count,
-        imported_count: imported_count
-    });
-});
-
-app.post('/api/deleteArchiveItems', optionalJwt, async (req, res) => {
-    const uuid = req.isAuthenticated() ? req.user.uid : null;
-    const archives = req.body.archives;
-
-    let success = true;
-    for (const archive of archives) {
-        success &= await archive_api.removeFromArchive(archive['extractor'], archive['id'], archive['type'], uuid, archive['sub_id']);
-    }
-
-    res.send({
-        success: success
-    });
-});
-
 var upload_multer = multer({ dest: __dirname + '/appdata/' });
 app.post('/api/uploadCookies', upload_multer.single('cookies'), async (req, res) => {
     const new_path = path.join(__dirname, 'appdata', 'cookies.txt');
@@ -1765,8 +1738,8 @@ app.post('/api/resumeAllDownloads', optionalJwt, async (req, res) => {
 
 app.post('/api/restartDownload', optionalJwt, async (req, res) => {
     const download_uid = req.body.download_uid;
-    const new_download = await downloader_api.restartDownload(download_uid);
-    res.send({success: !!new_download, new_download_uid: new_download ? new_download['uid'] : null});
+    const success = await downloader_api.restartDownload(download_uid);
+    res.send({success: success});
 });
 
 app.post('/api/cancelDownload', optionalJwt, async (req, res) => {
@@ -1843,15 +1816,6 @@ app.post('/api/updateTaskData', optionalJwt, async (req, res) => {
     res.send({success: success});
 });
 
-app.post('/api/updateTaskOptions', optionalJwt, async (req, res) => {
-    const task_key = req.body.task_key;
-    const new_options = req.body.new_options;
-  
-    const success = await db_api.updateRecord('tasks', {key: task_key}, {options: new_options});
-
-    res.send({success: success});
-});
-
 app.post('/api/getDBBackups', optionalJwt, async (req, res) => {
     const backup_dir = path.join('appdata', 'db_backup');
     fs.ensureDirSync(backup_dir);
@@ -2035,93 +1999,6 @@ app.post('/api/changeRolePermissions', optionalJwt, async (req, res) => {
     res.send({success: success});
 });
 
-// notifications
-
-app.post('/api/getNotifications', optionalJwt, async (req, res) => {
-    const uuid = req.user.uid;
-
-    const notifications = await db_api.getRecords('notifications', {user_uid: uuid});
-
-    res.send({notifications: notifications});
-});
-
-// set notifications to read
-app.post('/api/setNotificationsToRead', optionalJwt, async (req, res) => {
-    const uuid = req.user.uid;
-
-    const success = await db_api.updateRecords('notifications', {user_uid: uuid}, {read: true});
-
-    res.send({success: success});
-});
-
-app.post('/api/deleteNotification', optionalJwt, async (req, res) => {
-    const uid = req.body.uid;
-
-    const success = await db_api.removeRecord('notifications', {uid: uid});
-
-    res.send({success: success});
-});
-
-app.post('/api/deleteAllNotifications', optionalJwt, async (req, res) => {
-    const uuid = req.user.uid;
-
-    const success = await db_api.removeAllRecords('notifications', {user_uid: uuid});
-
-    res.send({success: success});
-});
-
-// rss feed
-
-app.get('/api/rss', async function (req, res) {
-    if (!config_api.getConfigItem('ytdl_enable_rss_feed')) {
-        logger.error('RSS feed is disabled! It must be enabled in the settings before it can be generated.');
-        res.sendStatus(403);
-        return;
-    }
-
-    // these are returned
-    const sort = req.query.sort ? JSON.parse(decodeURIComponent(req.query.sort)) : {by: 'registered', order: -1};
-    const range = req.query.range ? req.query.range.map(range_num => parseInt(range_num)) : null;
-    const text_search = req.query.text_search ? decodeURIComponent(req.query.text_search) : null;
-    const file_type_filter = req.query.file_type_filter;
-    const favorite_filter = req.query.favorite_filter === 'true';
-    const sub_id = req.query.sub_id ? decodeURIComponent(req.query.sub_id) : null;
-    const uuid = req.query.uuid ? decodeURIComponent(req.query.uuid) : null;
-
-    const {files} = await db_api.getAllFiles(sort, range, text_search, file_type_filter, favorite_filter, sub_id, uuid);
-
-    const feed = new Feed({
-            title: 'Downloads',
-            description: 'YoutubeDL-Material downloads',
-            id: utils.getBaseURL(),
-            link: utils.getBaseURL(),
-            image: 'https://github.com/Tzahi12345/YoutubeDL-Material/blob/master/src/assets/images/logo_128px.png',
-            favicon: 'https://raw.githubusercontent.com/Tzahi12345/YoutubeDL-Material/master/src/favicon.ico',
-            generator: 'YoutubeDL-Material'
-    });
-
-    files.forEach(file => {
-        feed.addItem({
-            title: file.title,
-            link: `${utils.getBaseURL()}/#/player;uid=${file.uid}`,
-            description: file.description,
-            author: [
-                {
-                    name: file.uploader,
-                    link: file.url
-                }
-            ],
-            contributor: [],
-            date: file.timestamp,
-            // https://stackoverflow.com/a/45415677/8088021
-            image: file.thumbnailURL.replace('&', '&amp;')
-        });
-      });
-    res.send(feed.rss2());
-});
-
-// web server
-
 app.use(function(req, res, next) {
     //if the request is not html then move along
     var accept = req.accepts('html', 'json', 'xml');

backend/archive.js

@@ -1,91 +0,0 @@
-const path = require('path');
-const fs = require('fs-extra');
-const { uuid } = require('uuidv4');
-
-const db_api = require('./db');
-
-exports.generateArchive = async (type = null, user_uid = null, sub_id = null) => {
-    const filter = {user_uid: user_uid, sub_id: sub_id};
-    if (type) filter['type'] = type;
-    const archive_items = await db_api.getRecords('archives', filter);
-    const archive_item_lines = archive_items.map(archive_item => `${archive_item['extractor']} ${archive_item['id']}`);
-    return archive_item_lines.join('\n');
-}
-
-exports.addToArchive = async (extractor, id, type, title, user_uid = null, sub_id = null) => {
-    const archive_item = createArchiveItem(extractor, id, type, title, user_uid, sub_id);
-    const success = await db_api.insertRecordIntoTable('archives', archive_item, {extractor: extractor, id: id, type: type});
-    return success;
-}
-
-exports.removeFromArchive = async (extractor, id, type, user_uid = null, sub_id = null) => {
-    const success = await db_api.removeAllRecords('archives', {extractor: extractor, id: id, type: type, user_uid: user_uid, sub_id: sub_id});
-    return success;
-}
-
-exports.existsInArchive = async (extractor, id, type, user_uid, sub_id) => {
-    const archive_item = await db_api.getRecord('archives', {extractor: extractor, id: id, type: type, user_uid: user_uid, sub_id: sub_id});
-    return !!archive_item;
-}
-
-exports.importArchiveFile = async (archive_text, type, user_uid = null, sub_id = null) => {
-    let archive_import_count = 0;
-    const lines = archive_text.split('\n');
-    for (let line of lines) {
-        const archive_line_parts = line.trim().split(' ');
-        // should just be the extractor and the video ID
-        if (archive_line_parts.length !== 2) {
-            continue;
-        }
-
-        const extractor = archive_line_parts[0];
-        const id        = archive_line_parts[1];
-        if (!extractor || !id) continue;
-
-        // we can't do a bulk write because we need to avoid duplicate archive items existing in db
-
-        const archive_item = createArchiveItem(extractor, id, type, null, user_uid, sub_id);
-        await db_api.insertRecordIntoTable('archives', archive_item, {extractor: extractor, id: id, type: type, sub_id: sub_id, user_uid: user_uid});
-        archive_import_count++;
-    }
-    return archive_import_count;
-}
-
-exports.importArchives = async () => {
-    const imported_archives = [];
-    const dirs_to_check = await db_api.getFileDirectoriesAndDBs();
-
-    // run through check list and check each file to see if it's missing from the db
-    for (let i = 0; i < dirs_to_check.length; i++) {
-        const dir_to_check = dirs_to_check[i];
-        if (!dir_to_check['archive_path']) continue;
-
-        const files_to_import = [
-            path.join(dir_to_check['archive_path'], `archive_${dir_to_check['type']}.txt`),
-            path.join(dir_to_check['archive_path'], `blacklist_${dir_to_check['type']}.txt`)
-        ]
-
-        for (const file_to_import of files_to_import) {
-            const file_exists = await fs.pathExists(file_to_import);
-            if (!file_exists) continue;
-
-            const archive_text = await fs.readFile(file_to_import, 'utf8');
-            await exports.importArchiveFile(archive_text, dir_to_check.type, dir_to_check.user_uid, dir_to_check.sub_id);
-            imported_archives.push(file_to_import);
-        }
-    }
-    return imported_archives;
-}
-
-const createArchiveItem = (extractor, id, type, title = null, user_uid = null, sub_id = null) => {
-    return {
-        extractor: extractor,
-        id: id,
-        type: type,
-        title: title,
-        user_uid: user_uid ? user_uid : null,
-        sub_id: sub_id ? sub_id : null,
-        timestamp: Date.now() / 1000,
-        uid: uuid()
-    }
-}

backend/authentication/auth.js

@@ -33,14 +33,7 @@ exports.initialize = function () {
 
   saltRounds = 10;
 
-  // Sometimes this value is not properly typed: https://github.com/Tzahi12345/YoutubeDL-Material/issues/813
   JWT_EXPIRATION = config_api.getConfigItem('ytdl_jwt_expiration');
-  if (!(+JWT_EXPIRATION)) {
-    logger.warn(`JWT expiration value improperly set to ${JWT_EXPIRATION}, auto setting to 1 day.`);
-    JWT_EXPIRATION = 86400;
-  } else {
-    JWT_EXPIRATION = +JWT_EXPIRATION;
-  }
 
   SERVER_SECRET = null;
   if (db_api.users_db.get('jwt_secret').value()) {

backend/config.js

@@ -185,6 +185,7 @@ const DEFAULT_CONFIG = {
         "default_file_output": "",
         "use_youtubedl_archive": false,
         "custom_args": "",
+        "safe_download_override": false,
         "include_thumbnail": true,
         "include_metadata": true,
         "max_concurrent_downloads": 5,
@@ -195,13 +196,9 @@ const DEFAULT_CONFIG = {
         "file_manager_enabled": true,
         "allow_quality_select": true,
         "download_only_mode": false,
-        "force_autoplay": false,
+        "allow_autoplay": true,
         "enable_downloads_manager": true,
-        "allow_playlist_categorization": true,
-        "enable_notifications": true,
-        "enable_all_notifications": true,
-        "allowed_notification_types": [],
-        "enable_rss_feed": false,
+        "allow_playlist_categorization": true
       },
       "API": {
         "use_API_key": false,
@@ -213,15 +210,7 @@ const DEFAULT_CONFIG = {
         "twitch_client_secret": "",
         "twitch_auto_download_chat": false,
         "use_sponsorblock_API": false,
-        "generate_NFO_files": false,
-        "use_ntfy_API": false,
-        "ntfy_topic_URL": "",
-        "use_gotify_API": false,
-        "gotify_server_URL": "",
-        "gotify_app_token": "",
-        "use_telegram_API": false,
-        "telegram_bot_token": "",
-        "telegram_chat_id": ""
+        "generate_NFO_files": false
       },
       "Themes": {
         "default_theme": "default",

backend/consts.js

@@ -30,6 +30,10 @@ exports.CONFIG_ITEMS = {
         'key': 'ytdl_custom_args',
         'path': 'YoutubeDLMaterial.Downloader.custom_args'
     },
+    'ytdl_safe_download_override': {
+        'key': 'ytdl_safe_download_override',
+        'path': 'YoutubeDLMaterial.Downloader.safe_download_override'
+    },
     'ytdl_include_thumbnail': {
         'key': 'ytdl_include_thumbnail',
         'path': 'YoutubeDLMaterial.Downloader.include_thumbnail'
@@ -64,9 +68,9 @@ exports.CONFIG_ITEMS = {
         'key': 'ytdl_download_only_mode',
         'path': 'YoutubeDLMaterial.Extra.download_only_mode'
     },
-    'ytdl_force_autoplay': {
-        'key': 'ytdl_force_autoplay',
-        'path': 'YoutubeDLMaterial.Extra.force_autoplay'
+    'ytdl_allow_autoplay': {
+        'key': 'ytdl_allow_autoplay',
+        'path': 'YoutubeDLMaterial.Extra.allow_autoplay'
     },
     'ytdl_enable_downloads_manager': {
         'key': 'ytdl_enable_downloads_manager',
@@ -76,22 +80,6 @@ exports.CONFIG_ITEMS = {
         'key': 'ytdl_allow_playlist_categorization',
         'path': 'YoutubeDLMaterial.Extra.allow_playlist_categorization'
     },
-    'ytdl_enable_notifications': {
-        'key': 'ytdl_enable_notifications',
-        'path': 'YoutubeDLMaterial.Extra.enable_notifications'
-    },
-    'ytdl_enable_all_notifications': {
-        'key': 'ytdl_enable_all_notifications',
-        'path': 'YoutubeDLMaterial.Extra.enable_all_notifications'
-    },
-    'ytdl_allowed_notification_types': {
-        'key': 'ytdl_allowed_notification_types',
-        'path': 'YoutubeDLMaterial.Extra.allowed_notification_types'
-    },
-    'ytdl_enable_rss_feed': {
-        'key': 'ytdl_enable_rss_feed',
-        'path': 'YoutubeDLMaterial.Extra.enable_rss_feed'
-    },
 
     // API
     'ytdl_use_api_key': {
@@ -134,38 +122,6 @@ exports.CONFIG_ITEMS = {
         'key': 'ytdl_generate_nfo_files',
         'path': 'YoutubeDLMaterial.API.generate_NFO_files'
     },
-    'ytdl_use_ntfy_API': {
-        'key': 'ytdl_use_ntfy_API',
-        'path': 'YoutubeDLMaterial.API.use_ntfy_API'
-    },
-    'ytdl_ntfy_topic_url': {
-        'key': 'ytdl_ntfy_topic_url',
-        'path': 'YoutubeDLMaterial.API.ntfy_topic_URL'
-    },
-    'ytdl_use_gotify_API': {
-        'key': 'ytdl_use_gotify_API',
-        'path': 'YoutubeDLMaterial.API.use_gotify_API'
-    },
-    'ytdl_gotify_server_url': {
-        'key': 'ytdl_gotify_server_url',
-        'path': 'YoutubeDLMaterial.API.gotify_server_URL'
-    },
-    'ytdl_gotify_app_token': {
-        'key': 'ytdl_gotify_app_token',
-        'path': 'YoutubeDLMaterial.API.gotify_app_token'
-    },
-    'ytdl_use_telegram_API': {
-        'key': 'ytdl_use_telegram_API',
-        'path': 'YoutubeDLMaterial.API.use_telegram_API'
-    },
-    'ytdl_telegram_bot_token': {
-        'key': 'ytdl_telegram_bot_token',
-        'path': 'YoutubeDLMaterial.API.telegram_bot_token'
-    },
-    'ytdl_telegram_chat_id': {
-        'key': 'ytdl_telegram_chat_id',
-        'path': 'YoutubeDLMaterial.API.telegram_chat_id'
-    },
 
 
     // Themes

backend/db.js

@@ -2,7 +2,6 @@ var fs = require('fs-extra')
 var path = require('path')
 const { MongoClient } = require("mongodb");
 const { uuid } = require('uuidv4');
-const _ = require('lodash');
 
 const config_api = require('./config');
 var utils = require('./utils')
@@ -59,13 +58,6 @@ const tables = {
         name: 'tasks',
         primary_key: 'key'
     },
-    notifications: {
-        name: 'notifications',
-        primary_key: 'uid'
-    },
-    archives: {
-        name: 'archives'
-    },
     test: {
         name: 'test'
     }
@@ -156,7 +148,6 @@ exports._connectToDB = async (custom_connection_string = null) => {
                 await database.collection(table).createIndex(text_search);
             }
         });
-        using_local_db = false; // needs to happen for tests (in normal operation using_local_db is guaranteed false)
         return true;
     } catch(err) {
         logger.error(err);
@@ -261,16 +252,13 @@ exports.getFileDirectoriesAndDBs = async () => {
             dirs_to_check.push({
                 basePath: path.join(usersFileFolder, user.uid, 'audio'),
                 user_uid: user.uid,
-                type: 'audio',
-                archive_path: utils.getArchiveFolder('audio', user.uid)
+                type: 'audio'
             });
 
             // add user's video dir to check list
             dirs_to_check.push({
                 basePath: path.join(usersFileFolder, user.uid, 'video'),
-                user_uid: user.uid,
-                type: 'video',
-                archive_path: utils.getArchiveFolder('video', user.uid)
+                type: 'video'
             });
         }
     } else {
@@ -280,15 +268,13 @@ exports.getFileDirectoriesAndDBs = async () => {
         // add audio dir to check list
         dirs_to_check.push({
             basePath: audioFolderPath,
-            type: 'audio',
-            archive_path: utils.getArchiveFolder('audio')
+            type: 'audio'
         });
 
         // add video dir to check list
         dirs_to_check.push({
             basePath: videoFolderPath,
-            type: 'video',
-            archive_path: utils.getArchiveFolder('video')
+            type: 'video'
         });
     }
 
@@ -309,8 +295,7 @@ exports.getFileDirectoriesAndDBs = async () => {
                                       : path.join(subscriptions_base_path, subscription_to_check.isPlaylist ? 'playlists/' : 'channels/', subscription_to_check.name),
             user_uid: subscription_to_check.user_uid,
             type: subscription_to_check.type,
-            sub_id: subscription_to_check['id'],
-            archive_path: utils.getArchiveFolder(subscription_to_check.type, subscription_to_check.user_uid, subscription_to_check)
+            sub_id: subscription_to_check['id']
         });
     }
 
@@ -365,7 +350,7 @@ exports.addMetadataPropertyToDB = async (property_key) => {
             }
         }
 
-        return await exports.bulkUpdateRecordsByKey('files', 'uid', update_obj);
+        return await exports.bulkUpdateRecords('files', 'uid', update_obj);
     } catch(err) {
         logger.error(err);
         return false;
@@ -462,8 +447,8 @@ exports.calculatePlaylistDuration = async (playlist, playlist_file_objs = null)
     return playlist_file_objs.reduce((a, b) => a + utils.durationStringToNumber(b.duration), 0);
 }
 
-exports.deleteFile = async (uid, blacklistMode = false) => {
-    const file_obj = await exports.getVideo(uid);
+exports.deleteFile = async (uid, uuid = null, blacklistMode = false) => {
+    const file_obj = await exports.getVideo(uid, uuid);
     const type = file_obj.isAudio ? 'audio' : 'video';
     const folderPath = path.dirname(file_obj.path);
     const ext = type === 'audio' ? 'mp3' : 'mp4';
@@ -509,22 +494,16 @@ exports.deleteFile = async (uid, blacklistMode = false) => {
 
     let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
     if (useYoutubeDLArchive) {
-        // get id/extractor from JSON
+        const archive_path = utils.getArchiveFolder(type, uuid);
 
-        const info_json = await (type === 'audio' ? utils.getJSONMp3(name, folderPath) : utils.getJSONMp4(name, folderPath));
-        let retrievedID = null;
-        let retrievedExtractor = null;
-        if (info_json) {
-            retrievedID = info_json['id'];
-            retrievedExtractor = info_json['extractor'];
-        }
+        // get ID from JSON
+
+        var jsonobj = await (type === 'audio' ? utils.getJSONMp3(name, folderPath) : utils.getJSONMp4(name, folderPath));
+        let id = null;
+        if (jsonobj) id = jsonobj.id;
 
         // Remove file ID from the archive file, and write it to the blacklist (if enabled)
-        if (!blacklistMode) {
-            // workaround until a files_api is created (using archive_api would make a circular dependency)
-            await exports.removeAllRecords('archives', {extractor: retrievedExtractor, id: retrievedID, type: type, user_uid: file_obj.user_uid, sub_id: file_obj.sub_id});
-            // await archive_api.removeFromArchive(retrievedExtractor, retrievedID, type, file_obj.user_uid, file_obj.sub_id);
-        }
+        await utils.deleteFileFromArchive(uid, type, archive_path, id, blacklistMode);
     }
 
     if (jsonExists) await fs.unlink(jsonPath);
@@ -555,32 +534,8 @@ exports.getVideo = async (file_uid) => {
     return await exports.getRecord('files', {uid: file_uid});
 }
 
-exports.getAllFiles = async (sort, range, text_search, file_type_filter, favorite_filter, sub_id, uuid) => {
-    const filter_obj = {user_uid: uuid};
-    const regex = true;
-    if (text_search) {
-        if (regex) {
-            filter_obj['title'] = {$regex: `.*${text_search}.*`, $options: 'i'};
-        } else {
-            filter_obj['$text'] = { $search: utils.createEdgeNGrams(text_search) };
-        }
-    }
-
-    if (favorite_filter) {
-        filter_obj['favorite'] = true;
-    }
-
-    if (sub_id) {
-        filter_obj['sub_id'] = sub_id;
-    }
-
-    if (file_type_filter === 'audio_only') filter_obj['isAudio'] = true;
-    else if (file_type_filter === 'video_only') filter_obj['isAudio'] = false;
-    
-    const files = JSON.parse(JSON.stringify(await exports.getRecords('files', filter_obj, false, sort, range, text_search)));
-    const file_count = await exports.getRecords('files', filter_obj, true);
-
-    return {files, file_count};
+exports.getFiles = async (uuid = null) => {
+    return await exports.getRecords('files', {user_uid: uuid});
 }
 
 exports.setVideoProperty = async (file_uid, assignment_obj) => {
@@ -595,7 +550,7 @@ exports.setVideoProperty = async (file_uid, assignment_obj) => {
 exports.insertRecordIntoTable = async (table, doc, replaceFilter = null) => {
     // local db override
     if (using_local_db) {
-        if (replaceFilter) local_db.get(table).remove((doc) => _.isMatch(doc, replaceFilter)).write();
+        if (replaceFilter) local_db.get(table).remove(replaceFilter).write();
         local_db.get(table).push(doc).write();
         return true;
     }
@@ -722,7 +677,7 @@ exports.updateRecords = async (table, filter_obj, update_obj) => {
     return !!(output['result']['ok']);
 }
 
-exports.bulkUpdateRecordsByKey = async (table, key_label, update_obj) => {
+exports.bulkUpdateRecords = async (table, key_label, update_obj) => {
     // local db override
     if (using_local_db) {
         local_db.get(table).each((record) => {
@@ -1136,14 +1091,6 @@ exports.applyFilterLocalDB = (db_path, filter_obj, operation) => {
                         filtered &= (record[filter_prop].search(new RegExp(filter_prop_value['$regex'], filter_prop_value['$options'])) !== -1);
                     } else if ('$ne' in filter_prop_value) {
                         filtered &= filter_prop in record && record[filter_prop] !== filter_prop_value['$ne'];
-                    } else if ('$lt' in filter_prop_value) {
-                        filtered &= filter_prop in record && record[filter_prop] < filter_prop_value['$lt'];
-                    } else if ('$gt' in filter_prop_value) {
-                        filtered &= filter_prop in record && record[filter_prop] > filter_prop_value['$gt'];
-                    } else if ('$lte' in filter_prop_value) {
-                        filtered &= filter_prop in record && record[filter_prop] <= filter_prop_value['$lt'];
-                    } else if ('$gte' in filter_prop_value) {
-                        filtered &= filter_prop in record && record[filter_prop] >= filter_prop_value['$gt'];
                     }
                 } else {
                     // handle case of nested property check
@@ -1158,8 +1105,3 @@ exports.applyFilterLocalDB = (db_path, filter_obj, operation) => {
     });
     return return_val;
 }
-
-// should only be used for tests
-exports.setLocalDBMode = (mode) => {
-    using_local_db = mode;
-}

backend/downloader.js

@@ -14,8 +14,6 @@ const { create } = require('xmlbuilder2');
 const categories_api = require('./categories');
 const utils = require('./utils');
 const db_api = require('./db');
-const notifications_api = require('./notifications');
-const archive_api = require('./archive');
 
 const mutex = new Mutex();
 let should_check_downloads = true;
@@ -86,10 +84,10 @@ exports.resumeDownload = async (download_uid) => {
 exports.restartDownload = async (download_uid) => {
     const download = await db_api.getRecord('download_queue', {uid: download_uid});
     await exports.clearDownload(download_uid);
-    const new_download = await exports.createDownload(download['url'], download['type'], download['options'], download['user_uid']);
+    const success = !!(await exports.createDownload(download['url'], download['type'], download['options'], download['user_uid']));
     
     should_check_downloads = true;
-    return new_download;
+    return success;
 }
 
 exports.cancelDownload = async (download_uid) => {
@@ -108,10 +106,9 @@ exports.clearDownload = async (download_uid) => {
     return await db_api.removeRecord('download_queue', {uid: download_uid});
 }
 
-async function handleDownloadError(download, error_message, error_type = null) {
-    if (!download || !download['uid']) return;
-    notifications_api.sendDownloadErrorNotification(download, download['user_uid'], error_type);
-    await db_api.updateRecord('download_queue', {uid: download['uid']}, {error: error_message, finished: true, running: false, error_type: error_type});
+async function handleDownloadError(download_uid, error_message) {
+    if (!download_uid) return;
+    await db_api.updateRecord('download_queue', {uid: download_uid}, {error: error_message, finished: true, running: false});
 }
 
 async function setupDownloads() {
@@ -157,13 +154,6 @@ async function checkDownloads() {
         if (max_concurrent_downloads < 0 || running_downloads_count >= max_concurrent_downloads) break;
 
         if (waiting_download['finished_step'] && !waiting_download['finished']) {
-            if (waiting_download['sub_id']) {
-                const sub_missing = !(await db_api.getRecord('subscriptions', {id: waiting_download['sub_id']}));
-                if (sub_missing) {
-                    handleDownloadError(waiting_download, `Download failed as subscription with id '${waiting_download['sub_id']}' is missing!`, 'sub_id_missing');
-                    continue;
-                }
-            }
             // move to next step
             running_downloads_count++;
             if (waiting_download['step_index'] === 0) {
@@ -203,20 +193,6 @@ async function collectInfo(download_uid) {
         return;
     }
 
-    const useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
-    if (useYoutubeDLArchive && !options.ignoreArchive) {
-        const exists_in_archive = await archive_api.existsInArchive(info['extractor'], info['id'], type, download['user_uid'], download['sub_id']);
-        if (exists_in_archive) {
-            const error = `File '${info['title']}' already exists in archive! Disable the archive or override to continue downloading.`;
-            logger.warn(error);
-            if (download_uid) {
-                const download = await db_api.getRecord('download_queue', {uid: download_uid});
-                await handleDownloadError(download, error, 'exists_in_archive');
-                return;
-            }
-        }
-    }
-
     let category = null;
 
     // check if it fits into a category. If so, then get info again using new args
@@ -296,14 +272,14 @@ async function downloadQueuedFile(download_uid) {
             clearInterval(download_checker);
             if (err) {
                 logger.error(err.stderr);
-                await handleDownloadError(download, err.stderr);
+                await handleDownloadError(download_uid, err.stderr);
                 resolve(false);
                 return;
             } else if (output) {
                 if (output.length === 0 || output[0].length === 0) {
                     // ERROR!
                     const error_message = `No output received for video download, check if it exists in your archive.`;
-                    await handleDownloadError(download, error_message, 'no_output');
+                    await handleDownloadError(download_uid, error_message);
                     logger.warn(error_message);
                     resolve(false);
                     return;
@@ -312,10 +288,7 @@ async function downloadQueuedFile(download_uid) {
                 for (let i = 0; i < output.length; i++) {
                     let output_json = null;
                     try {
-                        // we have to do this because sometimes there will be leading characters before the actual json
-                        const start_idx = output[i].indexOf('{"');
-                        const clean_output = output[i].slice(start_idx, output[i].length);
-                        output_json = JSON.parse(clean_output);
+                        output_json = JSON.parse(output[i]);
                     } catch(e) {
                         output_json = null;
                     }
@@ -368,14 +341,17 @@ async function downloadQueuedFile(download_uid) {
                     // registers file in DB
                     const file_obj = await db_api.registerFileDB(full_file_path, type, download['user_uid'], category, download['sub_id'] ? download['sub_id'] : null, options.cropFileSettings);
 
-                    const useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
-                    if (useYoutubeDLArchive && !options.ignoreArchive) await archive_api.addToArchive(output_json['extractor'], output_json['id'], type, output_json['title'], download['user_uid'], download['sub_id']);
-
-                    notifications_api.sendDownloadNotification(file_obj, download['user_uid']);
-
                     file_objs.push(file_obj);
                 }
 
+                if (options.merged_string !== null && options.merged_string !== undefined) {
+                    const archive_folder = getArchiveFolder(fileFolderPath, options, download['user_uid']);
+                    const current_merged_archive = fs.readFileSync(path.join(archive_folder, `merged_${type}.txt`), 'utf8');
+                    const diff = current_merged_archive.replace(options.merged_string, '');
+                    const archive_path = path.join(archive_folder, `archive_${type}.txt`);
+                    fs.appendFileSync(archive_path, diff);
+                }
+
                 let container = null;
 
                 if (file_objs.length > 1) {
@@ -387,7 +363,7 @@ async function downloadQueuedFile(download_uid) {
                 } else {
                     const error_message = 'Downloaded file failed to result in metadata object.';
                     logger.error(error_message);
-                    await handleDownloadError(download, error_message, 'no_metadata');
+                    await handleDownloadError(download_uid, error_message);
                 }
 
                 const file_uids = file_objs.map(file_obj => file_obj.uid);
@@ -450,8 +426,7 @@ exports.generateArgs = async (url, type, options, user_uid = null, simulated = f
         if (customQualityConfiguration) {
             qualityPath = ['-f', customQualityConfiguration, '--merge-output-format', 'mp4'];
         } else if (heightParam && heightParam !== '' && !is_audio) {
-            const heightFilter = (maxHeight && default_downloader === 'yt-dlp') ? ['-S', `res:${heightParam}`] : ['-f', `best[height${maxHeight ? '<' : ''}=${heightParam}]+bestaudio`]
-            qualityPath = [...heightFilter, '--merge-output-format', 'mp4'];
+            qualityPath = ['-f', `'(mp4)[height${maxHeight ? '<' : ''}=${heightParam}]`];
         } else if (is_audio) {
             qualityPath = ['--audio-quality', maxBitrate ? maxBitrate : '0']
         }
@@ -488,6 +463,28 @@ exports.generateArgs = async (url, type, options, user_uid = null, simulated = f
             downloadConfig.splice(0, 0, '--external-downloader', customDownloadingAgent);
         }
 
+        let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
+        if (useYoutubeDLArchive) {
+            const archive_folder = getArchiveFolder(fileFolderPath, options, user_uid);
+            const archive_path = path.join(archive_folder, `archive_${type}.txt`);
+
+            await fs.ensureDir(archive_folder);
+            await fs.ensureFile(archive_path);
+
+            const blacklist_path = path.join(archive_folder, `blacklist_${type}.txt`);
+            await fs.ensureFile(blacklist_path);
+
+            const merged_path = path.join(archive_folder, `merged_${type}.txt`);
+            await fs.ensureFile(merged_path);
+            // merges blacklist and regular archive
+            let inputPathList = [archive_path, blacklist_path];
+            await mergeFiles(inputPathList, merged_path);
+
+            options.merged_string = await fs.readFile(merged_path, "utf8");
+
+            downloadConfig.push('--download-archive', merged_path);
+        }
+
         if (config_api.getConfigItem('ytdl_include_thumbnail')) {
             downloadConfig.push('--write-thumbnail');
         }
@@ -562,8 +559,7 @@ exports.getVideoInfoByURL = async (url, args = [], download_uid = null) => {
                     const error = `Error while retrieving info on video with URL ${url} with the following message: output JSON could not be parsed. Output JSON: ${output}`;
                     logger.error(error);
                     if (download_uid) {
-                        const download = await db_api.getRecord('download_queue', {uid: download_uid});
-                        await handleDownloadError(download, error, 'parse_failed');
+                        await handleDownloadError(download_uid, error);
                     }
                     resolve(null);
                 }
@@ -572,8 +568,7 @@ exports.getVideoInfoByURL = async (url, args = [], download_uid = null) => {
                 if (err.stderr) error_message += `\n\n${err.stderr}`;
                 logger.error(error_message);
                 if (download_uid) {
-                    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-                    await handleDownloadError(download, error_message);
+                    await handleDownloadError(download_uid, error_message);
                 }
                 resolve(null);
             }
@@ -639,3 +634,13 @@ exports.generateNFOFile = (info, output_path) => {
     const xml = doc.end({ prettyPrint: true });
     fs.writeFileSync(output_path, xml);
 }
+
+function getArchiveFolder(fileFolderPath, options, user_uid) {
+    if (options.customArchivePath) {
+        return path.join(options.customArchivePath);
+    } else if (user_uid) {
+        return path.join(fileFolderPath, 'archives');
+    } else {
+        return path.join('appdata', 'archives');
+    }
+}

backend/notifications.js

@@ -1,137 +0,0 @@
-const db_api = require('./db');
-const config_api = require('./config');
-const logger = require('./logger');
-const utils = require('./utils');
-
-const { uuid } = require('uuidv4');
-
-const fetch = require('node-fetch');
-const { gotify } = require("gotify");
-const TelegramBot = require('node-telegram-bot-api');
-
-const NOTIFICATION_TYPE_TO_TITLE = {
-    task_finished: 'Task finished',
-    download_complete: 'Download complete',
-    download_error: 'Download error'
-}
-
-const NOTIFICATION_TYPE_TO_BODY = {
-    task_finished: (notification) => notification['data']['task_title'],
-    download_complete: (notification) => {return `${notification['data']['file_title']}\nOriginal URL: ${notification['data']['original_url']}`},
-    download_error: (notification) => {return `Error: ${notification['data']['download_error_type']}\nURL: ${notification['data']['download_url']}`}
-}
-
-const NOTIFICATION_TYPE_TO_URL = {
-    task_finished: () => {return `${utils.getBaseURL()}/#/tasks`},
-    download_complete: (notification) => {return `${utils.getBaseURL()}/#/player;uid=${notification['data']['file_uid']}`},
-    download_error: () => {return `${utils.getBaseURL()}/#/downloads`},
-}
-
-const NOTIFICATION_TYPE_TO_THUMBNAIL = {
-    task_finished: () => null,
-    download_complete: (notification) => notification['data']['file_thumbnail'],
-    download_error: () => null
-}
-
-exports.sendNotification = async (notification) => {
-    // info necessary if we are using 3rd party APIs
-    const type = notification['type'];
-    const title = NOTIFICATION_TYPE_TO_TITLE[type];
-    const body = NOTIFICATION_TYPE_TO_BODY[type](notification);
-    const url = NOTIFICATION_TYPE_TO_URL[type](notification);
-    const thumbnail = NOTIFICATION_TYPE_TO_THUMBNAIL[type](notification);
-
-    if (config_api.getConfigItem('ytdl_use_ntfy_API') && config_api.getConfigItem('ytdl_ntfy_topic_url')) {
-        sendNtfyNotification(body, title, type, url, thumbnail);
-    }
-    if (config_api.getConfigItem('ytdl_use_gotify_API') && config_api.getConfigItem('ytdl_gotify_server_url') && config_api.getConfigItem('ytdl_gotify_app_token')) {
-        sendGotifyNotification(body, title, type, url, thumbnail);
-    }
-    if (config_api.getConfigItem('ytdl_use_telegram_API') && config_api.getConfigItem('ytdl_telegram_bot_token') && config_api.getConfigItem('ytdl_telegram_chat_id')) {
-        sendTelegramNotification(body, title, type, url, thumbnail);
-    }
-    await db_api.insertRecordIntoTable('notifications', notification);
-    return notification;
-}
-
-exports.sendTaskNotification = async (task_obj, confirmed) => {
-    if (!notificationEnabled('task_finished')) return;
-    // workaround for tasks which are user_uid agnostic
-    const user_uid = config_api.getConfigItem('ytdl_multi_user_mode') ? 'admin' : null;
-    await db_api.removeAllRecords('notifications', {"data.task_key": task_obj.key});
-    const data = {task_key: task_obj.key, task_title: task_obj.title, confirmed: confirmed};
-    const notification = exports.createNotification('task_finished', ['view_tasks'], data, user_uid);
-    return await exports.sendNotification(notification);
-}
-
-exports.sendDownloadNotification = async (file, user_uid) => {
-    if (!notificationEnabled('download_complete')) return;
-    const data = {file_uid: file.uid, file_title: file.title, file_thumbnail: file.thumbnailURL, original_url: file.url};
-    const notification = exports.createNotification('download_complete', ['play'], data, user_uid);
-    return await exports.sendNotification(notification);
-}
-
-exports.sendDownloadErrorNotification = async (download, user_uid, error_type = null) => {
-    if (!notificationEnabled('download_error')) return;
-    const data = {download_uid: download.uid, download_url: download.url, download_error_type: error_type};
-    const notification = exports.createNotification('download_error', ['view_download_error', 'retry_download'], data, user_uid);
-    return await exports.sendNotification(notification);
-}
-
-exports.createNotification = (type, actions, data, user_uid) => {
-    const notification = {
-        type: type,
-        actions: actions,
-        data: data,
-        user_uid: user_uid,
-        uid: uuid(),
-        read: false,
-        timestamp: Date.now()/1000
-    }
-    return notification;
-}
-
-function notificationEnabled(type) {
-    return config_api.getConfigItem('ytdl_enable_notifications') && (config_api.getConfigItem('ytdl_enable_all_notifications') || config_api.getConfigItem('ytdl_allowed_notification_types').includes(type));
-}
-
-function sendNtfyNotification(body, title, type, url, thumbnail) {
-    logger.verbose('Sending notification to ntfy');
-    fetch(config_api.getConfigItem('ytdl_ntfy_topic_url'), {
-        method: 'POST',
-        body: body,
-        headers: {
-            'Title': title,
-            'Tags': type,
-            'Click': url,
-            'Attach': thumbnail
-        }
-    });
-}
-
-async function sendGotifyNotification(body, title, type, url, thumbnail) {
-    logger.verbose('Sending notification to gotify');
-    await gotify({
-        server: config_api.getConfigItem('ytdl_gotify_server_url'),
-        app: config_api.getConfigItem('ytdl_gotify_app_token'),
-        title: title,
-        message: body,
-        tag: type,
-        priority: 5, // Keeping default from docs, may want to change this,
-        extras: {
-            "client::notification": {
-                click: { url: url },
-                bigImageUrl: thumbnail
-            }
-        }
-      });
-}
-
-async function sendTelegramNotification(body, title, type, url, thumbnail) {
-    logger.verbose('Sending notification to Telegram');
-    const bot_token = config_api.getConfigItem('ytdl_telegram_bot_token');
-    const chat_id = config_api.getConfigItem('ytdl_telegram_chat_id');
-    const bot = new TelegramBot(bot_token);
-    if (thumbnail) await bot.sendPhoto(chat_id, thumbnail);
-    bot.sendMessage(chat_id, `<b>${title}</b>\n\n${body}\n<a href="${url}">${url}</a>`, {parse_mode: 'HTML'});
-}

backend/package.json

@@ -27,12 +27,10 @@
     "compression": "^1.7.4",
     "config": "^3.2.3",
     "express": "^4.17.3",
-    "feed": "^4.2.2",
+    "express-session": "^1.17.3",
     "fluent-ffmpeg": "^2.1.2",
     "fs-extra": "^9.0.0",
-    "gotify": "^1.1.0",
     "jsonwebtoken": "^8.5.1",
-    "lodash": "^4.17.21",
     "lowdb": "^1.0.0",
     "md5": "^2.2.1",
     "merge-files": "^0.1.2",
@@ -43,10 +41,9 @@
     "node-fetch": "^2.6.7",
     "node-id3": "^0.1.14",
     "node-schedule": "^2.1.0",
-    "node-telegram-bot-api": "^0.61.0",
-    "passport": "^0.4.1",
+    "passport": "^0.6.0",
     "passport-http": "^0.3.0",
-    "passport-jwt": "^4.0.1",
+    "passport-jwt": "^4.0.0",
     "passport-ldapauth": "^3.0.1",
     "passport-local": "^1.0.0",
     "progress": "^2.0.3",

backend/subscriptions.js

@@ -3,7 +3,6 @@ const path = require('path');
 const youtubedl = require('youtube-dl');
 
 const config_api = require('./config');
-const archive_api = require('./archive');
 const utils = require('./utils');
 const logger = require('./logger');
 
@@ -139,25 +138,28 @@ async function unsubscribe(sub, deleteMode, user_uid = null) {
 
     const appendedBasePath = getAppendedBasePath(sub, basePath);
     if (deleteMode && (await fs.pathExists(appendedBasePath))) {
+        if (sub.archive && (await fs.pathExists(sub.archive))) {
+            const archive_file_path = path.join(sub.archive, 'archive.txt');
+            // deletes archive if it exists
+            // TODO: Keep entries in blacklist_video.txt by moving them to a global blacklist
+            if (await fs.pathExists(archive_file_path)) {
+                await fs.unlink(archive_file_path);
+            }
+            await fs.rmdir(sub.archive);
+        }
         await fs.remove(appendedBasePath);
     }
-
-    await db_api.removeAllRecords('archives', {sub_id: sub.id});
 }
 
 async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null, user_uid = null) {
-    if (typeof sub === 'string') {
-        // TODO: fix bad workaround where sub is a sub_id
-        sub = await db_api.getRecord('subscriptions', {sub_id: sub});
-    }
     // TODO: combine this with deletefile
     let basePath = null;
     basePath = user_uid ? path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions')
                         : config_api.getConfigItem('ytdl_subscriptions_base_path');
+    const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
     const appendedBasePath = getAppendedBasePath(sub, basePath);
     const name = file;
     let retrievedID = null;
-    let retrievedExtractor = null;
 
     await db_api.removeRecord('files', {uid: file_uid});
 
@@ -176,9 +178,7 @@ async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null,
     ]);
 
     if (jsonExists) {
-        const info_json = fs.readJSONSync(jsonPath);
-        retrievedID = info_json['id'];
-        retrievedExtractor = info_json['extractor'];
+        retrievedID = fs.readJSONSync(jsonPath)['id'];
         await fs.unlink(jsonPath);
     }
 
@@ -196,9 +196,11 @@ async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null,
             return false;
         } else {
             // check if the user wants the video to be redownloaded (deleteForever === false)
-            const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
-            if (useArchive && !deleteForever) {
-                await archive_api.removeFromArchive(retrievedExtractor, retrievedID, sub.type, user_uid, sub.id);
+            if (useArchive && retrievedID) {
+                const archive_path = utils.getArchiveFolder(sub.type, user_uid, sub);
+
+                // Remove file ID from the archive file, and write it to the blacklist (if enabled)
+                await utils.deleteFileFromArchive(file_uid, sub.type, archive_path, retrievedID, deleteForever);
             }
             return true;
         }
@@ -329,6 +331,8 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
     else
         basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
 
+    const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
+
     let appendedBasePath = getAppendedBasePath(sub, basePath);
 
     const file_output = config_api.getConfigItem('ytdl_default_file_output') ? config_api.getConfigItem('ytdl_default_file_output') : '%(title)s';
@@ -364,6 +368,21 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
         downloadConfig.push(...customArgsArray);
     }
 
+    let archive_dir = null;
+    let archive_path = null;
+
+    if (useArchive && !redownload) {
+        if (sub.archive) {
+            archive_dir = sub.archive;
+            if (sub.type && sub.type === 'audio') {
+                archive_path = path.join(archive_dir, 'merged_audio.txt');
+            } else {
+                archive_path = path.join(archive_dir, 'merged_video.txt');
+            }            
+        }
+        downloadConfig.push('--download-archive', archive_path);
+    }
+
     if (sub.timerange && !redownload) {
         downloadConfig.push('--dateafter', sub.timerange);
     }
@@ -406,14 +425,7 @@ async function getFilesToDownload(sub, output_jsons) {
             if (file_with_path_exists) {
                 // or maybe just overwrite???
                 logger.info(`Skipping adding file ${output_json['_filename']} for subscription ${sub.name} as a file with that path already exists.`)
-                continue;
             }
-            const useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
-            if (useYoutubeDLArchive) {
-                const exists_in_archive = await archive_api.existsInArchive(output_json['extractor'], output_json['id'], sub.type, sub.user_uid, sub.id);
-                if (exists_in_archive) continue;
-            }
-
             files_to_download.push(output_json);
         }
     }
@@ -432,12 +444,7 @@ async function getAllSubscriptions() {
 }
 
 async function getSubscription(subID) {
-    // stringify and parse because we may override the 'downloading' property
-    const sub = JSON.parse(JSON.stringify(await db_api.getRecord('subscriptions', {id: subID})));
-    // now with the download_queue, we may need to override 'downloading'
-    const current_downloads = await db_api.getRecords('download_queue', {running: true, sub_id: sub.id}, true);
-    if (!sub['downloading']) sub['downloading'] = current_downloads > 0;
-    return sub;
+    return await db_api.getRecord('subscriptions', {id: subID});
 }
 
 async function getSubscriptionByName(subName, user_uid = null) {

backend/tasks.js

@@ -1,7 +1,5 @@
 const db_api = require('./db');
-const notifications_api = require('./notifications');
 const youtubedl_api = require('./youtube-dl');
-const archive_api = require('./archive');
 
 const fs = require('fs-extra');
 const logger = require('./logger');
@@ -35,28 +33,6 @@ const TASKS = {
         confirm: youtubedl_api.updateYoutubeDL,
         title: 'Update youtube-dl',
         job: null
-    },
-    delete_old_files: {
-        run: checkForAutoDeleteFiles,
-        confirm: autoDeleteFiles,
-        title: 'Delete old files',
-        job: null
-    },
-    import_legacy_archives: {
-        run: archive_api.importArchives,
-        title: 'Import legacy archives',
-        job: null
-    }
-}
-
-const defaultOptions = {
-    all: {
-        auto_confirm: false
-    },
-    delete_old_files: {
-        blacklist_files: false,
-        blacklist_subscription_files: false,
-        threshold_days: ''
     }
 }
 
@@ -69,7 +45,7 @@ function scheduleJob(task_key, schedule) {
         const dayOfWeek = schedule['data']['dayOfWeek'] != null       ? schedule['data']['dayOfWeek'] : null;
         const hour = schedule['data']['hour']           != null       ? schedule['data']['hour']      : null;
         const minute = schedule['data']['minute']       != null       ? schedule['data']['minute']    : null;
-        converted_schedule = new scheduler.RecurrenceRule(null, null, null, dayOfWeek, hour, minute, undefined, schedule['data']['tz'] ? schedule['data']['tz'] : undefined);
+        converted_schedule = new scheduler.RecurrenceRule(null, null, null, dayOfWeek, hour, minute);
     } else {
         logger.error(`Failed to schedule job '${task_key}' as the type '${schedule['type']}' is invalid.`)
         return null;
@@ -81,7 +57,7 @@ function scheduleJob(task_key, schedule) {
             logger.verbose(`Skipping running task ${task_state['key']} as it is already in progress.`);
             return;
         }
-
+        
         // remove schedule if it's a one-time task
         if (task_state['schedule']['type'] !== 'recurring') await db_api.updateRecord('tasks', {key: task_key}, {schedule: null});
         // we're just "running" the task, any confirmation should be user-initiated
@@ -101,10 +77,9 @@ exports.setupTasks = async () => {
     const tasks_keys = Object.keys(TASKS);
     for (let i = 0; i < tasks_keys.length; i++) {
         const task_key = tasks_keys[i];
-        const mergedDefaultOptions = Object.assign(defaultOptions['all'], defaultOptions[task_key] || {});
         const task_in_db = await db_api.getRecord('tasks', {key: task_key});
         if (!task_in_db) {
-            // insert task metadata into table if missing, eventually move title to UI
+            // insert task metadata into table if missing
             await db_api.insertRecordIntoTable('tasks', {
                 key: task_key,
                 title: TASKS[task_key]['title'],
@@ -115,17 +90,9 @@ exports.setupTasks = async () => {
                 data: null,
                 error: null,
                 schedule: null,
-                options: Object.assign(defaultOptions['all'], defaultOptions[task_key] || {})
+                options: {}
             });
         } else {
-            // verify all options exist in task
-            for (const key of Object.keys(mergedDefaultOptions)) {
-                if (!(task_in_db.options && task_in_db.options.hasOwnProperty(key))) {
-                    const option_key = `options.${key}`
-                    await db_api.updateRecord('tasks', {key: task_key}, {[option_key]: mergedDefaultOptions[key]});
-                }
-            }
-
             // reset task if necessary
             await db_api.updateRecord('tasks', {key: task_key}, {running: false, confirming: false});
 
@@ -156,23 +123,15 @@ exports.executeTask = async (task_key) => {
 
 exports.executeRun = async (task_key) => {
     logger.verbose(`Running task ${task_key}`);
-    await db_api.updateRecord('tasks', {key: task_key}, {error: null})
     // don't set running to true when backup up DB as it will be stick "running" if restored
     if (task_key !== 'backup_local_db') await db_api.updateRecord('tasks', {key: task_key}, {running: true});
     const data = await TASKS[task_key].run();
     await db_api.updateRecord('tasks', {key: task_key}, {data: TASKS[task_key]['confirm'] ? data : null, last_ran: Date.now()/1000, running: false});
     logger.verbose(`Finished running task ${task_key}`);
-    const task_obj = await db_api.getRecord('tasks', {key: task_key});
-    await notifications_api.sendTaskNotification(task_obj, false);
-
-    if (task_obj['options'] && task_obj['options']['auto_confirm']) {
-        exports.executeConfirm(task_key);
-    }
 }
 
 exports.executeConfirm = async (task_key) => {
     logger.verbose(`Confirming task ${task_key}`);
-    await db_api.updateRecord('tasks', {key: task_key}, {error: null})
     if (!TASKS[task_key]['confirm']) {
         return null;
     }
@@ -182,7 +141,6 @@ exports.executeConfirm = async (task_key) => {
     await TASKS[task_key].confirm(data);
     await db_api.updateRecord('tasks', {key: task_key}, {confirming: false, last_confirmed: Date.now()/1000, data: null});
     logger.verbose(`Finished confirming task ${task_key}`);
-    await notifications_api.sendTaskNotification(task_obj, false);
 }
 
 exports.updateTaskSchedule = async (task_key, schedule) => {
@@ -235,31 +193,4 @@ async function removeDuplicates(data) {
     }
 }
 
-// auto delete files
-
-async function checkForAutoDeleteFiles() {
-    const task_obj = await db_api.getRecord('tasks', {key: 'delete_old_files'});
-    if (!task_obj['options'] || !task_obj['options']['threshold_days']) {
-        const error_message = 'Failed to do delete check because no limit was set!';
-        logger.error(error_message);
-        await db_api.updateRecord('tasks', {key: 'delete_old_files'}, {error: error_message})
-        return null;
-    }
-    const delete_older_than_timestamp = Date.now() - task_obj['options']['threshold_days']*86400*1000;
-    const files = (await db_api.getRecords('files', {registered: {$lt: delete_older_than_timestamp}}))
-    const files_to_remove = files.map(file => {return {uid: file.uid, sub_id: file.sub_id}});
-    return {files_to_remove: files_to_remove};
-}
-
-async function autoDeleteFiles(data) {
-    const task_obj = await db_api.getRecord('tasks', {key: 'delete_old_files'});
-    if (data['files_to_remove']) {
-        logger.info(`Removing ${data['files_to_remove'].length} old files!`);
-        for (let i = 0; i < data['files_to_remove'].length; i++) {
-            const file_to_remove = data['files_to_remove'][i];
-            await db_api.deleteFile(file_to_remove['uid'], task_obj['options']['blacklist_files'] || (file_to_remove['sub_id'] && file_to_remove['blacklist_subscription_files']));
-        }
-    }
-}
-
 exports.TASKS = TASKS;

backend/test/tests.js

@@ -3,6 +3,7 @@ const low = require('lowdb')
 const winston = require('winston');
 const path = require('path');
 
+process.chdir('./backend')
 
 const FileSync = require('lowdb/adapters/FileSync');
 
@@ -37,7 +38,6 @@ var auth_api = require('../authentication/auth');
 var db_api = require('../db');
 const utils = require('../utils');
 const subscriptions_api = require('../subscriptions');
-const archive_api = require('../archive');
 const fs = require('fs-extra');
 const { uuid } = require('uuidv4');
 const NodeID3 = require('node-id3');
@@ -66,12 +66,12 @@ const sample_video_json = {
 
 describe('Database', async function() {
     describe('Import', async function() {
-        // it('Migrate', async function() {
-        //     await db_api.connectToDB();
-        //     await db_api.removeAllRecords();
-        //     const success = await db_api.importJSONToDB(db.value(), users_db.value());
-        //     assert(success);
-        // });
+        it('Migrate', async function() {
+            await db_api.connectToDB();
+            await db_api.removeAllRecords();
+            const success = await db_api.importJSONToDB(db.value(), users_db.value());
+            assert(success);
+        });
 
         it('Transfer to remote', async function() {
             await db_api.removeAllRecords('test');
@@ -104,190 +104,157 @@ describe('Database', async function() {
         });
     });
 
+    describe('Export', function() {
+
+    });
+
+
     describe('Basic functions', async function() {
-        
-        // test both local_db and remote_db
-        const local_db_modes = [false, true];
+        beforeEach(async function() {
+            await db_api.connectToDB();
+            await db_api.removeAllRecords('test');
+        });
+        it('Add and read record', async function() {
+            this.timeout(120000);
+            await db_api.insertRecordIntoTable('test', {test_add: 'test', test_undefined: undefined, test_null: undefined});
+            const added_record = await db_api.getRecord('test', {test_add: 'test', test_undefined: undefined, test_null: null});
+            assert(added_record['test_add'] === 'test');
+            await db_api.removeRecord('test', {test_add: 'test'});
+        });
 
-        for (const local_db_mode of local_db_modes) {
-            let use_local_db = local_db_mode;
-            describe(`Use local DB - ${use_local_db}`, async function() {
-                beforeEach(async function() {
-                    if (!use_local_db) {
-                        this.timeout(120000);
-                        await db_api.connectToDB(0);
-                    }
-                    await db_api.removeAllRecords('test');
+        it('Find duplicates by key', async function() {
+            const test_duplicates = [
+                {
+                    test: 'testing',
+                    key: '1'
+                },
+                {
+                    test: 'testing',
+                    key: '2'
+                },
+                {
+                    test: 'testing_missing',
+                    key: '3'
+                },
+                {
+                    test: 'testing',
+                    key: '4'
+                }
+            ];
+            await db_api.insertRecordsIntoTable('test', test_duplicates);
+            const duplicates = await db_api.findDuplicatesByKey('test', 'test');
+            console.log(duplicates);
+        });
+
+        it('Update record', async function() {
+            await db_api.insertRecordIntoTable('test', {test_update: 'test'});
+            await db_api.updateRecord('test', {test_update: 'test'}, {added_field: true});
+            const updated_record = await db_api.getRecord('test', {test_update: 'test'});
+            assert(updated_record['added_field']);
+            await db_api.removeRecord('test', {test_update: 'test'});
+        });
+
+        it('Remove record', async function() {
+            await db_api.insertRecordIntoTable('test', {test_remove: 'test'});
+            const delete_succeeded = await db_api.removeRecord('test', {test_remove: 'test'});
+            assert(delete_succeeded);
+            const deleted_record = await db_api.getRecord('test', {test_remove: 'test'});
+            assert(!deleted_record);
+        });
+
+        it('Push to record array', async function() {
+            await db_api.insertRecordIntoTable('test', {test: 'test', test_array: []});
+            await db_api.pushToRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
+            const record = await db_api.getRecord('test', {test: 'test'});
+            assert(record);
+            assert(record['test_array'].length === 1);
+        });
+
+        it('Pull from record array', async function() {
+            await db_api.insertRecordIntoTable('test', {test: 'test', test_array: ['test_item']});
+            await db_api.pullFromRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
+            const record = await db_api.getRecord('test', {test: 'test'});
+            assert(record);
+            assert(record['test_array'].length === 0);
+        });
+
+        it('Bulk add', async function() {
+            this.timeout(120000);
+            const NUM_RECORDS_TO_ADD = 2002; // max batch ops is 1000
+            const test_records = [];
+            for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
+                test_records.push({
+                    uid: uuid()
                 });
-                it('Add and read record', async function() {
-                    this.timeout(120000);
-                    await db_api.insertRecordIntoTable('test', {test_add: 'test', test_undefined: undefined, test_null: undefined});
-                    const added_record = await db_api.getRecord('test', {test_add: 'test', test_undefined: undefined, test_null: null});
-                    assert(added_record['test_add'] === 'test');
-                    await db_api.removeRecord('test', {test_add: 'test'});
-                });
-                it('Add and read record - Nested property', async function() {
-                    this.timeout(120000);
-                    await db_api.insertRecordIntoTable('test', {test_add: 'test', test_nested: {test_key1: 'test1', test_key2: 'test2'}});
-                    const added_record = await db_api.getRecord('test', {test_add: 'test', 'test_nested.test_key1': 'test1', 'test_nested.test_key2': 'test2'});
-                    const not_added_record = await db_api.getRecord('test', {test_add: 'test', 'test_nested.test_key1': 'test1', 'test_nested.test_key2': 'test3'});
-                    assert(added_record['test_add'] === 'test');
-                    assert(!not_added_record);
-                    await db_api.removeRecord('test', {test_add: 'test'});
-                });
-                it('Replace filter', async function() {
-                    this.timeout(120000);
-                    await db_api.insertRecordIntoTable('test', {test_replace_filter: 'test', test_nested: {test_key1: 'test1', test_key2: 'test2'}}, {test_nested: {test_key1: 'test1', test_key2: 'test2'}});
-                    await db_api.insertRecordIntoTable('test', {test_replace_filter: 'test', test_nested: {test_key1: 'test1', test_key2: 'test2'}}, {test_nested: {test_key1: 'test1', test_key2: 'test2'}});
-                    const count = await db_api.getRecords('test', {test_replace_filter: 'test'}, true);
-                    assert(count === 1);
-                    await db_api.removeRecord('test', {test_replace_filter: 'test'});
-                });
-                it('Find duplicates by key', async function() {
-                    const test_duplicates = [
-                        {
-                            test: 'testing',
-                            key: '1'
-                        },
-                        {
-                            test: 'testing',
-                            key: '2'
-                        },
-                        {
-                            test: 'testing_missing',
-                            key: '3'
-                        },
-                        {
-                            test: 'testing',
-                            key: '4'
-                        }
-                    ];
-                    await db_api.insertRecordsIntoTable('test', test_duplicates);
-                    const duplicates = await db_api.findDuplicatesByKey('test', 'test');
-                    console.log(duplicates);
+            }
+            const succcess = await db_api.bulkInsertRecordsIntoTable('test', test_records);
+
+            const received_records = await db_api.getRecords('test');
+            assert(succcess && received_records && received_records.length === NUM_RECORDS_TO_ADD);
+        });
+
+        it('Bulk update', async function() {
+            // bulk add records
+            const NUM_RECORDS_TO_ADD = 100; // max batch ops is 1000
+            const test_records = [];
+            const update_obj = {};
+            for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
+                const test_uid =  uuid();
+                test_records.push({
+                    uid: test_uid
                 });
+                update_obj[test_uid] = {added_field: true};
+            }
+            let success = await db_api.bulkInsertRecordsIntoTable('test', test_records);
+            assert(success);
 
-                it('Update record', async function() {
-                    await db_api.insertRecordIntoTable('test', {test_update: 'test'});
-                    await db_api.updateRecord('test', {test_update: 'test'}, {added_field: true});
-                    const updated_record = await db_api.getRecord('test', {test_update: 'test'});
-                    assert(updated_record['added_field']);
-                    await db_api.removeRecord('test', {test_update: 'test'});
-                });
+            // makes sure they are added
+            const received_records = await db_api.getRecords('test');
+            assert(received_records && received_records.length === NUM_RECORDS_TO_ADD);
 
-                it('Remove record', async function() {
-                    await db_api.insertRecordIntoTable('test', {test_remove: 'test'});
-                    const delete_succeeded = await db_api.removeRecord('test', {test_remove: 'test'});
-                    assert(delete_succeeded);
-                    const deleted_record = await db_api.getRecord('test', {test_remove: 'test'});
-                    assert(!deleted_record);
-                });
+            success = await db_api.bulkUpdateRecords('test', 'uid', update_obj);
+            assert(success);
 
-                it('Remove records', async function() {
-                    await db_api.insertRecordIntoTable('test', {test_remove: 'test', test_property: 'test'});
-                    await db_api.insertRecordIntoTable('test', {test_remove: 'test', test_property: 'test2'});
-                    await db_api.insertRecordIntoTable('test', {test_remove: 'test'});
-                    const delete_succeeded = await db_api.removeAllRecords('test', {test_remove: 'test'});
-                    assert(delete_succeeded);
-                    const count = await db_api.getRecords('test', {test_remove: 'test'}, true);
-                    assert(count === 0);
-                });
+            const received_updated_records = await db_api.getRecords('test');
+            for (let i = 0; i < received_updated_records.length; i++) {
+                success &= received_updated_records[i]['added_field'];
+            }
+            assert(success);
+        });
 
-                it('Push to record array', async function() {
-                    await db_api.insertRecordIntoTable('test', {test: 'test', test_array: []});
-                    await db_api.pushToRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
-                    const record = await db_api.getRecord('test', {test: 'test'});
-                    assert(record);
-                    assert(record['test_array'].length === 1);
-                });
+        it('Stats', async function() {
+            const stats = await db_api.getDBStats();
+            assert(stats);
+        });
 
-                it('Pull from record array', async function() {
-                    await db_api.insertRecordIntoTable('test', {test: 'test', test_array: ['test_item']});
-                    await db_api.pullFromRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
-                    const record = await db_api.getRecord('test', {test: 'test'});
-                    assert(record);
-                    assert(record['test_array'].length === 0);
-                });
+        it('Query speed', async function() {
+            this.timeout(120000); 
+            const NUM_RECORDS_TO_ADD = 300004; // max batch ops is 1000
+            const test_records = [];
+            let random_uid = '06241f83-d1b8-4465-812c-618dfa7f2943';
+            for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
+                const uid = uuid();
+                if (i === NUM_RECORDS_TO_ADD/2) random_uid = uid;
+                test_records.push({"id":"RandomTextRandomText","title":"RandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomText","thumbnailURL":"https://i.ytimg.com/vi/randomurl/maxresdefault.jpg","isAudio":true,"duration":312,"url":"https://www.youtube.com/watch?v=randomvideo","uploader":"randomUploader","size":5060157,"path":"audio\\RandomTextRandomText.mp3","upload_date":"2016-05-11","description":"RandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomText","view_count":118689353,"height":null,"abr":160,"uid": uid,"registered":1626672120632});
+            }
+            const insert_start = Date.now();
+            let success = await db_api.bulkInsertRecordsIntoTable('test', test_records);
+            const insert_end = Date.now();
 
-                it('Bulk add', async function() {
-                    this.timeout(120000);
-                    const NUM_RECORDS_TO_ADD = 2002; // max batch ops is 1000
-                    const test_records = [];
-                    for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
-                        test_records.push({
-                            uid: uuid()
-                        });
-                    }
-                    const succcess = await db_api.bulkInsertRecordsIntoTable('test', test_records);
+            console.log(`Insert time: ${(insert_end - insert_start)/1000}s`);
 
-                    const received_records = await db_api.getRecords('test');
-                    assert(succcess && received_records && received_records.length === NUM_RECORDS_TO_ADD);
-                });
+            const query_start = Date.now();
+            const random_record = await db_api.getRecord('test', {uid: random_uid});
+            const query_end = Date.now();
 
-                it('Bulk update', async function() {
-                    // bulk add records
-                    const NUM_RECORDS_TO_ADD = 100; // max batch ops is 1000
-                    const test_records = [];
-                    const update_obj = {};
-                    for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
-                        const test_uid =  uuid();
-                        test_records.push({
-                            uid: test_uid
-                        });
-                        update_obj[test_uid] = {added_field: true};
-                    }
-                    let success = await db_api.bulkInsertRecordsIntoTable('test', test_records);
-                    assert(success);
+            console.log(random_record)
 
-                    // makes sure they are added
-                    const received_records = await db_api.getRecords('test');
-                    assert(received_records && received_records.length === NUM_RECORDS_TO_ADD);
+            console.log(`Query time: ${(query_end - query_start)/1000}s`);
 
-                    success = await db_api.bulkUpdateRecordsByKey('test', 'uid', update_obj);
-                    assert(success);
+            success = !!random_record;
 
-                    const received_updated_records = await db_api.getRecords('test');
-                    for (let i = 0; i < received_updated_records.length; i++) {
-                        success &= received_updated_records[i]['added_field'];
-                    }
-                    assert(success);
-                });
-
-                it('Stats', async function() {
-                    const stats = await db_api.getDBStats();
-                    assert(stats);
-                });
-
-                it('Query speed', async function() {
-                    this.timeout(120000); 
-                    const NUM_RECORDS_TO_ADD = 300004; // max batch ops is 1000
-                    const test_records = [];
-                    let random_uid = '06241f83-d1b8-4465-812c-618dfa7f2943';
-                    for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
-                        const uid = uuid();
-                        if (i === NUM_RECORDS_TO_ADD/2) random_uid = uid;
-                        test_records.push({"id":"RandomTextRandomText","title":"RandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomText","thumbnailURL":"https://i.ytimg.com/vi/randomurl/maxresdefault.jpg","isAudio":true,"duration":312,"url":"https://www.youtube.com/watch?v=randomvideo","uploader":"randomUploader","size":5060157,"path":"audio\\RandomTextRandomText.mp3","upload_date":"2016-05-11","description":"RandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomText","view_count":118689353,"height":null,"abr":160,"uid": uid,"registered":1626672120632});
-                    }
-                    const insert_start = Date.now();
-                    let success = await db_api.bulkInsertRecordsIntoTable('test', test_records);
-                    const insert_end = Date.now();
-
-                    console.log(`Insert time: ${(insert_end - insert_start)/1000}s`);
-
-                    const query_start = Date.now();
-                    const random_record = await db_api.getRecord('test', {uid: random_uid});
-                    const query_end = Date.now();
-
-                    console.log(random_record)
-
-                    console.log(`Query time: ${(query_end - query_start)/1000}s`);
-
-                    success = !!random_record;
-
-                    assert(success);
-                });
-            });
-        }
+            assert(success);
+        });
     });
 
     describe('Local DB Filters', async function() {
@@ -322,6 +289,8 @@ describe('Multi User', async function() {
     const playlist_to_test = 'ysabVZz4x';
     beforeEach(async function() {
         await db_api.connectToDB();
+        auth_api.initialize(db_api, logger);
+        subscriptions_api.initialize(db_api, logger);
         user = await auth_api.login('admin', 'pass');
     });
     describe('Authentication', function() {
@@ -624,72 +593,30 @@ describe('Tasks', function() {
 });
 
 describe('Archive', async function() {
+    const archive_path = path.join('test', 'archives');
+    fs.ensureDirSync(archive_path);
+    const archive_file_path = path.join(archive_path, 'archive_video.txt');
+    const blacklist_file_path = path.join(archive_path, 'blacklist_video.txt');
     beforeEach(async function() {
-        await db_api.connectToDB();
-        await db_api.removeAllRecords('archives', {user_uid: 'test_user'});
+        if (fs.existsSync(archive_file_path)) fs.unlinkSync(archive_file_path);
+        fs.writeFileSync(archive_file_path, 'youtube testing1\nyoutube testing2\nyoutube testing3\n');
+
+        if (fs.existsSync(blacklist_file_path)) fs.unlinkSync(blacklist_file_path);
+        fs.writeFileSync(blacklist_file_path, '');
+    });
+    
+    it('Delete from archive', async function() {
+        await utils.deleteFileFromArchive('N/A', 'video', archive_path, 'testing2', false);
+        const new_archive = fs.readFileSync(archive_file_path);
+        assert(!new_archive.includes('testing2'));
     });
 
-    afterEach(async function() {
-        await db_api.removeAllRecords('archives', {user_uid: 'test_user'});
-    });
-
-    it('Import archive', async function() {
-        const archive_text = `
-            testextractor1 testing1
-            testextractor1 testing2
-            testextractor2 testing1
-            testextractor1 testing3
-
-        `;
-        const count = await archive_api.importArchiveFile(archive_text, 'video', 'test_user', 'test_sub');
-        assert(count === 4)
-        const archive_items = await db_api.getRecords('archives', {user_uid: 'test_user', sub_id: 'test_sub'});
-        console.log(archive_items);
-        assert(archive_items.length === 4);
-        assert(archive_items.filter(archive_item => archive_item.extractor === 'testextractor2').length === 1);
-        assert(archive_items.filter(archive_item => archive_item.extractor === 'testextractor1').length === 3);
-
-        const success = await db_api.removeAllRecords('archives', {user_uid: 'test_user', sub_id: 'test_sub'});
-        assert(success);
-    });
-
-    it('Get archive', async function() {
-        await archive_api.addToArchive('testextractor1', 'testing1', 'video', 'test_user');
-        await archive_api.addToArchive('testextractor2', 'testing1', 'video', 'test_user');
-
-        const archive_item1 = await db_api.getRecord('archives', {extractor: 'testextractor1', id: 'testing1'});
-        const archive_item2 = await db_api.getRecord('archives', {extractor: 'testextractor2', id: 'testing1'});
-
-        assert(archive_item1 && archive_item2);
-    });
-
-    it('Archive duplicates', async function() {
-        await archive_api.addToArchive('testextractor1', 'testing1', 'video', 'test_user');
-        await archive_api.addToArchive('testextractor2', 'testing1', 'video', 'test_user');
-        await archive_api.addToArchive('testextractor2', 'testing1', 'video', 'test_user');
-
-        await archive_api.addToArchive('testextractor1', 'testing1', 'audio', 'test_user');
-
-        const count = await db_api.getRecords('archives', {id: 'testing1'}, true);
-        assert(count === 3);
-    });
-
-    it('Remove from archive', async function() {
-        await archive_api.addToArchive('testextractor1', 'testing1', 'video', 'test_user');
-        await archive_api.addToArchive('testextractor2', 'testing1', 'video', 'test_user');
-        await archive_api.addToArchive('testextractor2', 'testing2', 'video', 'test_user');
-
-        const success = await archive_api.removeFromArchive('testextractor2', 'testing1', 'video', 'test_user');
-        assert(success);
-
-        const archive_item1 = await db_api.getRecord('archives', {extractor: 'testextractor1', id: 'testing1'});
-        assert(!!archive_item1);
-        
-        const archive_item2 = await db_api.getRecord('archives', {extractor: 'testextractor2', id: 'testing1'});
-        assert(!archive_item2);
-
-        const archive_item3 = await db_api.getRecord('archives', {extractor: 'testextractor2', id: 'testing2'});
-        assert(!!archive_item3);
+    it('Delete from archive - blacklist', async function() {
+        await utils.deleteFileFromArchive('N/A', 'video', archive_path, 'testing2', true);
+        const new_archive = fs.readFileSync(archive_file_path);
+        const new_blacklist = fs.readFileSync(blacklist_file_path);
+        assert(!new_archive.includes('testing2'));
+        assert(new_blacklist.includes('testing2'));
     });
 });
 

backend/utils.js

@@ -220,6 +220,57 @@ function deleteJSONFile(file_path, type) {
     if (fs.existsSync(alternate_json_path)) fs.unlinkSync(alternate_json_path);
 }
 
+// archive helper functions
+
+async function removeIDFromArchive(archive_path, type, id) {
+    const archive_file = path.join(archive_path, `archive_${type}.txt`);
+    const data = await fs.readFile(archive_file, {encoding: 'utf-8'});
+    if (!data) {
+        logger.error('Archive could not be found.');
+        return;
+    }
+
+    let dataArray = data.split('\n'); // convert file data in an array
+    const searchKeyword = id; // we are looking for a line, contains, key word id in the file
+    let lastIndex = -1; // let say, we have not found the keyword
+
+    for (let index=0; index<dataArray.length; index++) {
+        if (dataArray[index].includes(searchKeyword)) { // check if a line contains the id keyword
+            lastIndex = index; // found a line includes a id keyword
+            break;
+        }
+    }
+
+    if (lastIndex === -1) return null;
+
+    const line = dataArray.splice(lastIndex, 1); // remove the keyword id from the data Array
+
+    // UPDATE FILE WITH NEW DATA
+    const updatedData = dataArray.join('\n');
+    await fs.writeFile(archive_file, updatedData);
+    if (line) return Array.isArray(line) && line.length === 1 ? line[0] : line;
+}
+
+async function writeToBlacklist(archive_folder, type, line) {
+    let blacklistPath = path.join(archive_folder, (type === 'audio') ? 'blacklist_audio.txt' : 'blacklist_video.txt');
+    // adds newline to the beginning of the line
+    line.replace('\n', '');
+    line.replace('\r', '');
+    line = '\n' + line;
+    await fs.appendFile(blacklistPath, line);
+}
+
+async function deleteFileFromArchive(uid, type, archive_path, id, blacklistMode) {
+    const archive_file = path.join(archive_path, `archive_${type}.txt`);
+    if (await fs.pathExists(archive_path)) {
+        const line = id ? await removeIDFromArchive(archive_path, type, id) : null;
+        if (blacklistMode && line) await writeToBlacklist(archive_path, type, line);
+    } else {
+        logger.info(`Could not find archive file for file ${uid}. Creating...`);
+        await fs.close(await fs.open(archive_file, 'w'));
+    }
+}
+
 function durationStringToNumber(dur_str) {
     if (typeof dur_str === 'number') return dur_str;
     let num_sum = 0;
@@ -486,10 +537,6 @@ function getArchiveFolder(type, user_uid = null, sub = null) {
     }
 }
 
-function getBaseURL() {
-    return `${config_api.getConfigItem('ytdl_url')}:${config_api.getConfigItem('ytdl_port')}`
-}
-
 // objects
 
 function File(id, title, thumbnailURL, isAudio, duration, url, uploader, size, path, upload_date, description, view_count, height, abr) {
@@ -507,7 +554,6 @@ function File(id, title, thumbnailURL, isAudio, duration, url, uploader, size, p
     this.view_count = view_count;
     this.height = height;
     this.abr = abr;
-    this.favorite = false;
 }
 
 module.exports = {
@@ -519,6 +565,9 @@ module.exports = {
     getExpectedFileSize: getExpectedFileSize,
     fixVideoMetadataPerms: fixVideoMetadataPerms,
     deleteJSONFile: deleteJSONFile,
+    removeIDFromArchive: removeIDFromArchive,
+    writeToBlacklist: writeToBlacklist,
+    deleteFileFromArchive: deleteFileFromArchive,
     getDownloadedFilesByType: getDownloadedFilesByType,
     createContainerZipFile: createContainerZipFile,
     durationStringToNumber: durationStringToNumber,
@@ -538,6 +587,5 @@ module.exports = {
     searchObjectByString: searchObjectByString,
     stripPropertiesFromObject: stripPropertiesFromObject,
     getArchiveFolder: getArchiveFolder,
-    getBaseURL: getBaseURL,
     File: File
 }

ffmpeg-fetch.sh

@@ -26,7 +26,7 @@ apt-get update && apt-get -y install curl xz-utils
 echo "(2/5) DOWNLOAD - Acquire latest ffmpeg and ffprobe from John van Sickle's master-sourced builds in ffmpeg obtain layer"
 curl -o ffmpeg.txz \
     --connect-timeout 5 \
-    --max-time 120 \
+    --max-time 10 \
     --retry 5 \
     --retry-delay 0 \
     --retry-max-time 40 \

package.json

@@ -21,21 +21,21 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/core": "^15.0.1",
-    "@angular/animations": "^15.0.1",
-    "@angular/cdk": "^15.0.0",
-    "@angular/common": "^15.0.1",
-    "@angular/compiler": "^15.0.1",
-    "@angular/core": "^15.0.1",
-    "@angular/forms": "^15.0.1",
-    "@angular/localize": "^15.0.1",
-    "@angular/material": "^15.0.0",
-    "@angular/platform-browser": "^15.0.1",
-    "@angular/platform-browser-dynamic": "^15.0.1",
-    "@angular/router": "^15.0.1",
+    "@angular-devkit/core": "^13.3.3",
+    "@angular/animations": "^13.3.4",
+    "@angular/cdk": "^13.3.4",
+    "@angular/common": "^13.3.4",
+    "@angular/compiler": "^13.3.4",
+    "@angular/core": "^13.3.4",
+    "@angular/forms": "^13.3.4",
+    "@angular/localize": "^13.3.4",
+    "@angular/material": "^13.3.4",
+    "@angular/platform-browser": "^13.3.4",
+    "@angular/platform-browser-dynamic": "^13.3.4",
+    "@angular/router": "^13.3.4",
     "@fontsource/material-icons": "^4.5.4",
     "@ngneat/content-loader": "^5.0.0",
-    "@videogular/ngx-videogular": "^6.0.0",
+    "@videogular/ngx-videogular": "^5.0.1",
     "core-js": "^2.4.1",
     "crypto-js": "^4.1.1",
     "file-saver": "^2.0.2",
@@ -44,29 +44,29 @@
     "fs-extra": "^10.0.0",
     "material-icons": "^1.10.8",
     "nan": "^2.14.1",
-    "ngx-avatars": "^1.4.1",
+    "ng-lazyload-image": "^7.0.1",
+    "ngx-avatars": "^1.3.1",
     "ngx-file-drop": "^13.0.0",
     "rxjs": "^6.6.3",
     "rxjs-compat": "^6.0.0-rc.0",
     "tslib": "^2.0.0",
-    "typescript": "~4.8.4",
+    "typescript": "~4.6.3",
     "xliff-to-json": "^1.0.4",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.0.1",
-    "@angular/cli": "^15.0.1",
-    "@angular/compiler-cli": "^15.0.1",
-    "@angular/language-service": "^15.0.1",
+    "@angular-devkit/build-angular": "^13.3.3",
+    "@angular/cli": "^13.3.3",
+    "@angular/compiler-cli": "^13.3.4",
+    "@angular/language-service": "^13.3.4",
     "@types/core-js": "^2.5.2",
     "@types/file-saver": "^2.0.1",
     "@types/jasmine": "~3.6.0",
     "@types/node": "^12.11.1",
     "@typescript-eslint/eslint-plugin": "^4.29.0",
     "@typescript-eslint/parser": "^4.29.0",
-    "ajv": "^7.2.4",
     "codelyzer": "^6.0.0",
-    "electron": "^19.1.9",
+    "electron": "^19.0.6",
     "eslint": "^7.32.0",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -76,7 +76,7 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "openapi-typescript-codegen": "^0.23.0",
+    "openapi-typescript-codegen": "^0.21.0",
     "protractor": "~7.0.0",
     "ts-node": "~3.0.4",
     "tslint": "~6.1.0"

src/api-types/index.ts

@@ -3,7 +3,6 @@
 /* eslint-disable */
 
 export type { AddFileToPlaylistRequest } from './models/AddFileToPlaylistRequest';
-export type { Archive } from './models/Archive';
 export type { BaseChangePermissionsRequest } from './models/BaseChangePermissionsRequest';
 export type { binary } from './models/binary';
 export type { body_19 } from './models/body_19';
@@ -27,10 +26,8 @@ export type { DatabaseFile } from './models/DatabaseFile';
 export { DBBackup } from './models/DBBackup';
 export type { DBInfoResponse } from './models/DBInfoResponse';
 export type { DeleteAllFilesResponse } from './models/DeleteAllFilesResponse';
-export type { DeleteArchiveItemsRequest } from './models/DeleteArchiveItemsRequest';
 export type { DeleteCategoryRequest } from './models/DeleteCategoryRequest';
 export type { DeleteMp3Mp4Request } from './models/DeleteMp3Mp4Request';
-export type { DeleteNotificationRequest } from './models/DeleteNotificationRequest';
 export type { DeletePlaylistRequest } from './models/DeletePlaylistRequest';
 export type { DeleteSubscriptionFileRequest } from './models/DeleteSubscriptionFileRequest';
 export type { DeleteUserRequest } from './models/DeleteUserRequest';
@@ -53,8 +50,6 @@ export type { GetAllFilesRequest } from './models/GetAllFilesRequest';
 export type { GetAllFilesResponse } from './models/GetAllFilesResponse';
 export type { GetAllSubscriptionsResponse } from './models/GetAllSubscriptionsResponse';
 export type { GetAllTasksResponse } from './models/GetAllTasksResponse';
-export type { GetArchivesRequest } from './models/GetArchivesRequest';
-export type { GetArchivesResponse } from './models/GetArchivesResponse';
 export type { GetDBBackupsResponse } from './models/GetDBBackupsResponse';
 export type { GetDownloadRequest } from './models/GetDownloadRequest';
 export type { GetDownloadResponse } from './models/GetDownloadResponse';
@@ -68,7 +63,6 @@ export type { GetLogsRequest } from './models/GetLogsRequest';
 export type { GetLogsResponse } from './models/GetLogsResponse';
 export type { GetMp3sResponse } from './models/GetMp3sResponse';
 export type { GetMp4sResponse } from './models/GetMp4sResponse';
-export type { GetNotificationsResponse } from './models/GetNotificationsResponse';
 export type { GetPlaylistRequest } from './models/GetPlaylistRequest';
 export type { GetPlaylistResponse } from './models/GetPlaylistResponse';
 export type { GetPlaylistsRequest } from './models/GetPlaylistsRequest';
@@ -79,22 +73,16 @@ export type { GetSubscriptionResponse } from './models/GetSubscriptionResponse';
 export type { GetTaskRequest } from './models/GetTaskRequest';
 export type { GetTaskResponse } from './models/GetTaskResponse';
 export type { GetUsersResponse } from './models/GetUsersResponse';
-export type { ImportArchiveRequest } from './models/ImportArchiveRequest';
 export type { IncrementViewCountRequest } from './models/IncrementViewCountRequest';
 export type { inline_response_200_15 } from './models/inline_response_200_15';
 export type { LoginRequest } from './models/LoginRequest';
 export type { LoginResponse } from './models/LoginResponse';
-export type { Notification } from './models/Notification';
-export { NotificationAction } from './models/NotificationAction';
-export { NotificationType } from './models/NotificationType';
 export type { Playlist } from './models/Playlist';
 export type { RegisterRequest } from './models/RegisterRequest';
 export type { RegisterResponse } from './models/RegisterResponse';
-export type { RestartDownloadResponse } from './models/RestartDownloadResponse';
 export type { RestoreDBBackupRequest } from './models/RestoreDBBackupRequest';
 export { Schedule } from './models/Schedule';
 export type { SetConfigRequest } from './models/SetConfigRequest';
-export type { SetNotificationsToReadRequest } from './models/SetNotificationsToReadRequest';
 export type { SharingToggle } from './models/SharingToggle';
 export type { Sort } from './models/Sort';
 export type { SubscribeRequest } from './models/SubscribeRequest';
@@ -120,10 +108,8 @@ export type { UpdatePlaylistRequest } from './models/UpdatePlaylistRequest';
 export type { UpdaterStatus } from './models/UpdaterStatus';
 export type { UpdateServerRequest } from './models/UpdateServerRequest';
 export type { UpdateTaskDataRequest } from './models/UpdateTaskDataRequest';
-export type { UpdateTaskOptionsRequest } from './models/UpdateTaskOptionsRequest';
 export type { UpdateTaskScheduleRequest } from './models/UpdateTaskScheduleRequest';
 export type { UpdateUserRequest } from './models/UpdateUserRequest';
-export type { UploadCookiesRequest } from './models/UploadCookiesRequest';
 export type { User } from './models/User';
 export { UserPermission } from './models/UserPermission';
 export type { Version } from './models/Version';

src/api-types/models/Archive.ts

@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { FileType } from './FileType';
-
-export type Archive = {
-    extractor: string;
-    id: string;
-    type: FileType;
-    title: string;
-    user_uid?: string;
-    sub_id?: string;
-    timestamp: number;
-    uid: string;
-};

src/api-types/models/DBInfoResponse.ts

@@ -14,6 +14,5 @@ subscriptions?: TableInfo;
 users?: TableInfo;
 roles?: TableInfo;
 download_queue?: TableInfo;
-archives?: TableInfo;
 };
 };

src/api-types/models/DatabaseFile.ts

@@ -26,7 +26,6 @@ export type DatabaseFile = {
     path: string;
     upload_date: string;
     uid: string;
-    user_uid?: string;
     sharingEnabled?: boolean;
     category?: Category;
     view_count?: number;
@@ -41,5 +40,4 @@ export type DatabaseFile = {
      * In Kbps
      */
     abr?: number;
-    favorite: boolean;
 };

src/api-types/models/DeleteArchiveItemsRequest.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Archive } from './Archive';
-
-export type DeleteArchiveItemsRequest = {
-    archives: Array<Archive>;
-};

src/api-types/models/DeleteNotificationRequest.ts

@@ -1,7 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type DeleteNotificationRequest = {
-    uid: string;
-};

src/api-types/models/DeleteSubscriptionFileRequest.ts

@@ -2,8 +2,12 @@
 /* tslint:disable */
 /* eslint-disable */
 
+import type { SubscriptionRequestData } from './SubscriptionRequestData';
+
 export type DeleteSubscriptionFileRequest = {
-    file_uid: string;
+    file: string;
+    file_uid?: string;
+    sub: SubscriptionRequestData;
     /**
      * If true, does not remove id from archive. Only valid if youtube-dl archive is enabled in settings.
      */

src/api-types/models/Download.ts

@@ -19,10 +19,6 @@ export type Download = {
      * Error text, set if download fails.
      */
     error?: string | null;
-    /**
-     * Error type, may or may not be set in case of an error
-     */
-    error_type?: string | null;
     user_uid?: string;
     sub_id?: string;
     sub_name?: string;

src/api-types/models/DownloadArchiveRequest.ts

@@ -2,9 +2,8 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { FileType } from './FileType';
-
 export type DownloadArchiveRequest = {
-    type?: FileType;
-    sub_id?: string;
+    sub: {
+archive_dir: string;
+};
 };

src/api-types/models/DownloadRequest.ts

@@ -35,18 +35,10 @@ export type DownloadRequest = {
      * Height of the video, if known
      */
     selectedHeight?: string;
-    /**
-     * Max height that should be used, useful for playlists. selectedHeight will override this.
-     */
-    maxHeight?: string;
     /**
      * Specify ffmpeg/avconv audio quality
      */
     maxBitrate?: string;
     type?: FileType;
     cropFileSettings?: CropFileSettings;
-    /**
-     * If using youtube-dl archive, download will ignore it
-     */
-    ignoreArchive?: boolean;
 };

src/api-types/models/GetAllFilesRequest.ts

@@ -13,10 +13,6 @@ export type GetAllFilesRequest = {
      */
     text_search?: string;
     file_type_filter?: FileTypeFilter;
-    /**
-     * If set to true, only gets favorites
-     */
-    favorite_filter?: boolean;
     /**
      * Include if you want to filter by subscription
      */

src/api-types/models/GetArchivesRequest.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { FileType } from './FileType';
-
-export type GetArchivesRequest = {
-    type?: FileType;
-    sub_id?: string;
-};

src/api-types/models/GetArchivesResponse.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Archive } from './Archive';
-
-export type GetArchivesResponse = {
-    archives: Array<Archive>;
-};

src/api-types/models/GetNotificationsResponse.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Notification } from './Notification';
-
-export type GetNotificationsResponse = {
-    notifications?: Array<Notification>;
-};

src/api-types/models/ImportArchiveRequest.ts

@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { FileType } from './FileType';
-
-export type ImportArchiveRequest = {
-    archive: string;
-    type: FileType;
-    sub_id?: string;
-};

src/api-types/models/Notification.ts

@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { NotificationAction } from './NotificationAction';
-import type { NotificationType } from './NotificationType';
-
-export type Notification = {
-    type: NotificationType;
-    uid: string;
-    user_uid?: string;
-    action?: Array<NotificationAction>;
-    read: boolean;
-    data?: any;
-    timestamp: number;
-};

src/api-types/models/NotificationAction.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export enum NotificationAction {
-    PLAY = 'play',
-    RETRY_DOWNLOAD = 'retry_download',
-    VIEW_DOWNLOAD_ERROR = 'view_download_error',
-    VIEW_TASKS = 'view_tasks',
-}

src/api-types/models/NotificationType.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export enum NotificationType {
-    DOWNLOAD_COMPLETE = 'download_complete',
-    DOWNLOAD_ERROR = 'download_error',
-    TASK_FINISHED = 'task_finished',
-}

src/api-types/models/Playlist.ts

@@ -14,5 +14,4 @@ export type Playlist = {
     duration: number;
     user_uid?: string;
     auto?: boolean;
-    sharingEnabled?: boolean;
 };

src/api-types/models/RestartDownloadResponse.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { SuccessObject } from './SuccessObject';
-
-export type RestartDownloadResponse = (SuccessObject & {
-new_download_uid?: string;
-});

src/api-types/models/Schedule.ts

@@ -9,7 +9,6 @@ dayOfWeek?: Array<number>;
 hour?: number;
 minute?: number;
 timestamp?: number;
-tz?: string;
 };
 };
 

src/api-types/models/SetNotificationsToReadRequest.ts

@@ -1,7 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type SetNotificationsToReadRequest = {
-    uids: Array<string>;
-};

src/api-types/models/Task.ts

@@ -12,5 +12,4 @@ export type Task = {
     data: any;
     error: string;
     schedule: any;
-    options?: any;
 };

src/api-types/models/UpdateTaskOptionsRequest.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type UpdateTaskOptionsRequest = {
-    task_key: string;
-    new_options: any;
-};

src/api-types/models/UploadCookiesRequest.ts

@@ -1,7 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type UploadCookiesRequest = {
-    cookies: Blob;
-};

src/app/app-routing.module.ts

@@ -23,7 +23,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { useHash: true })],
+  imports: [RouterModule.forRoot(routes, { useHash: true, relativeLinkResolution: 'legacy' })],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

src/app/app.component.css

@@ -13,6 +13,7 @@
 }
 
 .theme-slide-toggle {
+    top: 2px;
     left: 10px;
     position: relative;
     pointer-events: none;
@@ -24,20 +25,4 @@
 
 .top-toolbar {
     height: 64px;
-    background: unset;
-}
-
-::ng-deep .top-menu-button > span {
-    width: 85px;
-    height: 26px;
-}
-
-::ng-deep .mdc-switch {
-    outline: none !important;
-}
-
-::ng-deep .notifications-menu {
-    width: 30vw !important;
-    max-width: 100% !important;
-    min-width: 280px !important;
-}
+}

src/app/app.component.html

@@ -1,42 +1,38 @@
 <div [style.background]="postsService.theme ? postsService.theme.background_color : null" style="width: 100%; height: 100%;">
     <div class="mat-elevation-z3" style="position: relative; z-index: 10;">
-        <mat-toolbar class="sticky-toolbar top-toolbar">
-            <div class="container-fluid" style="padding-left: 0px; padding-right: 0px">
-                <div class="row" width="100%" height="100%">
-                    <div class="col-6" style="text-align: left; margin-top: 1px;">
-                        <div style="display: flex; align-items: center;">
-                            <button #hamburgerMenu style="outline: none" *ngIf="router.url.split(';')[0] !== '/player'" mat-icon-button aria-label="Toggle side navigation" (click)="toggleSidenav()"><mat-icon>menu</mat-icon></button>
-                            <button (click)="goBack()" *ngIf="router.url.split(';')[0] === '/player'" mat-icon-button><mat-icon>arrow_back</mat-icon></button>
-                            <div style="margin-left: 8px; display: inline-block;"><button mat-icon-button routerLink='/home'><img style="width: 32px;" src="assets/images/logo_128px.png"></button></div>
-                        </div>
-                    </div>
-                    <div class="col-6" style="text-align: right; align-items: flex-end; display: inline-block">
-                        <button *ngIf="postsService.config?.Extra.enable_notifications" [matMenuTriggerFor]="notificationsMenu" (menuOpened)="notificationMenuOpened()" mat-icon-button><mat-icon [matBadge]="notification_count" matBadgeColor="warn" matBadgeSize="small" *ngIf="notification_count > 0">notifications</mat-icon><mat-icon *ngIf="notification_count === 0">notifications_none</mat-icon></button>
-                        <mat-menu [classList]="'notifications-menu'" (close)="notificationMenuClosed()" #notificationsMenu="matMenu">
-                            <app-notifications #notifications (notificationCount)="notificationCountUpdate($event)" (click)="$event.stopPropagation()"></app-notifications>
-                        </mat-menu>
-                        <button [matMenuTriggerFor]="menuSettings" mat-icon-button><mat-icon>more_vert</mat-icon></button>
-                        <mat-menu #menuSettings="matMenu">
-                            <button class="top-menu-button" (click)="openProfileDialog()" *ngIf="postsService.isLoggedIn" mat-menu-item>
-                                <mat-icon>person</mat-icon>
-                                <span i18n="Profile menu label">Profile</span>
-                            </button>
-                            <button *ngIf="postsService.config && postsService.config.Downloader.use_youtubedl_archive" class="top-menu-button" (click)="openArchivesDialog()" mat-menu-item>
-                                <mat-icon>topic</mat-icon>
-                                <span i18n="Archives menu label">Archives</span>
-                            </button>
-                            <button class="top-menu-button" (click)="themeMenuItemClicked($event)" *ngIf="allowThemeChange" mat-menu-item>
-                            <mat-icon>{{(postsService.theme.key === 'default') ? 'brightness_5' : 'brightness_2'}}</mat-icon>
-                            <span i18n="Dark mode toggle label">Dark</span>
-                            <mat-slide-toggle class="theme-slide-toggle" [checked]="postsService.theme.key === 'dark'"></mat-slide-toggle>
-                            </button>
-                            <button class="top-menu-button" (click)="openAboutDialog()" mat-menu-item>
-                                <mat-icon>info</mat-icon>
-                                <span i18n="About menu label">About</span>
-                            </button>
-                        </mat-menu>
+        <mat-toolbar color="primary" class="sticky-toolbar top-toolbar">
+            <div class="flex-row" width="100%" height="100%">
+                <div class="flex-column" style="text-align: left; margin-top: 1px;">
+                    <button #hamburgerMenu style="outline: none" *ngIf="router.url.split(';')[0] !== '/player'" mat-icon-button aria-label="Toggle side navigation" (click)="toggleSidenav()"><mat-icon>menu</mat-icon></button>
+                    <button (click)="goBack()" *ngIf="router.url.split(';')[0] === '/player'" mat-icon-button><mat-icon>arrow_back</mat-icon></button>
+                </div>
+                <div class="flex-column" style="text-align: center; margin-top: 5px;">
+                    <div style="font-size: 22px; text-shadow: #141414 0.25px 0.25px 1px;">
+                        {{topBarTitle}}
                     </div>
                 </div>
+                <div class="flex-column" style="text-align: right; align-items: flex-end;">
+                    <button [matMenuTriggerFor]="menuSettings" mat-icon-button><mat-icon>more_vert</mat-icon></button>
+                    <mat-menu #menuSettings="matMenu">
+                        <button (click)="openProfileDialog()" *ngIf="postsService.isLoggedIn" mat-menu-item>
+                            <mat-icon>person</mat-icon>
+                            <span i18n="Profile menu label">Profile</span>
+                        </button>
+                        <button (click)="themeMenuItemClicked($event)" *ngIf="allowThemeChange" mat-menu-item>
+                          <mat-icon>{{(postsService.theme.key === 'default') ? 'brightness_5' : 'brightness_2'}}</mat-icon>
+                          <span i18n="Dark mode toggle label">Dark</span>
+                          <mat-slide-toggle class="theme-slide-toggle" [checked]="postsService.theme.key === 'dark'"></mat-slide-toggle>
+                        </button>
+                        <!-- <button *ngIf="postsService.config && (!postsService.config.Advanced.multi_user_mode || (postsService.isLoggedIn && postsService.permissions.includes('settings')))" (click)="openSettingsDialog()" mat-menu-item>
+                          <mat-icon>settings</mat-icon>
+                          <span i18n="Settings menu label">Settings</span>
+                        </button> -->
+                        <button (click)="openAboutDialog()" mat-menu-item>
+                            <mat-icon>info</mat-icon>
+                            <span i18n="About menu label">About</span>
+                        </button>
+                    </mat-menu>
+                </div>
             </div>
         </mat-toolbar>
     </div>
@@ -55,7 +51,7 @@
                     </ng-container>
                     <ng-container *ngIf="postsService.config && allowSubscriptions && postsService.subscriptions && postsService.hasPermission('subscriptions')">
                         <mat-divider *ngIf="postsService.subscriptions.length > 0"></mat-divider>
-                        <a *ngFor="let subscription of postsService.subscriptions" mat-list-item (click)="postsService.sidepanel_mode === 'over' ? sidenav.close() : null" [routerLink]="['/subscription', { id: subscription.id }]"><ngx-avatars [style.display]="'inline-block'" [style.margin-right]="'10px'" size="32" [name]="subscription.name"></ngx-avatars>{{subscription.name}}</a>
+                        <a *ngFor="let subscription of postsService.subscriptions" mat-list-item (click)="postsService.sidepanel_mode === 'over' ? sidenav.close() : null" [routerLink]="['/subscription', { id: subscription.id }]"><ngx-avatars [style.margin-right]="'10px'" size="32" [name]="subscription.name"></ngx-avatars>{{subscription.name}}</a>
                     </ng-container>
                 </mat-nav-list>
             </mat-sidenav>

src/app/app.component.ts

@@ -20,8 +20,6 @@ import { SettingsComponent } from './settings/settings.component';
 import { AboutDialogComponent } from './dialogs/about-dialog/about-dialog.component';
 import { UserProfileDialogComponent } from './dialogs/user-profile-dialog/user-profile-dialog.component';
 import { SetDefaultAdminDialogComponent } from './dialogs/set-default-admin-dialog/set-default-admin-dialog.component';
-import { NotificationsComponent } from './components/notifications/notifications.component';
-import { ArchiveViewerComponent } from './components/archive-viewer/archive-viewer.component';
 
 @Component({
   selector: 'app-root',
@@ -47,12 +45,9 @@ export class AppComponent implements OnInit, AfterViewInit {
   enableDownloadsManager = false;
 
   @ViewChild('sidenav') sidenav: MatSidenav;
-  @ViewChild('notifications') notifications: NotificationsComponent;
   @ViewChild('hamburgerMenu', { read: ElementRef }) hamburgerMenuButton: ElementRef;
   navigator: string = null;
 
-  notification_count = 0;
-
   constructor(public postsService: PostsService, public snackBar: MatSnackBar, private dialog: MatDialog,
     public router: Router, public overlayContainer: OverlayContainer, private elementRef: ElementRef) {
 
@@ -76,7 +71,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   }
 
-  ngOnInit(): void {
+  ngOnInit() {
     if (localStorage.getItem('theme')) {
       this.setTheme(localStorage.getItem('theme'));
     }
@@ -95,15 +90,15 @@ export class AppComponent implements OnInit, AfterViewInit {
     });
   }
 
-  ngAfterViewInit(): void {
+  ngAfterViewInit() {
     this.postsService.sidenav = this.sidenav;
   }
 
-  toggleSidenav(): void {
+  toggleSidenav() {
     this.sidenav.toggle();
   }
 
-  loadConfig(): void {
+  loadConfig() {
     // loading config
     this.topBarTitle = this.postsService.config['Extra']['title_top'];
     const themingExists = this.postsService.config['Themes'];
@@ -169,7 +164,7 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.componentCssClass = theme;
   }
 
-  flipTheme(): void {
+  flipTheme() {
     if (this.postsService.theme.key === 'default') {
       this.setTheme('dark');
     } else if (this.postsService.theme.key === 'dark') {
@@ -177,12 +172,17 @@ export class AppComponent implements OnInit, AfterViewInit {
     }
   }
 
-  themeMenuItemClicked(event): void {
+  themeMenuItemClicked(event) {
     this.flipTheme();
     event.stopPropagation();
   }
 
-  goBack(): void {
+  getSubscriptions() {
+
+  }
+
+
+  goBack() {
     if (!this.navigator) {
       this.router.navigate(['/home']);
     } else {
@@ -190,41 +190,23 @@ export class AppComponent implements OnInit, AfterViewInit {
     }
   }
 
-  openSettingsDialog(): void {
-    this.dialog.open(SettingsComponent, {
+  openSettingsDialog() {
+    const dialogRef = this.dialog.open(SettingsComponent, {
       width: '80vw'
     });
   }
 
-  openAboutDialog(): void {
-    this.dialog.open(AboutDialogComponent, {
+  openAboutDialog() {
+    const dialogRef = this.dialog.open(AboutDialogComponent, {
       width: '80vw'
     });
   }
 
-  openProfileDialog(): void {
-    this.dialog.open(UserProfileDialogComponent, {
+  openProfileDialog() {
+    const dialogRef = this.dialog.open(UserProfileDialogComponent, {
       width: '60vw'
     });
   }
 
-  openArchivesDialog(): void {
-    this.dialog.open(ArchiveViewerComponent, {
-      width: '85vw'
-    });
-  }
-
-  notificationCountUpdate(new_count: number): void {
-    this.notification_count = new_count;
-  }
-
-  notificationMenuOpened(): void {
-    this.notifications.getNotifications();
-  }
-
-  notificationMenuClosed(): void {
-    this.notifications.setNotificationsToRead();
-  }
-
 }
 

src/app/app.module.ts

@@ -29,8 +29,6 @@ import { MatPaginatorModule } from '@angular/material/paginator';
 import { MatSortModule } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatBadgeModule } from '@angular/material/badge';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { ClipboardModule } from '@angular/cdk/clipboard';
 import { TextFieldModule } from '@angular/cdk/text-field';
@@ -53,6 +51,7 @@ import { SubscribeDialogComponent } from './dialogs/subscribe-dialog/subscribe-d
 import { SubscriptionComponent } from './subscription//subscription/subscription.component';
 import { SubscriptionInfoDialogComponent } from './dialogs/subscription-info-dialog/subscription-info-dialog.component';
 import { SettingsComponent } from './settings/settings.component';
+import { MatChipsModule } from '@angular/material/chips';
 import { NgxFileDropModule } from 'ngx-file-drop';
 import { AvatarModule } from 'ngx-avatars';
 import { ContentLoaderModule } from '@ngneat/content-loader';
@@ -88,13 +87,6 @@ import { SkipAdButtonComponent } from './components/skip-ad-button/skip-ad-butto
 import { TasksComponent } from './components/tasks/tasks.component';
 import { UpdateTaskScheduleDialogComponent } from './dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component';
 import { RestoreDbDialogComponent } from './dialogs/restore-db-dialog/restore-db-dialog.component';
-import { NotificationsComponent } from './components/notifications/notifications.component';
-import { NotificationsListComponent } from './components/notifications-list/notifications-list.component';
-import { TaskSettingsComponent } from './components/task-settings/task-settings.component';
-import { GenerateRssUrlComponent } from './dialogs/generate-rss-url/generate-rss-url.component';
-import { SortPropertyComponent } from './components/sort-property/sort-property.component';
-import { OnlyNumberDirective } from './directives/only-number.directive';
-import { ArchiveViewerComponent } from './components/archive-viewer/archive-viewer.component';
 
 registerLocaleData(es, 'es');
 
@@ -140,14 +132,7 @@ registerLocaleData(es, 'es');
         SkipAdButtonComponent,
         TasksComponent,
         UpdateTaskScheduleDialogComponent,
-        RestoreDbDialogComponent,
-        NotificationsComponent,
-        NotificationsListComponent,
-        TaskSettingsComponent,
-        GenerateRssUrlComponent,
-        SortPropertyComponent,
-        OnlyNumberDirective,
-        ArchiveViewerComponent
+        RestoreDbDialogComponent
     ],
     imports: [
         CommonModule,
@@ -185,7 +170,6 @@ registerLocaleData(es, 'es');
         MatTableModule,
         MatDatepickerModule,
         MatChipsModule,
-        MatBadgeModule,
         DragDropModule,
         ClipboardModule,
         TextFieldModule,

src/app/components/archive-viewer/archive-viewer.component.html

@@ -1,143 +0,0 @@
-<mat-form-field class="filter">
-  <mat-icon matPrefix>search</mat-icon>
-  <mat-label i18n="Filter">Filter</mat-label>
-  <input matInput [(ngModel)]="text_filter" (keyup)="applyFilter($event)" #input>
-</mat-form-field>
-
-<div [hidden]="!(archives && archives.length > 0)">
-    <div class="mat-elevation-z8">
-        <mat-table matSort [dataSource]="dataSource">
-
-          <!-- Select Column -->
-            <!-- Checkbox Column -->
-            <ng-container matColumnDef="select">
-              <mat-header-cell *matHeaderCellDef>
-                <mat-checkbox (change)="$event ? toggleAllRows() : null"
-                              [checked]="selection.hasValue() && isAllSelected()"
-                              [indeterminate]="selection.hasValue() && !isAllSelected()">
-                </mat-checkbox>
-              </mat-header-cell>
-              <mat-cell *matCellDef="let row">
-                <mat-checkbox (click)="$event.stopPropagation()"
-                              (change)="$event ? selection.toggle(row) : null"
-                              [checked]="selection.isSelected(row)">
-                </mat-checkbox>
-                <mat-icon class="audio-video-icon">{{(row.type === 'audio') ? 'audiotrack' : 'movie'}}</mat-icon>
-              </mat-cell>
-            </ng-container>
-      
-          <!-- Date Column -->
-          <ng-container matColumnDef="timestamp">
-            <mat-header-cell *matHeaderCellDef mat-sort-header> <ng-container i18n="Date">Date</ng-container> </mat-header-cell>
-            <mat-cell *matCellDef="let element"> {{element.timestamp*1000 | date: 'short'}} </mat-cell>
-          </ng-container>
-      
-          <!-- Title Column -->
-          <ng-container matColumnDef="title">
-            <mat-header-cell *matHeaderCellDef mat-sort-header> <ng-container i18n="Title">Title</ng-container> </mat-header-cell>
-            <mat-cell *matCellDef="let element">
-                <span class="max-two-lines" [matTooltip]="element.title ? element.title : null">
-                    {{element.title}}
-                </span>
-            </mat-cell>
-          </ng-container>
-      
-           <!-- ID Column -->
-           <ng-container matColumnDef="id">
-            <mat-header-cell *matHeaderCellDef mat-sort-header> <ng-container i18n="ID">ID</ng-container> </mat-header-cell>
-            <mat-cell *matCellDef="let element">
-                <span class="one-line" [matTooltip]="element.title ? element.title : null">
-                    {{element.id}}
-                </span>
-            </mat-cell>
-          </ng-container>
-
-          <!-- Extractor Column -->
-          <ng-container matColumnDef="extractor">
-            <mat-header-cell *matHeaderCellDef mat-sort-header> <ng-container i18n="Extractor">Extractor</ng-container> </mat-header-cell>
-            <mat-cell *matCellDef="let element">
-                <span class="one-line" [matTooltip]="element.extractor? element.extractor : null">
-                    {{element.extractor}}
-                </span>
-            </mat-cell>
-          </ng-container>
-      
-            <mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></mat-header-row>
-            <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
-        </mat-table>
-      </div>
-</div>
-
-<div *ngIf="(!archives || archives.length === 0)">
-  <h4 style="text-align: center; margin-top: 10px;" i18n="Archives empty">Archives empty</h4>
-</div>
-
-<div style="margin: 10px 10px 10px 0px; display: flex;">
-  <span style="flex-grow: 1;" class="flex-items">
-    <button [disabled]="selection.selected.length === 0" color="warn" style="margin: 10px;" mat-stroked-button i18n="Delete selected" (click)="openDeleteSelectedArchivesDialog()">Delete selected</button>
-  </span>
-  <span class="flex-items">
-    <button [disabled]="!(archives && archives.length > 0)" (click)="downloadArchive()" mat-stroked-button i18n="Download archive">Download archive</button>
-    <mat-form-field style="width: 150px; margin-bottom: -1.25em; margin-left: 10px;">
-      <mat-label i18n="Subscription">Subscription</mat-label>
-      <mat-select [ngModel]="sub_id" (ngModelChange)="subFilterSelectionChanged($event)">
-        <mat-option [value]="'none'" i18n="None">None</mat-option>
-        <mat-option *ngFor="let sub of postsService.subscriptions" [value]="sub.id">{{sub.name}}</mat-option>
-      </mat-select>
-    </mat-form-field>
-    <mat-form-field style="width: 100px; margin-bottom: -1.25em; margin-left: 10px;">
-      <mat-label i18n="File type">File type</mat-label>
-      <mat-select [ngModel]="type" (ngModelChange)="typeFilterSelectionChanged($event)" [disabled]="sub_id !== 'none'">
-        <mat-option [value]="'both'" i18n="Both">Both</mat-option>
-        <mat-option [value]="'video'" i18n="Video">Video</mat-option>
-        <mat-option [value]="'audio'" i18n="Audio">Audio</mat-option>
-      </mat-select>
-    </mat-form-field>
-  </span>
-</div>
-
-<div class="file-drop-parent">
-  <ngx-file-drop [multiple]="false" accept=".txt" dropZoneLabel="Drop file here" (onFileDrop)="dropped($event)">
-      <ng-template class="file-drop" ngx-file-drop-content-tmp let-openFileSelector="openFileSelector">
-          <div style="text-align: center">
-              <div>
-                  <ng-container i18n="Drag and Drop">Drag and Drop</ng-container>
-              </div>
-              <div style="margin-top: 6px;">
-                  <button mat-stroked-button (click)="openFileSelector()">Browse Files</button>
-              </div>
-          </div>
-      </ng-template>
-  </ngx-file-drop>
-</div>
-
-<div style="margin-top: 10px; color: white">
-  <table class="table">
-      <tbody class="upload-name-style">
-          <tr *ngFor="let item of files; let i=index">
-              <td style="vertical-align: middle; border-top: unset">
-                  <strong>{{ item.relativePath }}</strong>
-              </td>
-              <td style="border-top: unset">
-                <div style="float: right">
-                  <mat-form-field style="width: 150px;">
-                    <mat-label i18n="Subscription">Subscription</mat-label>
-                    <mat-select [ngModel]="upload_sub_id" (ngModelChange)="subUploadFilterSelectionChanged($event)">
-                      <mat-option [value]="'none'" i18n="None">None</mat-option>
-                      <mat-option *ngFor="let sub of postsService.subscriptions" [value]="sub.id">{{sub.name}}</mat-option>
-                    </mat-select>
-                  </mat-form-field>
-                  <mat-form-field style="width: 100px; margin-left: 10px">
-                    <mat-label i18n="File type">File type</mat-label>
-                    <mat-select [(ngModel)]="upload_type" [value]="upload_type" [disabled]="upload_sub_id !== 'none'">
-                      <mat-option [value]="'video'" i18n="Video">Video</mat-option>
-                      <mat-option [value]="'audio'" i18n="Audio">Audio</mat-option>
-                    </mat-select>
-                  </mat-form-field>
-                  <button style="margin-left: 10px" [disabled]="uploading_archive || uploaded_archive" (click)="importArchive()" matTooltip="Upload" i18n-matTooltip="Upload" mat-mini-fab><mat-icon>publish</mat-icon><mat-spinner *ngIf="uploading_archive" class="spinner" [diameter]="38"></mat-spinner></button>
-                </div>
-              </td>
-          </tr>
-      </tbody>
-  </table>
-</div>

src/app/components/archive-viewer/archive-viewer.component.scss

@@ -1,42 +0,0 @@
-.filter {
-    width: 100%;
-}
-
-.spinner {
-    bottom: 1px;
-    left: 0.5px;
-    position: absolute;
-}
-
-.mat-mdc-table {
-    width: 100%;
-    max-height: 60vh;
-    overflow: auto;
-}
-
-.max-two-lines {
-    display: -webkit-box;
-    display: -moz-box;
-    max-height: 2.4em;
-    line-height: 1.2em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-}
-
-::ng-deep .ngx-file-drop__content {
-    width: 100%;
-    top: -12px;
-    position: relative;
-}
-
-.file-drop-parent {
-    padding: 0px 10px 0px 10px;
-}
-
-.flex-items {
-    display: flex;
-    align-items: center;
-}
-

src/app/components/archive-viewer/archive-viewer.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ArchiveViewerComponent } from './archive-viewer.component';
-
-describe('ArchiveViewerComponent', () => {
-  let component: ArchiveViewerComponent;
-  let fixture: ComponentFixture<ArchiveViewerComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ArchiveViewerComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(ArchiveViewerComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/archive-viewer/archive-viewer.component.ts

@@ -1,198 +0,0 @@
-import { SelectionModel } from '@angular/cdk/collections';
-import { Component, ViewChild } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { MatSort } from '@angular/material/sort';
-import { MatTableDataSource } from '@angular/material/table';
-import { FileType } from 'api-types';
-import { Archive } from 'api-types/models/Archive';
-import { ConfirmDialogComponent } from 'app/dialogs/confirm-dialog/confirm-dialog.component';
-import { PostsService } from 'app/posts.services';
-import { NgxFileDropEntry } from 'ngx-file-drop';
-
-@Component({
-  selector: 'app-archive-viewer',
-  templateUrl: './archive-viewer.component.html',
-  styleUrls: ['./archive-viewer.component.scss']
-})
-export class ArchiveViewerComponent {
-  // table
-  displayedColumns: string[] = ['select', 'timestamp', 'title', 'id', 'extractor'];
-  dataSource = null;
-  selection = new SelectionModel<Archive>(true, []);
-
-  // general
-  archives = null;
-  archives_retrieved = false;
-  text_filter = '';
-  sub_id = 'none';
-  upload_sub_id = 'none';
-  type: FileType | 'both' = 'both';
-  upload_type: FileType = FileType.VIDEO;
-
-  // importing
-  uploading_archive = false;
-  uploaded_archive = false;
-  files = [];
-
-  typeSelectOptions = {
-    video: {
-      key: 'video',
-      label: $localize`Video`
-    },
-    audio: {
-      key: 'audio',
-      label: $localize`Audio`
-    }
-  };
-
-  @ViewChild(MatSort) sort: MatSort;
-  
-  constructor(public postsService: PostsService, private dialog: MatDialog) {
-
-  }
-
-  ngOnInit() {
-    this.getArchives();
-  }
-
-  applyFilter(event: Event) {
-    const filterValue = (event.target as HTMLInputElement).value;
-    this.dataSource.filter = filterValue.trim().toLowerCase();
-  }
-
-  /** Whether the number of selected elements matches the total number of rows. */
-  isAllSelected() {
-    const numSelected = this.selection.selected.length;
-    const numRows = this.dataSource.data.length;
-    return numSelected === numRows;
-  }
-
-  /** Selects all rows if they are not all selected; otherwise clear selection. */
-  toggleAllRows() {
-    if (this.isAllSelected()) {
-      this.selection.clear();
-      return;
-    }
-
-    this.selection.select(...this.dataSource.data);
-  }
-
-  typeFilterSelectionChanged(value): void {
-    this.type = value;
-    this.dataSource.filter = '';
-    this.text_filter = '';
-    this.getArchives();
-  }
-
-  subFilterSelectionChanged(value): void {
-    this.sub_id = value;
-    this.dataSource.filter = '';
-    this.text_filter = '';
-    if (this.sub_id !== 'none') {
-      this.type = this.postsService.getSubscriptionByID(this.sub_id)['type'];
-    }
-    this.getArchives();
-  }
-
-  subUploadFilterSelectionChanged(value): void {
-    this.upload_sub_id = value;
-    if (this.upload_sub_id !== 'none') {
-      this.upload_type = this.postsService.getSubscriptionByID(this.upload_sub_id)['type'];
-    }
-  }
-
-  getArchives(): void {
-    this.postsService.getArchives(this.type === 'both' ? null : this.type, this.sub_id === 'none' ? null : this.sub_id).subscribe(res => {
-      if (res['archives'] !== null 
-        && res['archives'] !== undefined
-        && JSON.stringify(this.archives) !== JSON.stringify(res['archives'])) {
-          this.archives = res['archives']
-          this.dataSource = new MatTableDataSource<Archive>(this.archives);
-          this.dataSource.sort = this.sort;
-      } else {
-        // failed to get downloads
-      }
-    });
-  }
-
-  importArchive(): void {
-    this.uploading_archive = true;
-        for (const droppedFile of this.files) {
-      // Is it a file?
-      if (droppedFile.fileEntry.isFile) {
-        const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
-        fileEntry.file(async (file: File) => {          
-          const archive_base64 = await blobToBase64(file);
-          this.postsService.importArchive(archive_base64 as string, this.upload_type, this.upload_sub_id === 'none' ? null : this.upload_sub_id).subscribe(res => {
-            this.uploading_archive = false;
-            if (res['success']) {
-              this.uploaded_archive = true;
-              this.postsService.openSnackBar($localize`Archive successfully imported!`);
-            }
-            this.getArchives();
-          }, err => {
-            console.error(err);
-            this.uploading_archive = false;
-          });
-        });
-      }
-    }
-  }
-
-  downloadArchive(): void {
-    this.postsService.downloadArchive(this.type === 'both' ? null : this.type, this.sub_id === 'none' ? null : this.sub_id).subscribe(res => {
-      const blob: Blob = res;
-      saveAs(blob, 'archive.txt');
-    });
-  }
-
-  openDeleteSelectedArchivesDialog(): void {
-    const dialogRef = this.dialog.open(ConfirmDialogComponent, {
-      data: {
-        dialogTitle: $localize`Delete archives`,
-        dialogText: $localize`Would you like to delete ${this.selection.selected.length}:selected archives amount: archive(s)?`,
-        submitText: $localize`Delete`,
-        warnSubmitColor: true
-      }
-    });
-    dialogRef.afterClosed().subscribe(confirmed => {
-      if (confirmed) {
-        this.deleteSelectedArchives();
-      }
-    });
-    
-  }
-
-  deleteSelectedArchives(): void {
-    for (const archive of this.selection.selected) {
-      this.archives = this.archives.filter((_archive: Archive) => !(archive['extractor'] === _archive['extractor'] && archive['id'] !== _archive['id']));
-    }
-    this.postsService.deleteArchiveItems(this.selection.selected).subscribe(res => {
-      if (res['success']) {
-        this.postsService.openSnackBar($localize`Successfully deleted archive items!`);
-      } else {
-        this.postsService.openSnackBar($localize`Failed to delete archive items!`);
-      }
-      this.getArchives();
-    });
-    this.selection.clear();
-  }
-
-  public dropped(files: NgxFileDropEntry[]) {
-    this.files = files;
-    this.uploading_archive = false;
-    this.uploaded_archive = false;
-  }
-
-  originalOrder = (): number => {
-    return 0;
-  }
-}
-
-function blobToBase64(blob: Blob) {
-  return new Promise((resolve, _) => {
-    const reader = new FileReader();
-    reader.onloadend = () => resolve(reader.result);
-    reader.readAsDataURL(blob);
-  });
-}

src/app/components/downloads/downloads.component.ts

@@ -41,7 +41,7 @@ import { Download } from 'api-types';
 })
 export class DownloadsComponent implements OnInit, OnDestroy {
 
-  @Input() uids: string[] = null;
+  @Input() uids = null;
 
   downloads_check_interval = 1000;
   downloads = [];
@@ -200,10 +200,6 @@ export class DownloadsComponent implements OnInit, OnDestroy {
     this.postsService.restartDownload(download_uid).subscribe(res => {
       if (!res['success']) {
         this.postsService.openSnackBar($localize`Failed to restart download! See server logs for more info.`);
-      } else {
-        if (this.uids && res['new_download_uid']) {
-          this.uids.push(res['new_download_uid']);
-        }
       }
     });
   }

src/app/components/login/login.component.html

@@ -1,36 +1,31 @@
 <mat-card class="login-card">
-    <mat-tab-group mat-stretch-tabs style="margin-bottom: 20px" [(selectedIndex)]="selectedTabIndex">
+    <mat-tab-group style="margin-bottom: 20px" [(selectedIndex)]="selectedTabIndex">
         <mat-tab label="Login" i18n-label="Login">
             <div style="margin-top: 10px;">
-                <mat-form-field style="width: 100%">
-                    <mat-label i18n="User name">User name</mat-label>
-                    <input [(ngModel)]="loginUsernameInput" matInput>
+                <mat-form-field>
+                    <input [(ngModel)]="loginUsernameInput" matInput placeholder="User name" i18n-placeholder="User name">
                 </mat-form-field>
             </div>
             <div>
-                <mat-form-field style="width: 100%">
-                    <mat-label i18n="Password">Password</mat-label>
-                    <input [(ngModel)]="loginPasswordInput" (keyup.enter)="login()" type="password" matInput>
+                <mat-form-field>
+                    <input [(ngModel)]="loginPasswordInput" (keyup.enter)="login()" type="password" matInput placeholder="Password" i18n-placeholder="Password">
                 </mat-form-field>
             </div>
         </mat-tab>
         <mat-tab *ngIf="registrationEnabled" label="Register" i18n-label="Register">
             <div style="margin-top: 10px;">
-                <mat-form-field style="width: 100%">
-                    <mat-label i18n="User name">User name</mat-label>
-                    <input [(ngModel)]="registrationUsernameInput" matInput>
+                <mat-form-field>
+                    <input [(ngModel)]="registrationUsernameInput" matInput placeholder="User name" i18n-placeholder="User name">
                 </mat-form-field>
             </div>
             <div>
-                <mat-form-field style="width: 100%">
-                    <mat-label i18n="Password">Password</mat-label>
-                    <input [(ngModel)]="registrationPasswordInput" (click)="register()" type="password" matInput>
+                <mat-form-field>
+                    <input [(ngModel)]="registrationPasswordInput" (click)="register()" type="password" matInput placeholder="Password" i18n-placeholder="Password">
                 </mat-form-field>
             </div>
             <div>
-                <mat-form-field style="width: 100%">
-                    <mat-label i18n="Confirm Password">Confirm Password</mat-label>
-                    <input [(ngModel)]="registrationPasswordConfirmationInput" (click)="register()" type="password" matInput>
+                <mat-form-field>
+                    <input [(ngModel)]="registrationPasswordConfirmationInput" (click)="register()" type="password" matInput placeholder="Confirm Password" i18n-placeholder="Confirm Password">
                 </mat-form-field>
             </div>
         </mat-tab>

src/app/components/login/login.component.scss

@@ -12,15 +12,17 @@
 }
 
 .login-button-div {
+    margin-bottom: 10px;
+    margin-top: 10px;
+    margin-left: -16px;
+    margin-right: -16px;
     bottom: 0px;
     width: 100%;
-    height: 42px;
     position: absolute;
 }
 
 .login-button-div > button {
     width: 100%;
-    height: 100%;
     border-radius: 0px 0px 4px 4px !important;
 }
 

src/app/components/manage-role/manage-role.component.html

@@ -1,15 +1,17 @@
-<h4 *ngIf="role" mat-dialog-title><ng-container i18n="Manage role dialog title">Manage role</ng-container>&nbsp;-&nbsp;{{role.key}}</h4>
+<h4 *ngIf="role" mat-dialog-title><ng-container i18n="Manage role dialog title">Manage role</ng-container>&nbsp;-&nbsp;{{role.name}}</h4>
 
 <mat-dialog-content *ngIf="role">
-    <div *ngFor="let permission of available_permissions">
-        <div matListItemTitle>{{permissionToLabel[permission] ? permissionToLabel[permission] : permission}}</div>
-        <div matListItemLine>
-            <mat-radio-group [disabled]="permission === 'settings' && role.key === 'admin'" (change)="changeRolePermissions($event, permission)" [(ngModel)]="permissions[permission]" [attr.aria-label]="'Give role permission for ' + permission">
-                <mat-radio-button value="yes"><ng-container i18n="Yes">Yes</ng-container></mat-radio-button>
-                <mat-radio-button value="no"><ng-container i18n="No">No</ng-container></mat-radio-button>
-            </mat-radio-group>
-        </div>
-    </div>
+    <mat-list>
+        <mat-list-item role="listitem" *ngFor="let permission of available_permissions">
+            <h3 matLine>{{permissionToLabel[permission] ? permissionToLabel[permission] : permission}}</h3>
+            <span matLine>
+                <mat-radio-group [disabled]="permission === 'settings' && role.key === 'admin'" (change)="changeRolePermissions($event, permission, permissions[permission])" [(ngModel)]="permissions[permission]" [attr.aria-label]="'Give role permission for ' + permission">
+                    <mat-radio-button value="yes"><ng-container i18n="Yes">Yes</ng-container></mat-radio-button>
+                    <mat-radio-button value="no"><ng-container i18n="No">No</ng-container></mat-radio-button>
+                </mat-radio-group>
+            </span>
+        </mat-list-item>
+    </mat-list>
 </mat-dialog-content>
 
 <mat-dialog-actions>

src/app/components/manage-role/manage-role.component.scss

@@ -0,0 +1,4 @@
+.mat-radio-button {
+    margin-right: 10px;
+    margin-top: 5px;
+}

src/app/components/manage-role/manage-role.component.ts

@@ -24,7 +24,7 @@ export class ManageRoleComponent implements OnInit {
   }
 
   constructor(public postsService: PostsService, private dialogRef: MatDialogRef<ManageRoleComponent>,
-              @Inject(MAT_DIALOG_DATA) public data: {role: string}) {
+              @Inject(MAT_DIALOG_DATA) public data: any) {
     if (this.data) {
       this.role = this.data.role;
       this.available_permissions = this.postsService.available_permissions;

src/app/components/manage-user/manage-user.component.html

@@ -5,23 +5,24 @@
 
     <div>
         <mat-form-field style="margin-right: 15px;">
-            <mat-label i18n="New password">New password</mat-label>
-            <input matInput [(ngModel)]="newPasswordInput" type="password">
+            <input matInput [(ngModel)]="newPasswordInput" type="password" placeholder="New password" i18n-placeholder="New password placeholder">
         </mat-form-field>
         <button mat-raised-button color="accent" (click)="setNewPassword()" [disabled]="newPasswordInput.length === 0"><ng-container i18n="Set new password">Set new password</ng-container></button>
     </div>
 
     <div>
-        <div *ngFor="let permission of available_permissions">
-            <div matListItemTitle>{{permissionToLabel[permission] ? permissionToLabel[permission] : permission}}</div>
-            <div matListItemLine>
-                <mat-radio-group [disabled]="permission === 'settings' && postsService.user.uid === user.uid" (change)="changeUserPermissions($event, permission)" [(ngModel)]="permissions[permission]" [attr.aria-label]="'Give user permission for ' + permission">
-                    <mat-radio-button value="default"><ng-container i18n="Use role default">Use role default</ng-container></mat-radio-button>
-                    <mat-radio-button value="yes"><ng-container i18n="Yes">Yes</ng-container></mat-radio-button>
-                    <mat-radio-button value="no"><ng-container i18n="No">No</ng-container></mat-radio-button>
-                </mat-radio-group>
-            </div>
-        </div>
+        <mat-list>
+            <mat-list-item role="listitem" *ngFor="let permission of available_permissions">
+                <h3 matLine>{{permissionToLabel[permission] ? permissionToLabel[permission] : permission}}</h3>
+                <span matLine>
+                    <mat-radio-group [disabled]="permission === 'settings' && postsService.user.uid === user.uid" (change)="changeUserPermissions($event, permission)" [(ngModel)]="permissions[permission]" [attr.aria-label]="'Give user permission for ' + permission">
+                        <mat-radio-button value="default"><ng-container i18n="Use role default">Use role default</ng-container></mat-radio-button>
+                        <mat-radio-button value="yes"><ng-container i18n="Yes">Yes</ng-container></mat-radio-button>
+                        <mat-radio-button value="no"><ng-container i18n="No">No</ng-container></mat-radio-button>
+                    </mat-radio-group>
+                </span>
+            </mat-list-item>
+        </mat-list>
     </div>
 </mat-dialog-content>
 

src/app/components/manage-user/manage-user.component.scss

@@ -1,4 +1,4 @@
-.mat-mdc-radio-button {
+.mat-radio-button {
     margin-right: 10px;
     margin-top: 5px;
 }

src/app/components/manage-user/manage-user.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { PostsService } from 'app/posts.services';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { User } from 'api-types';
 
 @Component({
   selector: 'app-manage-user',
@@ -16,18 +15,17 @@ export class ManageUserComponent implements OnInit {
   permissions = null;
 
   permissionToLabel = {
-    '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`,
+    'filemanager': 'File manager',
+    'settings': 'Settings access',
+    'subscriptions': 'Subscriptions',
+    'sharing': 'Share files',
+    'advanced_download': 'Use advanced download mode',
+    'downloads_manager': 'Use downloads manager'
   }
 
   settingNewPassword = false;
 
-  constructor(public postsService: PostsService, @Inject(MAT_DIALOG_DATA) public data: {user: User}) {
+  constructor(public postsService: PostsService, @Inject(MAT_DIALOG_DATA) public data: any) {
     if (this.data) {
       this.user = this.data.user;
       this.available_permissions = this.postsService.available_permissions;
@@ -55,14 +53,14 @@ export class ManageUserComponent implements OnInit {
   }
 
   changeUserPermissions(change, permission) {
-    this.postsService.setUserPermission(this.user.uid, permission, change.value).subscribe(() => {
+    this.postsService.setUserPermission(this.user.uid, permission, change.value).subscribe(res => {
       // console.log(res);
     });
   }
 
   setNewPassword() {
     this.settingNewPassword = true;
-    this.postsService.changeUserPassword(this.user.uid, this.newPasswordInput).subscribe(() => {
+    this.postsService.changeUserPassword(this.user.uid, this.newPasswordInput).subscribe(res => {
       this.newPasswordInput = '';
       this.settingNewPassword = false;
     });

src/app/components/modify-users/modify-users.component.html

@@ -1,15 +1,14 @@
 <div *ngIf="dataSource; else loading">
     <div style="padding: 15px">
     <div class="row">
-        <div class="table table-responsive pb-4 pt-4">
+        <div class="table table-responsive pb-4 pt-2">
         <div class="example-header">
-            <mat-form-field appearance="outline">
-                <mat-label i18n="Search">Search</mat-label>
-                <input matInput (keyup)="applyFilter($event)">
+            <mat-form-field>
+            <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Search" i18n-placeholder="search field description">
             </mat-form-field>
         </div>
         
-        <div class="mat-elevation-z8" style="margin-right: 15px;">
+        <div class="example-container mat-elevation-z8">
         
             <mat-table #table [dataSource]="dataSource" matSort>
         

src/app/components/modify-users/modify-users.component.ts

@@ -8,7 +8,6 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { AddUserDialogComponent } from 'app/dialogs/add-user-dialog/add-user-dialog.component';
 import { ManageUserComponent } from '../manage-user/manage-user.component';
 import { ManageRoleComponent } from '../manage-role/manage-role.component';
-import { User } from 'api-types';
 
 @Component({
   selector: 'app-modify-users',
@@ -32,7 +31,7 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
 
   // MatPaginator Output
   pageEvent: PageEvent;
-  users: User[];
+  users: any;
   editObject = null;
   constructedObject = {};
   roles = null;
@@ -63,8 +62,7 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
     this.pageSizeOptions = setPageSizeOptionsInput.split(',').map(str => +str);
   }
 
-  applyFilter(event: KeyboardEvent) {
-    let filterValue = (event.target as HTMLInputElement).value; // "as HTMLInputElement" is required: https://angular.io/guide/user-input#type-the-event
+  applyFilter(filterValue: string) {
     filterValue = filterValue.trim(); // Remove whitespace
     filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches
     this.dataSource.filter = filterValue;
@@ -96,9 +94,11 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
     });
   }
 
-  finishEditing(user_uid: string) {
+  finishEditing(user_uid) {
+    let has_finished = false;
     if (this.constructedObject && this.constructedObject['name'] && this.constructedObject['role']) {
       if (!isEmptyOrSpaces(this.constructedObject['name']) && !isEmptyOrSpaces(this.constructedObject['role'])) {
+        has_finished = true;
         const index_of_object = this.indexOfUser(user_uid);
         this.users[index_of_object] = this.constructedObject;
         this.constructedObject = {};
@@ -109,7 +109,7 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
     }
   }
 
-  enableEditMode(user_uid: string) {
+  enableEditMode(user_uid) {
     if (this.uidInUserList(user_uid) && this.indexOfUser(user_uid) > -1) {
       const users_index = this.indexOfUser(user_uid);
       this.editObject = this.users[users_index];
@@ -124,7 +124,7 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
   }
 
   // checks if user is in users array by name
-  uidInUserList(user_uid: string) {
+  uidInUserList(user_uid) {
     for (let i = 0; i < this.users.length; i++) {
       if (this.users[i].uid === user_uid) {
         return true;
@@ -134,7 +134,7 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
   }
 
   // gets index of user in users array by name
-  indexOfUser(user_uid: string) {
+  indexOfUser(user_uid) {
     for (let i = 0; i < this.users.length; i++) {
       if (this.users[i].uid === user_uid) {
         return i;
@@ -144,12 +144,12 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
   }
 
   setUser(change_obj) {
-    this.postsService.changeUser(change_obj).subscribe(() => {
+    this.postsService.changeUser(change_obj).subscribe(res => {
       this.getArray();
     });
   }
 
-  manageUser(user_uid: string) {
+  manageUser(user_uid) {
     const index_of_object = this.indexOfUser(user_uid);
     const user_obj = this.users[index_of_object];
     this.dialog.open(ManageUserComponent, {
@@ -160,17 +160,17 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
     });
   }
 
-  removeUser(user_uid: string) {
-    this.postsService.deleteUser(user_uid).subscribe(() => {
+  removeUser(user_uid) {
+    this.postsService.deleteUser(user_uid).subscribe(res => {
       this.getArray();
-    }, () => {
+    }, err => {
       this.getArray();
     });
   }
 
   createAndSortData() {
     // Sorts the data by last finished
-    this.users.sort((a, b) => a.name.localeCompare(b.name));
+    this.users.sort((a, b) => b.name > a.name);
 
     const filteredData = [];
     for (let i = 0; i < this.users.length; i++) {
@@ -188,7 +188,7 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
       }
     });
 
-    dialogRef.afterClosed().subscribe(() => {
+    dialogRef.afterClosed().subscribe(success => {
       this.getRoles();
     });
   }
@@ -197,7 +197,7 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
     this.dialogRef.close();
   }
 
-  public openSnackBar(message: string, action = '') {
+  public openSnackBar(message: string, action: string = '') {
     this.snackBar.open(message, action, {
       duration: 2000,
     });

src/app/components/notifications-list/notifications-list.component.html

@@ -1,30 +0,0 @@
-<div class="card-radius mat-elevation-z2" *ngFor="let notification of notifications; let i = index;">
-    <mat-card class="notification-card card-radius">
-        <mat-card-header>
-            <mat-card-subtitle>
-                <div>
-                    <span class="notification-timestamp">{{notification.timestamp * 1000 | date:'short'}}</span>
-                </div>
-            </mat-card-subtitle>
-            <mat-card-title>
-                <ng-container *ngIf="NOTIFICATION_PREFIX[notification.type]">
-                    {{NOTIFICATION_PREFIX[notification.type]}}
-                </ng-container>
-            </mat-card-title>
-        </mat-card-header>
-        <mat-card-content>
-            <ng-container *ngIf="NOTIFICATION_SUFFIX_KEY[notification.type]">
-                <div style="word-break: break-word">
-                    {{notification['data'][NOTIFICATION_SUFFIX_KEY[notification.type]]}}
-                </div>
-            </ng-container>
-        </mat-card-content>
-        <mat-card-actions *ngIf="notification.actions?.length > 0">
-            <button matTooltip="Remove" i18n-matTooltip="Remove" (click)="emitDeleteNotification(notification.uid)" mat-icon-button><mat-icon>close</mat-icon></button>
-            <span *ngFor="let action of notification.actions">
-                <button [matTooltip]="NOTIFICATION_ACTION_TO_STRING[action]" (click)="emitNotificationAction(notification, action)" mat-icon-button><mat-icon>{{NOTIFICATION_ICON[action]}}</mat-icon></button>
-            </span>
-        </mat-card-actions>
-        <span *ngIf="!notification.read" class="dot"></span>
-    </mat-card>
-</div>

src/app/components/notifications-list/notifications-list.component.scss

@@ -1,33 +0,0 @@
-.notification-divider {
-    margin-bottom: 10px;
-    margin-top: 10px;
-}
-
-.notification-text {
-    margin-left: 10px;
-    margin-right: 10px;
-    display: inline-block;
-}
-
-.notification-timestamp {
-    font-size: 14px;
-}
-
-.notification-card {
-    margin-top: 5px;
-}
-
-.card-radius {
-    border-radius: 12px;
-}
-
-.dot {
-    height: 8px;
-    width: 8px;
-    background-color: red;
-    border-radius: 50%;
-    display: inline-block;
-    position: absolute;
-    right: 8px;
-    top: 8px;
-  }

src/app/components/notifications-list/notifications-list.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NotificationsListComponent } from './notifications-list.component';
-
-describe('NotificationsListComponent', () => {
-  let component: NotificationsListComponent;
-  let fixture: ComponentFixture<NotificationsListComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ NotificationsListComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(NotificationsListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/notifications-list/notifications-list.component.ts

@@ -1,57 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { Notification } from 'api-types';
-import { NotificationAction } from 'api-types/models/NotificationAction';
-import { NotificationType } from 'api-types/models/NotificationType';
-
-@Component({
-  selector: 'app-notifications-list',
-  templateUrl: './notifications-list.component.html',
-  styleUrls: ['./notifications-list.component.scss']
-})
-export class NotificationsListComponent {
-  @Input() notifications = null;
-  @Output() deleteNotification = new EventEmitter<string>();
-  @Output() notificationAction = new EventEmitter<{notification: Notification, action: NotificationAction}>();
-
-  NOTIFICATION_PREFIX: { [key in NotificationType]: string } = {
-    download_complete: $localize`Finished downloading`,
-    download_error: $localize`Download failed`,
-    task_finished: $localize`Task finished`
-  }
-
-  // Attaches string to the end of the notification text
-  NOTIFICATION_SUFFIX_KEY: { [key in NotificationType]: string } = {
-    download_complete: 'file_title',
-    download_error: 'download_url',
-    task_finished: 'task_title'
-  }
-
-  NOTIFICATION_ACTION_TO_STRING: { [key in NotificationAction]: string } = {
-    play: $localize`Play`,
-    retry_download: $localize`Retry download`,
-    view_download_error: $localize`View error`,
-    view_tasks: $localize`View task`
-  }
-
-  NOTIFICATION_COLOR: { [key in NotificationAction]: string } = {
-    play: 'primary',
-    retry_download: 'primary',
-    view_download_error: 'warn',
-    view_tasks: 'primary'
-  }
-
-  NOTIFICATION_ICON: { [key in NotificationAction]: string } = {
-    play: 'smart_display',
-    retry_download: 'restart_alt',
-    view_download_error: 'warning',
-    view_tasks: 'task'
-  }
-
-  emitNotificationAction(notification: Notification, action: NotificationAction): void {
-    this.notificationAction.emit({notification: notification, action: action});
-  }
-
-  emitDeleteNotification(uid: string): void {
-    this.deleteNotification.emit(uid);
-  }
-}

src/app/components/notifications/notifications.component.css

@@ -1,10 +0,0 @@
-.notification-title {
-    margin-bottom: 6px;
-    text-align: center
-}
-
-.notifications-list-parent {
-    max-height: 70vh;
-    overflow-y: auto;
-    padding: 0px 10px 10px 10px;
-}

src/app/components/notifications/notifications.component.html

@@ -1,10 +0,0 @@
-<div *ngIf="notifications !== null && notifications.length === 0" style="text-align: center; margin: 10px;" i18n="No notifications available">No notifications available</div>
-<div *ngIf="notifications?.length > 0">
-    <div class="notifications-list-parent">
-        <mat-chip-listbox [value]="selectedFilters" [multiple]="true" (change)="selectedFiltersChanged($event)">
-            <mat-chip-option *ngFor="let filter of notificationFilters | keyvalue: originalOrder" [value]="filter.key" [selected]="selectedFilters.includes(filter.key)" color="accent">{{filter.value.label}}</mat-chip-option>
-        </mat-chip-listbox>
-        <app-notifications-list (notificationAction)="notificationAction($event)" (deleteNotification)="deleteNotification($event)" [notifications]="filtered_notifications"></app-notifications-list>
-    </div>
-    <button style="margin: 10px 0px 2px 10px;" *ngIf="notifications?.length > 0" color="warn" (click)="deleteAllNotifications()" mat-stroked-button>Remove all</button>
-</div>

src/app/components/notifications/notifications.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NotificationsComponent } from './notifications.component';
-
-describe('NotificationsComponent', () => {
-  let component: NotificationsComponent;
-  let fixture: ComponentFixture<NotificationsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ NotificationsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NotificationsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/notifications/notifications.component.ts

@@ -1,124 +0,0 @@
-import { Component, ElementRef, EventEmitter, OnInit, Output } from '@angular/core';
-import { Router } from '@angular/router';
-import { PostsService } from 'app/posts.services';
-import { Notification, NotificationType } from 'api-types';
-import { NotificationAction } from 'api-types/models/NotificationAction';
-import { MatChipListboxChange } from '@angular/material/chips';
-
-@Component({
-  selector: 'app-notifications',
-  templateUrl: './notifications.component.html',
-  styleUrls: ['./notifications.component.css']
-})
-export class NotificationsComponent implements OnInit {
-
-  notifications: Notification[] = null;
-  filtered_notifications: Notification[] = null;
-
-  @Output() notificationCount = new EventEmitter<number>();
-
-  notificationFilters: { [key in NotificationType]: {key: string, label: string} } = {
-    download_complete: {
-      key: 'download_complete',
-      label: $localize`Download completed`
-    },
-    download_error: {
-      key: 'download_error',
-      label: $localize`Download error`
-    },
-    task_finished: {
-      key: 'task_finished',
-      label: $localize`Task`
-    },
-  };
-
-  selectedFilters = [];
-
-  constructor(public postsService: PostsService, private router: Router, private elRef: ElementRef) { }
-
-  ngOnInit(): void {
-    // wait for init
-    if (this.postsService.initialized) {
-      this.getNotifications();
-    } else {
-      this.postsService.service_initialized.subscribe(init => {
-        if (init) {
-          this.getNotifications();
-        }
-      });
-    }
-  }
-
-  getNotifications(): void {
-    this.postsService.getNotifications().subscribe(res => {
-      this.notifications = res['notifications'];
-      this.notifications.sort((a, b) => b.timestamp - a.timestamp);
-      this.notificationCount.emit(this.notifications.filter(notification => !notification.read).length);
-
-      this.filterNotifications();
-    });
-  }
-
-  notificationAction(action_info: {notification: Notification, action: NotificationAction}): void {
-    switch (action_info['action']) {
-      case NotificationAction.PLAY:
-        this.router.navigate(['player', {uid: action_info['notification']['data']['file_uid']}]);
-        break;
-      case NotificationAction.VIEW_DOWNLOAD_ERROR:
-        this.router.navigate(['downloads']);
-        break;
-      case NotificationAction.RETRY_DOWNLOAD:
-        this.postsService.restartDownload(action_info['notification']['data']['download_uid']).subscribe(res => {
-          this.postsService.openSnackBar($localize`Download restarted!`);
-          this.deleteNotification(action_info['notification']['uid']);
-        });
-        break;
-      case NotificationAction.VIEW_TASKS:
-        this.router.navigate(['tasks']);
-        break;
-      default:
-        console.error(`Notification action ${action_info['action']} does not exist!`);
-        break;
-    }
-  }
-
-  deleteNotification(uid: string): void {
-    this.postsService.deleteNotification(uid).subscribe(res => {
-      this.notifications.filter(notification => notification['uid'] !== uid);
-      this.filterNotifications();
-      this.notificationCount.emit(this.notifications.length);
-      this.getNotifications();
-    });
-  }
-
-  deleteAllNotifications(): void {
-    this.postsService.deleteAllNotifications().subscribe(res => {
-      this.notifications = [];
-      this.filtered_notifications = [];
-      this.getNotifications();
-    });
-    this.notificationCount.emit(0);
-  }
-
-  setNotificationsToRead(): void {
-    const uids = this.notifications.map(notification => notification.uid);
-    this.postsService.setNotificationsToRead(uids).subscribe(res => {
-      this.getNotifications();
-    });
-    this.notificationCount.emit(0);
-  }
-
-  filterNotifications(): void {
-    this.filtered_notifications = this.notifications.filter(notification => this.selectedFilters.length === 0 || this.selectedFilters.includes(notification.type));
-  }
-
-  selectedFiltersChanged(event: MatChipListboxChange): void {
-    this.selectedFilters = event.value;
-    this.filterNotifications();
-  }
-
-  originalOrder = (): number => {
-    return 0;
-  }
-
-}

src/app/components/recent-videos/recent-videos.component.html

@@ -1,47 +1,47 @@
 <div class="container-fluid" style="max-width: 941px;">
     <div class="row">
-        <!-- Sorting -->
         <div class="col-12 order-2 col-sm-4 order-sm-1 d-flex justify-content-center">
-            <app-sort-property [(sortProperty)]="sortProperty" [(descendingMode)]="descendingMode" (sortOptionChanged)="sortOptionChanged($event)"></app-sort-property>
+            <div>
+                <div style="display: inline-block;">
+                    <mat-form-field style="width: 132px;">
+                        <mat-select [(ngModel)]="this.filterProperty" (selectionChange)="filterOptionChanged($event.value)">
+                            <mat-option *ngFor="let filterOption of filterProperties | keyvalue" [value]="filterOption.value">
+                                {{filterOption['value']['label']}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                </div>
+                <div class="sort-dir-div">
+                    <button (click)="toggleModeChange()" mat-icon-button><mat-icon>{{descendingMode ? 'arrow_downward' : 'arrow_upward'}}</mat-icon></button>
+                </div>
+            </div>
         </div>
-        <!-- Files title -->
         <div class="col-12 order-1 col-sm-4 order-sm-2 d-flex justify-content-center">
             <h4 *ngIf="!customHeader" class="my-videos-title" i18n="My files title">My files</h4>
             <h4 *ngIf="customHeader" class="my-videos-title">{{customHeader}}</h4>
         </div>
-        <!-- Search -->
         <div class="col-12 order-3 col-sm-4 order-sm-3 d-flex justify-content-center">
-            <mat-form-field appearance="outline" [ngClass]="searchIsFocused ? 'search-bar-focused' : 'search-bar-unfocused'" class="search-bar" color="accent">
-                <mat-label i18n="Search">Search</mat-label>
-                <input (focus)="searchIsFocused = true" (blur)="searchIsFocused = false" class="search-input" type="text" [(ngModel)]="search_text" (ngModelChange)="onSearchInputChanged($event)" matInput>
+            <mat-form-field [ngClass]="searchIsFocused ? 'search-bar-focused' : 'search-bar-unfocused'" class="search-bar" color="accent">
+                <input (focus)="searchIsFocused = true" (blur)="searchIsFocused = false" class="search-input" type="text" placeholder="Search" i18n-placeholder="Files search placeholder" [(ngModel)]="search_text" (ngModelChange)="onSearchInputChanged($event)" matInput>
                 <mat-icon matSuffix>search</mat-icon>
             </mat-form-field>
         </div>
     </div>
-    <!-- Filters -->
-    <div class="row justify-content-center">
-        <mat-chip-listbox class="filter-list" [value]="selectedFilters" [multiple]="true" (change)="selectedFiltersChanged($event)">
-            <mat-chip-option *ngFor="let filter of fileFilters | keyvalue: originalOrder" [value]="filter.key" [selected]="selectedFilters.includes(filter.key)" color="accent">{{filter.value.label}}</mat-chip-option>
-        </mat-chip-listbox>
-    </div>
 </div>
 <div>
-    <!-- Files -->
     <div *ngIf="!selectMode" class="container" style="margin-bottom: 16px">
         <div class="row justify-content-center">
-            <!-- Real cards -->
             <ng-container *ngIf="normal_files_received && paged_data">
                 <div style="display: flex; align-items: center;" *ngFor="let file of paged_data; let i = index" class="mb-2 mt-2 d-flex justify-content-center" [ngClass]="[ postsService.card_size === 'small' ? 'col-2 small-col' : '', postsService.card_size === 'medium' ? 'col-6 col-lg-4 medium-col' : '', postsService.card_size === 'large' ? 'col-12 large-col' : '' ]">
-                    <app-unified-file-card [ngClass]="downloading_content[file.uid] ? 'blurred' : ''" [index]="i" [card_size]="postsService.card_size" [locale]="postsService.locale" (goToFile)="goToFile($event)" (goToSubscription)="goToSubscription($event)" (toggleFavorite)="toggleFavorite($event)" [file_obj]="file" [use_youtubedl_archive]="postsService.config['Downloader']['use_youtubedl_archive']" [availablePlaylists]="playlists" (addFileToPlaylist)="addFileToPlaylist($event)" [loading]="false" (deleteFile)="deleteFile($event)" [baseStreamPath]="postsService.path" [jwtString]="postsService.isLoggedIn ? this.postsService.token : ''"></app-unified-file-card>
+                    <app-unified-file-card [ngClass]="downloading_content[file.uid] ? 'blurred' : ''" [index]="i" [card_size]="postsService.card_size" [locale]="postsService.locale" (goToFile)="goToFile($event)" (goToSubscription)="goToSubscription($event)" [file_obj]="file" [use_youtubedl_archive]="postsService.config['Downloader']['use_youtubedl_archive']" [availablePlaylists]="playlists" (addFileToPlaylist)="addFileToPlaylist($event)" [loading]="false" (deleteFile)="deleteFile($event)" [baseStreamPath]="postsService.path" [jwtString]="postsService.isLoggedIn ? this.postsService.token : ''"></app-unified-file-card>
                     <mat-spinner *ngIf="downloading_content[file.uid]" class="downloading-spinner" [diameter]="32"></mat-spinner>
                 </div>
                 <div *ngIf="paged_data.length === 0">
                     <ng-container i18n="No files found">No files found.</ng-container>
                 </div>
             </ng-container>
-            <!-- Fake cards -->
-            <ng-container>
-                <div *ngFor="let file of loading_files; let i = index" class="mb-2 mt-2 d-flex justify-content-center" [ngClass]="[normal_files_received ? 'hide' : '', postsService.card_size === 'small' ? 'col-2 small-col' : '', postsService.card_size === 'medium' ? 'col-6 col-lg-4 medium-col' : '', postsService.card_size === 'large' ? 'col-12 large-col' : '' ]">
+            <ng-container *ngIf="!normal_files_received && loading_files && loading_files.length > 0">
+                <div *ngFor="let file of loading_files; let i = index" class="mb-2 mt-2 d-flex justify-content-center" [ngClass]="[ postsService.card_size === 'small' ? 'col-2 small-col' : '', postsService.card_size === 'medium' ? 'col-6 col-lg-4 medium-col' : '', postsService.card_size === 'large' ? 'col-12 large-col' : '' ]">
                     <app-unified-file-card [index]="i" [card_size]="postsService.card_size" [locale]="postsService.locale" [loading]="true" [theme]="postsService.theme"></app-unified-file-card>
                 </div>
             </ng-container>
@@ -49,7 +49,6 @@
     </div>
 
     <div *ngIf="selectMode">
-        <!-- If selected files e.g. for creating a playlist -->
         <mat-tab-group [(selectedIndex)]="selectedIndex">
             <mat-tab label="Order" i18n-label="Order">
                 <div *ngIf="selected_data.length">
@@ -74,8 +73,8 @@
                     <mat-list-option [selected]="selected_data.includes(file.uid)" *ngFor="let file of paged_data" [value]="file">
                         <div class="container">
                             <div class="row justify-content-center">
-                                <div class="col-10 select-file-title">
-                                    <mat-icon class="audio-video-icon">{{file.isAudio ? 'audiotrack' : 'movie'}}</mat-icon>
+                                <div class="col-10">
+                                    <mat-icon class="audio-video-icon">{{(file.type === 'audio' || file.isAudio) ? 'audiotrack' : 'movie'}}</mat-icon>
                                     {{file.title}}
                                 </div>
                                 <div class="col-2">{{file.registered | date:'shortDate'}}</div>
@@ -88,7 +87,7 @@
                 <ng-container *ngIf="!normal_files_received && loading_files && loading_files.length > 0">
                     <mat-selection-list *ngIf="!normal_files_received">
                         <mat-list-option *ngFor="let file of paged_data">
-                            <content-loader class="list-ghosts" [primaryColor]="postsService.theme.ghost_primary" [secondaryColor]="postsService.theme.ghost_secondary" [width]="250" [height]="8"><svg:rect x="0" y="0" rx="3" ry="3" width="250" height="8" /></content-loader>
+                            <content-loader class="list-ghosts" [primaryColor]="postsService.theme.ghost_primary" [secondaryColor]="postsService.theme.ghost_secondary" width="250" height="8"><svg:rect x="0" y="0" rx="3" ry="3" width="250" height="8" /></content-loader>
                         </mat-list-option>
                     </mat-selection-list>
                 </ng-container>
@@ -97,6 +96,16 @@
     </div>
 
     <div style="position: relative;" *ngIf="usePaginator && selectedIndex > 0">
+        <div style="position: absolute; margin-left: 8px; margin-top: 5px; scale: 0.8">
+            <mat-form-field>
+                <mat-label><ng-container i18n="File type">File type</ng-container></mat-label>
+                <mat-select color="accent" [(ngModel)]="fileTypeFilter" (selectionChange)="fileTypeFilterChanged($event.value)">
+                    <mat-option value="both"><ng-container i18n="Both">Both</ng-container></mat-option>
+                    <mat-option value="video_only"><ng-container i18n="Video only">Video only</ng-container></mat-option>
+                    <mat-option value="audio_only"><ng-container i18n="Audio only">Audio only</ng-container></mat-option>
+                </mat-select>
+            </mat-form-field>
+        </div>
         <mat-paginator class="paginator" #paginator (page)="pageChangeEvent($event)" [length]="file_count"
                 [pageSize]="pageSize"
                 [pageSizeOptions]="[5, 10, 25, 100, this.paged_data && this.paged_data.length > 100 ? this.paged_data.length : 250]">

src/app/components/recent-videos/recent-videos.component.scss

@@ -17,7 +17,7 @@
 }
  
 .search-bar-unfocused {
-    width: 165px;
+    width: 132px;
 }
 
 .search-input {
@@ -41,6 +41,12 @@
     display: inline-block;
 }
 
+.sort-dir-div {
+    display: inline-block;
+    position: absolute;
+    top: 10px;
+}
+
 .paginator {
     margin-top: 5px;
 }
@@ -94,7 +100,7 @@
 .remove-item-button {
     right: 10px;
     position: absolute;
-    top: 0px;
+    top: 4px;
 }
 
 .playlist-item-text {
@@ -112,18 +118,4 @@
 .downloading-spinner {
     align-self: center;
     position: absolute;
-}
-
-.filter-list {
-    margin-bottom: 10px;
-}
-
-.hide {
-    display: none !important;
-}
-
-.select-file-title {
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
 }

src/app/components/recent-videos/recent-videos.component.ts

@@ -1,13 +1,11 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { PostsService } from 'app/posts.services';
 import { Router } from '@angular/router';
-import { DatabaseFile, FileType, FileTypeFilter, Sort } from '../../../api-types';
+import { DatabaseFile, FileType, FileTypeFilter } from '../../../api-types';
 import { MatPaginator } from '@angular/material/paginator';
 import { Subject } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
-import { MatChipListboxChange } from '@angular/material/chips';
-import { MatSelectionListChange } from '@angular/material/list';
 
 @Component({
   selector: 'app-recent-videos',
@@ -48,27 +46,35 @@ export class RecentVideosComponent implements OnInit {
   search_text = '';
   searchIsFocused = false;
   descendingMode = true;
-
-  fileFilters = {
-    video_only: {
-      key: 'video_only',
-      label: $localize`Video only`,
-      incompatible: ['audio_only']
+  filterProperties = {
+    'registered': {
+      'key': 'registered',
+      'label': 'Download Date',
+      'property': 'registered'
     },
-    audio_only: {
-      key: 'audio_only',
-      label: $localize`Audio only`,
-      incompatible: ['video_only']
+    'upload_date': {
+      'key': 'upload_date',
+      'label': 'Upload Date',
+      'property': 'upload_date'
     },
-    favorited: {
-      key: 'favorited',
-      label: $localize`Favorited`
+    'name': {
+      'key': 'name',
+      'label': 'Name',
+      'property': 'title'
     },
+    'file_size': {
+      'key': 'file_size',
+      'label': 'File Size',
+      'property': 'size'
+    },
+    'duration': {
+      'key': 'duration',
+      'label': 'Duration',
+      'property': 'duration'
+    }
   };
-
-  selectedFilters = [];
-
-  sortProperty = 'registered';
+  filterProperty = this.filterProperties['upload_date'];
+  fileTypeFilter = 'both';
   
   playlists = null;
 
@@ -82,17 +88,15 @@ export class RecentVideosComponent implements OnInit {
     }
 
     // set filter property to cached value
-    const cached_sort_property = localStorage.getItem('sort_property');
-    if (cached_sort_property) {
-      this.sortProperty = cached_sort_property;
+    const cached_filter_property = localStorage.getItem('filter_property');
+    if (cached_filter_property && this.filterProperties[cached_filter_property]) {
+      this.filterProperty = this.filterProperties[cached_filter_property];
     }
 
     // set file type filter to cached value
-    const cached_file_filter = localStorage.getItem('file_filter');
-    if (this.usePaginator && cached_file_filter) {
-      this.selectedFilters = JSON.parse(cached_file_filter)
-    } else {
-      this.selectedFilters = [];
+    const cached_file_type_filter = localStorage.getItem('file_type_filter');
+    if (this.usePaginator && cached_file_type_filter) {
+      this.fileTypeFilter = cached_file_type_filter;
     }
 
     const sort_order = localStorage.getItem('recent_videos_sort_order');
@@ -103,12 +107,6 @@ export class RecentVideosComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    if (this.sub_id) {
-      // subscriptions can't download both audio and video (for now), so don't let users filter for these
-      delete this.fileFilters['audio_only'];
-      delete this.fileFilters['video_only'];
-    }
-
     if (this.postsService.initialized) {
       this.getAllFiles();
       this.getAllPlaylists();
@@ -163,59 +161,30 @@ export class RecentVideosComponent implements OnInit {
     this.searchChangedSubject.next(newvalue);
   }
 
-  sortOptionChanged(value: Sort): void {
-    localStorage.setItem('sort_property', value['by']);
-    localStorage.setItem('recent_videos_sort_order', value['order'] === -1 ? 'descending' : 'ascending');
-    this.descendingMode = value['order'] === -1;
-    this.sortProperty = value['by'];
-    
+  filterOptionChanged(value: string): void {
+    localStorage.setItem('filter_property', value['key']);
     this.getAllFiles();
   }
 
-  filterChanged(value: string): void {
-    localStorage.setItem('file_filter', value);
-    // wait a bit for the animation to finish
-    setTimeout(() => this.getAllFiles(), 150);
+  fileTypeFilterChanged(value: string): void {
+    localStorage.setItem('file_type_filter', value);
+    this.getAllFiles();
   }
 
-  selectedFiltersChanged(event: MatChipListboxChange): void {
-    // in some cases this function will fire even if the selected filters haven't changed
-    if (event.value.length === this.selectedFilters.length) return;
-    if (event.value.length > this.selectedFilters.length) {
-      const filter_key = event.value.filter(possible_new_key => !this.selectedFilters.includes(possible_new_key))[0];
-      this.selectedFilters = this.selectedFilters.filter(existing_filter => !this.fileFilters[existing_filter].incompatible || !this.fileFilters[existing_filter].incompatible.includes(filter_key));
-      this.selectedFilters.push(filter_key);
-    } else {
-      this.selectedFilters = event.value;
-    }
-    this.filterChanged(JSON.stringify(this.selectedFilters));
+  toggleModeChange(): void {
+    this.descendingMode = !this.descendingMode;
+    localStorage.setItem('recent_videos_sort_order', this.descendingMode ? 'descending' : 'ascending');
+    this.getAllFiles();
   }
 
-  getFileTypeFilter(): string {
-    if (this.selectedFilters.includes('audio_only')) {
-      return 'audio_only';
-    } else if (this.selectedFilters.includes('video_only')) {
-      return 'video_only';
-    } else {
-      return 'both';
-    }
-  }
-
-  getFavoriteFilter(): boolean {
-    return this.selectedFilters.includes('favorited');
-  }
-
-
   // get files
 
   getAllFiles(cache_mode = false): void {
     this.normal_files_received = cache_mode;
     const current_file_index = (this.paginator?.pageIndex ? this.paginator.pageIndex : 0)*this.pageSize;
-    const sort = {by: this.sortProperty, order: this.descendingMode ? -1 : 1};
+    const sort = {by: this.filterProperty['property'], order: this.descendingMode ? -1 : 1};
     const range = [current_file_index, current_file_index + this.pageSize];
-    const fileTypeFilter = this.getFileTypeFilter();
-    const favoriteFilter = this.getFavoriteFilter();
-    this.postsService.getAllFiles(sort, this.usePaginator ? range : null, this.search_mode ? this.search_text : null, fileTypeFilter as FileTypeFilter, favoriteFilter, this.sub_id).subscribe(res => {
+    this.postsService.getAllFiles(sort, range, this.search_mode ? this.search_text : null, this.fileTypeFilter as FileTypeFilter, this.sub_id).subscribe(res => {
       this.file_count = res['file_count'];
       this.paged_data = res['files'];
       for (let i = 0; i < this.paged_data.length; i++) {
@@ -317,14 +286,16 @@ export class RecentVideosComponent implements OnInit {
   }
 
   deleteAndRedownload(file: DatabaseFile): void {
-    this.postsService.deleteSubscriptionFile(file.uid, false).subscribe(() => {
+    const sub = this.postsService.getSubscriptionByID(file.sub_id);
+    this.postsService.deleteSubscriptionFile(sub, file.id, false, file.uid).subscribe(() => {
       this.postsService.openSnackBar($localize`Successfully deleted file: ` + file.id);
       this.removeFileCard(file);
     });
   }
 
   deleteForever(file: DatabaseFile): void {
-    this.postsService.deleteSubscriptionFile(file.uid, true).subscribe(() => {
+    const sub = this.postsService.getSubscriptionByID(file.sub_id);
+    this.postsService.deleteSubscriptionFile(sub, file.id, true, file.uid).subscribe(() => {
       this.postsService.openSnackBar($localize`Successfully deleted file: ` + file.id);
       this.removeFileCard(file);
     });
@@ -377,9 +348,8 @@ export class RecentVideosComponent implements OnInit {
     this.getAllFiles();
   }
 
-  fileSelectionChanged(event: MatSelectionListChange): void {
-    // TODO: make sure below line is possible (_selected is private)
-    const adding = event.option['_selected'];
+  fileSelectionChanged(event: { option: { _selected: boolean; value: DatabaseFile; } }): void {
+    const adding = event.option._selected;
     const value = event.option.value;
     if (adding) {
       this.selected_data.push(value.uid);
@@ -415,13 +385,4 @@ export class RecentVideosComponent implements OnInit {
     this.selected_data_objs.splice(index, 1);
     this.fileSelectionEmitter.emit({new_selection: this.selected_data, thumbnailURL: this.selected_data_objs[0].thumbnailURL});
   }
-
-  originalOrder = (): number => {
-    return 0;
-  }
-
-  toggleFavorite(file_obj): void {
-    file_obj.favorite = !file_obj.favorite;
-    this.postsService.updateFile(file_obj.uid, {favorite: file_obj.favorite}).subscribe(res => {});
-  }
 }

src/app/components/sort-property/sort-property.component.html

@@ -1,14 +0,0 @@
-<div>
-    <div style="display: inline-block;">
-        <mat-form-field appearance="outline" style="width: 165px;">
-            <mat-select [(ngModel)]="this.sortProperty" (selectionChange)="emitSortOptionChanged()">
-                <mat-option *ngFor="let sortOption of sortProperties | keyvalue" [value]="sortOption.key">
-                    {{sortOption['value']['label']}}
-                </mat-option>
-            </mat-select>
-        </mat-form-field>
-    </div>
-    <div class="sort-dir-div">
-        <button (click)="toggleModeChange()" mat-icon-button><mat-icon>{{descendingMode ? 'arrow_downward' : 'arrow_upward'}}</mat-icon></button>
-    </div>
-</div>

src/app/components/sort-property/sort-property.component.scss

@@ -1,5 +0,0 @@
-.sort-dir-div {
-    display: inline-block;
-    position: absolute;
-    top: 4px;
-}

src/app/components/sort-property/sort-property.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SortPropertyComponent } from './sort-property.component';
-
-describe('SortPropertyComponent', () => {
-  let component: SortPropertyComponent;
-  let fixture: ComponentFixture<SortPropertyComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ SortPropertyComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(SortPropertyComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/sort-property/sort-property.component.ts

@@ -1,54 +0,0 @@
-import { Component, Input, EventEmitter, Output } from '@angular/core';
-import { Sort } from 'api-types';
-
-@Component({
-  selector: 'app-sort-property',
-  templateUrl: './sort-property.component.html',
-  styleUrls: ['./sort-property.component.scss']
-})
-export class SortPropertyComponent {
-  sortProperties = {
-    'registered': {
-      'key': 'registered',
-      'label': $localize`Download Date`
-    },
-    'upload_date': {
-      'key': 'upload_date',
-      'label': $localize`Upload Date`
-    },
-    'title': {
-      'key': 'title',
-      'label': $localize`Name`
-    },
-    'size': {
-      'key': 'size',
-      'label': $localize`File Size`
-    },
-    'duration': {
-      'key': 'duration',
-      'label': $localize`Duration`
-    }
-  };
-  
-  @Input() sortProperty = 'registered';
-  @Input() descendingMode = true;
-
-  @Output() sortPropertyChange = new EventEmitter<string>();
-  @Output() descendingModeChange = new EventEmitter<boolean>();
-  @Output() sortOptionChanged = new EventEmitter<Sort>();
-
-  toggleModeChange(): void {
-    this.descendingMode = !this.descendingMode;
-    this.emitSortOptionChanged();
-  }
-
-  emitSortOptionChanged(): void {
-    if (!this.sortProperty || !this.sortProperties[this.sortProperty]) {
-      return;
-    }
-    this.sortOptionChanged.emit({
-      by: this.sortProperty,
-      order: this.descendingMode ? -1 : 1
-    });
-  }
-}

src/app/components/task-settings/task-settings.component.html

@@ -1,29 +0,0 @@
-<h4 mat-dialog-title><ng-container i18n="Task settings">Task settings - {{task.title}}</ng-container></h4>
-
-<mat-dialog-content>
-    <div *ngIf="task_key === 'delete_old_files'">
-        <mat-form-field color="accent">
-            <mat-label i18n="Delete files older than">Delete files older than</mat-label>
-            <input [(ngModel)]="new_options['threshold_days']" matInput onlyNumber required>
-            <span matTextSuffix>days</span>
-        </mat-form-field>
-        <div>
-            <mat-checkbox [(ngModel)]="new_options['blacklist_files']" i18n="Blacklist deleted files" placeholder="Archive mode must be enabled" placeholder-i18n>Blacklist all files</mat-checkbox>
-        </div>
-        <div>
-            <mat-checkbox [disabled]="new_options['blacklist_files']" [(ngModel)]="new_options['blacklist_subscription_files']" i18n="Blacklist deleted subscription files" placeholder="Archive mode must be enabled" placeholder-i18n>Blacklist deleted subscription files</mat-checkbox>
-        </div>
-    </div>
-
-    <div>
-        <mat-checkbox [(ngModel)]="new_options['auto_confirm']" i18n="Do not ask for confirmation">Do not ask for confirmation</mat-checkbox>
-    </div>
-</mat-dialog-content>
-
-<mat-dialog-actions>
-    <button mat-button mat-dialog-close>
-        <ng-container *ngIf="optionsChanged()" i18n="Task settings cancel button">Cancel</ng-container>
-        <ng-container *ngIf="!optionsChanged()" i18n="Task settings close button">Close</ng-container>
-    </button>
-    <button mat-button [disabled]="!optionsChanged()" (click)="saveSettings()"><ng-container i18n="Save button">Save</ng-container></button>
-</mat-dialog-actions>

src/app/components/task-settings/task-settings.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TaskSettingsComponent } from './task-settings.component';
-
-describe('TaskSettingsComponent', () => {
-  let component: TaskSettingsComponent;
-  let fixture: ComponentFixture<TaskSettingsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ TaskSettingsComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(TaskSettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/task-settings/task-settings.component.ts

@@ -1,46 +0,0 @@
-import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { Task } from 'api-types';
-import { PostsService } from 'app/posts.services';
-
-@Component({
-  selector: 'app-task-settings',
-  templateUrl: './task-settings.component.html',
-  styleUrls: ['./task-settings.component.scss']
-})
-export class TaskSettingsComponent {
-  task_key: string;
-  new_options = {};
-  task: Task = null;
-
-  constructor(private postsService: PostsService, @Inject(MAT_DIALOG_DATA) public data: {task: Task}) {
-    this.task_key = this.data.task.key;
-    this.task = this.data.task;
-    if (!this.task.options) {
-      this.task.options = {};
-    }
-  }
-
-  ngOnInit(): void {
-    this.getSettings();
-  }
-
-  getSettings(): void {
-    this.postsService.getTask(this.task_key).subscribe(res => {
-      this.task = res['task'];
-      this.new_options = JSON.parse(JSON.stringify(this.task['options'])) || {};
-    });
-  }
-
-  saveSettings(): void {
-    this.postsService.updateTaskOptions(this.task_key, this.new_options).subscribe(() => {
-      this.getSettings();
-    }, () => {
-      this.getSettings();
-    });
-  }
-
-  optionsChanged(): boolean {
-    return JSON.stringify(this.new_options) !== JSON.stringify(this.task.options);
-  }
-}

src/app/components/tasks/tasks.component.html

@@ -35,8 +35,8 @@
             <mat-cell *matCellDef="let element">
                 <span *ngIf="element.running || element.confirming"><mat-spinner matTooltip="Busy" i18n-matTooltip="Busy" [diameter]="25"></mat-spinner></span>
                 <span *ngIf="!(element.running || element.confirming) && element.schedule" style="display: flex">
-                    <ng-container i18n="Scheduled">Scheduled for</ng-container>
-                    {{element.next_invocation | date: 'short'}}<mat-icon style="font-size: 16px; display: inline-flex; align-items: center; padding-left: 5px; padding-bottom: 6px;" *ngIf="element.schedule.type === 'recurring'">repeat</mat-icon>
+                    <ng-container i18n="Scheduled">Scheduled for</ng-container>&nbsp;
+                    {{element.next_invocation | date: 'short'}}<mat-icon style="font-size: 16px; display: inline-flex; align-items: center; padding-left: 5px;" *ngIf="element.schedule.type === 'recurring'">repeat</mat-icon>
                 </span>
                 <span *ngIf="!(element.running || element.confirming) && !element.schedule">
                     <ng-container i18n="Not scheduled">Not scheduled</ng-container>
@@ -62,9 +62,6 @@
                                     <ng-container *ngIf="element.key == 'youtubedl_update_check'">
                                         <ng-container i18n="Update binary to">Update binary to:</ng-container>&nbsp;{{element.data}}
                                     </ng-container>
-                                    <ng-container *ngIf="element.key == 'delete_old_files'">
-                                        <ng-container i18n="Delete old files">Delete old files:</ng-container>&nbsp;{{element.data.uids.length}}
-                                    </ng-container>
                                 </button>
                             </ng-container>
                         </div>
@@ -74,12 +71,6 @@
                         <div class="col-3">
                             <button (click)="scheduleTask(element)" mat-icon-button matTooltip="Schedule" i18n-matTooltip="Schedule"><mat-icon>schedule</mat-icon></button>
                         </div>
-                        <div class="col-3">
-                            <button (click)="openTaskSettings(element)" mat-icon-button matTooltip="Settings" i18n-matTooltip="Settings"><mat-icon>settings</mat-icon></button>
-                        </div>
-                        <div *ngIf="element.error" class="col-3">
-                            <button (click)="showError(element)" mat-icon-button matTooltip="Show error" i18n-matTooltip="Show error"><mat-icon>warning</mat-icon></button>
-                        </div>
                     </div>
                 </div>
             </mat-cell>
@@ -89,7 +80,7 @@
             <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
         </mat-table>
       
-        <mat-paginator [pageSizeOptions]="[10, 20]"
+        <mat-paginator [pageSizeOptions]="[5, 10, 20]"
                        showFirstLastButtons 
                        aria-label="Select page of tasks">
         </mat-paginator>

src/app/components/tasks/tasks.component.scss

@@ -29,8 +29,4 @@ mat-header-cell, mat-cell {
 
 .rounded {
     border-radius: 16px 16px 16px 16px !important;
-}
-
-::ng-deep mat-row {
-    height: fit-content !important;
 }

src/app/components/tasks/tasks.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
@@ -8,8 +8,6 @@ import { RestoreDbDialogComponent } from 'app/dialogs/restore-db-dialog/restore-
 import { UpdateTaskScheduleDialogComponent } from 'app/dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component';
 import { PostsService } from 'app/posts.services';
 import { Task } from 'api-types';
-import { TaskSettingsComponent } from '../task-settings/task-settings.component';
-import { Clipboard } from '@angular/cdk/clipboard';
 
 @Component({
   selector: 'app-tasks',
@@ -31,7 +29,7 @@ export class TasksComponent implements OnInit {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  constructor(private postsService: PostsService, private dialog: MatDialog, private clipboard: Clipboard) { }
+  constructor(private postsService: PostsService, private dialog: MatDialog) { }
 
   ngOnInit(): void {
     if (this.postsService.initialized) {
@@ -119,14 +117,6 @@ export class TasksComponent implements OnInit {
     });
   }
 
-  openTaskSettings(task: Task): void {
-    this.dialog.open(TaskSettingsComponent, {
-      data: {
-        task: task
-      }
-    });
-  }
-
   getDBBackups(): void {
     this.postsService.getDBBackups().subscribe(res => {
       this.db_backups = res['db_backups'];
@@ -167,24 +157,4 @@ export class TasksComponent implements OnInit {
     });
   }
 
-  showError(task: Task): void {
-    const copyToClipboardEmitter = new EventEmitter<boolean>();
-    this.dialog.open(ConfirmDialogComponent, {
-      data: {
-        dialogTitle: $localize`Error for: ${task['title']}`,
-        dialogText: task['error'],
-        submitText: $localize`Copy to clipboard`,
-        cancelText: $localize`Close`,
-        closeOnSubmit: false,
-        onlyEmitOnDone: true,
-        doneEmitter: copyToClipboardEmitter
-      }
-    });
-    copyToClipboardEmitter.subscribe((done: boolean) => {
-      if (done) {
-        this.postsService.openSnackBar($localize`Copied to clipboard!`);
-        this.clipboard.copy(task['error']);
-      }
-    });
-  }
 }

src/app/components/twitch-chat/twitch-chat.component.ts

@@ -1,5 +1,4 @@
 import { Component, ElementRef, Input, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
-import { DatabaseFile } from 'api-types';
 import { PostsService } from 'app/posts.services';
 
 @Component({
@@ -21,7 +20,7 @@ export class TwitchChatComponent implements OnInit, OnDestroy {
 
   scrollContainer = null;
 
-  @Input() db_file: DatabaseFile = null;
+  @Input() db_file = null;
   @Input() sub = null;
   @Input() current_timestamp = null;
 
@@ -45,7 +44,7 @@ export class TwitchChatComponent implements OnInit, OnDestroy {
     return position > height - threshold;
   }
 
-  scrollToBottom = (force_scroll = false) => {
+  scrollToBottom = (force_scroll) => {
     if (force_scroll || this.isUserNearBottom()) {
       this.scrollContainer.scrollTop = this.scrollContainer.scrollHeight;
     }

src/app/components/unified-file-card/unified-file-card.component.html

@@ -5,7 +5,7 @@
         <ng-container i18n="Auto-generated label" *ngIf="file_obj.auto">Auto-generated</ng-container>
         <ng-container *ngIf="!file_obj.auto">{{file_obj.registered | date:'shortDate' : undefined : locale.ngID}}</ng-container>
     </div>
-    <div *ngIf="loading" class="download-time" style="width: 75%; margin-top: 5px;"><content-loader [primaryColor]="theme.ghost_primary" [secondaryColor]="theme.ghost_secondary" [width]="250" [height]="30"><svg:rect x="0" y="0" rx="3" ry="3" width="250" height="30" /></content-loader></div>
+    <div *ngIf="loading" class="download-time" style="width: 75%; margin-top: 5px;"><content-loader [primaryColor]="theme.ghost_primary" [secondaryColor]="theme.ghost_secondary" width="250" height="30"><svg:rect x="0" y="0" rx="3" ry="3" width="250" height="30" /></content-loader></div>
     <!-- The context menu trigger must be kept above the "more info" menu -->
     <div style="visibility: hidden; position: fixed"
         [style.left]="contextMenuPosition.x"
@@ -21,11 +21,6 @@
     </mat-menu>
     <mat-menu #action_menu="matMenu">
         <ng-container *ngIf="!is_playlist && !loading">
-            <button (click)="emitToggleFavorite()" mat-menu-item>
-                <mat-icon>{{file_obj.favorite ? 'favorite_filled' : 'favorite_outline'}}</mat-icon>
-                <ng-container *ngIf="!file_obj.favorite" i18n="Favorite button">Favorite</ng-container>
-                <ng-container *ngIf="file_obj.favorite" i18n="Unfavorite button">Unfavorite</ng-container>
-            </button>
             <button (click)="openFileInfoDialog()" mat-menu-item><mat-icon>info</mat-icon><ng-container i18n="Video info button">Info</ng-container></button>
             <button (click)="navigateToSubscription()" mat-menu-item *ngIf="file_obj.sub_id"><mat-icon>{{file_obj.isAudio ? 'library_music' : 'video_library'}}</mat-icon>&nbsp;<ng-container i18n="Go to subscription menu item">Go to subscription</ng-container></button>
             <button [disabled]="!availablePlaylists || availablePlaylists.length === 0" [matMenuTriggerFor]="addtoplaylist" mat-menu-item><mat-icon>playlist_add</mat-icon>&nbsp;<ng-container i18n="Add to playlist menu item">Add to playlist</ng-container></button>
@@ -68,11 +63,11 @@
             </div>
 
             <div *ngIf="loading" class="img-div">
-                <content-loader [primaryColor]="theme.ghost_primary" [secondaryColor]="theme.ghost_secondary" [width]="100" [height]="55"><svg:rect x="0" y="0" rx="0" ry="0" width="100" height="55" /></content-loader>
+                <content-loader [primaryColor]="theme.ghost_primary" [secondaryColor]="theme.ghost_secondary" width="100" height="55"><svg:rect x="0" y="0" rx="0" ry="0" width="100" height="55" /></content-loader>
             </div>
 
             <span *ngIf="!loading" [ngClass]="{'max-two-lines': card_size !== 'small', 'max-one-line': card_size === 'small' }">{{card_size === 'large' && file_obj.uploader ? file_obj.uploader + ' - ' : ''}}<strong>{{!is_playlist ? file_obj.title : file_obj.name}}</strong></span>
-            <span *ngIf="loading" class="title-loading"><content-loader [primaryColor]="theme.ghost_primary" [secondaryColor]="theme.ghost_secondary" [width]="250" [height]="30"><svg:rect x="0" y="0" rx="3" ry="3" width="250" height="30" /></content-loader></span>
+            <span *ngIf="loading" class="title-loading"><content-loader [primaryColor]="theme.ghost_primary" [secondaryColor]="theme.ghost_secondary" width="250" height="30"><svg:rect x="0" y="0" rx="3" ry="3" width="250" height="30" /></content-loader></span>
         </div>
     </mat-card>
 </div>

src/app/components/unified-file-card/unified-file-card.component.scss

@@ -21,20 +21,14 @@
 
 .menuButton {
   right: 0px;
-  width: 32px !important;
-  height: 32px !important;
+  top: -1px;
   position: absolute;
-  display: flex;
-  align-items: center;
   z-index: 999;
-  justify-content: center;
-  padding: 0px !important;
-  top: 2px;
+  
 }
 
 /* Coerce the <span> icon container away from display:inline */
-/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */
-.mat-mdc-icon-button .mat-button-wrapper {
+.mat-icon-button .mat-button-wrapper {
   display: flex;
   justify-content: center;
 }
@@ -170,7 +164,3 @@
   // }
     
 }
-
-::ng-deep.mat-mdc-menu-panel {
-  max-width: none !important;
-}

src/app/components/unified-file-card/unified-file-card.component.ts

@@ -9,7 +9,6 @@ import localeES from '@angular/common/locales/es';
 import localeDE from '@angular/common/locales/de';
 import localeZH from '@angular/common/locales/zh';
 import localeNB from '@angular/common/locales/nb';
-import { DatabaseFile } from 'api-types';
 
 registerLocaleData(localeGB);
 registerLocaleData(localeFR);
@@ -51,7 +50,6 @@ export class UnifiedFileCardComponent implements OnInit {
   @Input() jwtString = null;
   @Input() availablePlaylists = null;
   @Output() goToFile = new EventEmitter<any>();
-  @Output() toggleFavorite = new EventEmitter<DatabaseFile>();
   @Output() goToSubscription = new EventEmitter<any>();
   @Output() deleteFile = new EventEmitter<any>();
   @Output() addFileToPlaylist = new EventEmitter<any>();
@@ -160,10 +158,6 @@ export class UnifiedFileCardComponent implements OnInit {
     this.hide_image = false;
   }
 
-  emitToggleFavorite() {
-    this.toggleFavorite.emit(this.file_obj);
-  }
-
 }
 
 function fancyTimeFormat(time) {

src/app/create-playlist/create-playlist.component.html

@@ -1,3 +1,4 @@
+<div class="fixActionRow">
 <h4 mat-dialog-title *ngIf="create_mode" ><ng-container i18n="Create a playlist dialog title">Create a playlist</ng-container></h4>
 <h4 mat-dialog-title *ngIf="!create_mode"><ng-container i18n="Modify playlist dialog title">Modify playlist</ng-container></h4>
 
@@ -6,8 +7,7 @@
         <div *ngIf="create_mode || playlist">
             <div>
                 <mat-form-field color="accent">
-                    <mat-label i18n="Playlist name">Name</mat-label>
-                    <input [(ngModel)]="name" matInput type="text" required aria-required [ngModelOptions]="{standalone: true}">
+                    <input [(ngModel)]="name" matInput placeholder="Name" i18n-placeholder="Playlist name placeholder" type="text" required aria-required [ngModelOptions]="{standalone: true}">
                 </mat-form-field>
             </div>
             <app-recent-videos [selectMode]="true" [defaultSelected]="preselected_files" [customHeader]="'Select files'" (fileSelectionEmitter)="fileSelectionChanged($event)" [selectedIndex]="create_mode ? 1 : 0"></app-recent-videos>
@@ -18,11 +18,12 @@
 <div class="spacer"></div>
 
 <mat-dialog-actions>
-    <button *ngIf="create_mode" (click)="createPlaylist()" [disabled]="!name || !filesSelect.value || filesSelect.value.length === 0" color="primary" style="float: right" mat-button>
+    <button *ngIf="create_mode" (click)="createPlaylist()" [disabled]="!name || !filesSelect.value || filesSelect.value.length === 0" color="primary" style="float: right" mat-flat-button>
         <ng-container i18n="Create button">Create</ng-container>
     </button>
-    <button *ngIf="!create_mode" (click)="updatePlaylist()" [disabled]="!name || !playlistChanged()" color="primary" style="float: right" mat-button>
+    <button *ngIf="!create_mode" (click)="updatePlaylist()" [disabled]="!name || !playlistChanged()" color="primary" style="float: right" mat-flat-button>
         <ng-container i18n="Save button">Save</ng-container>
     </button>
     <div *ngIf="create_in_progress" style="margin-left: 10px"><mat-spinner [diameter]="25"></mat-spinner></div>
 </mat-dialog-actions>
+</div>

src/app/create-playlist/create-playlist.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { UntypedFormControl } from '@angular/forms';
+import { FormControl } from '@angular/forms';
 import { PostsService } from 'app/posts.services';
 import { Playlist } from 'api-types';
 
@@ -14,7 +14,7 @@ export class CreatePlaylistComponent implements OnInit {
 
   filesToSelectFrom = null;
   type = null;
-  filesSelect = new UntypedFormControl();
+  filesSelect = new FormControl();
   audiosToSelectFrom = null;
   videosToSelectFrom = null;
   name = '';

src/app/dialogs/about-dialog/about-dialog.component.html

@@ -38,8 +38,7 @@
         <mat-divider></mat-divider>
         <div style="margin-top: 10px;">
             <h5>Personal settings:</h5>
-            <mat-form-field>
-                <mat-label i18n="Sidepanel mode">Sidepanel mode</mat-label>
+            <mat-form-field placeholder="Sidepanel mode">
                 <mat-select [(ngModel)]="sidepanel_mode" (selectionChange)="sidePanelModeChanged($event.value)">
                     <mat-option value="over">
                         Over
@@ -50,8 +49,7 @@
                 </mat-select>
             </mat-form-field>
             <br/>
-            <mat-form-field>
-                <mat-label i18n="File card size">File card size</mat-label>
+            <mat-form-field placeholder="Card size">
                 <mat-select [(ngModel)]="card_size" (selectionChange)="cardSizeOptionChanged($event.value)">
                     <mat-option value="large">
                         Large

src/app/dialogs/about-dialog/about-dialog.component.scss

@@ -18,6 +18,6 @@ i {
 
 .logo-image {
     position: absolute;
-    top: 10px;
-    right: 10px;
+    top: -10px;
+    right: -10px;
 }