Downloads are now properly assigned a filename

- downloads are now treated as playlists for cleaner logic

.github/workflows/build.yml

@@ -1,95 +0,0 @@
-name: continuous integration
-
-on:
-  push:
-    branches: [master, feat/*]
-    tags:
-      - v*
-  pull_request:
-      branches: [master]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v2
-      - name: setup node
-        uses: actions/setup-node@v1
-      - name: install dependencies
-        run: |
-          npm install
-          cd backend
-          npm install
-          sudo npm install -g @angular/cli
-      - name: build
-        run: ng build --prod
-      - name: prepare artifact upload
-        shell: pwsh
-        run: |
-          New-Item -Name build -ItemType Directory
-          New-Item -Path build -Name youtubedl-material -ItemType Directory
-          Copy-Item -Path ./backend/appdata -Recurse -Destination ./build/youtubedl-material
-          Copy-Item -Path ./backend/audio -Recurse -Destination ./build/youtubedl-material
-          Copy-Item -Path ./backend/authentication -Recurse -Destination ./build/youtubedl-material
-          Copy-Item -Path ./backend/public -Recurse -Destination ./build/youtubedl-material
-          Copy-Item -Path ./backend/subscriptions -Recurse -Destination ./build/youtubedl-material
-          Copy-Item -Path ./backend/video -Recurse -Destination ./build/youtubedl-material
-          New-Item -Path ./build/youtubedl-material -Name users
-          Copy-Item -Path ./backend/*.js -Destination ./build/youtubedl-material
-          Copy-Item -Path ./backend/*.json -Destination ./build/youtubedl-material
-      - name: upload build artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: youtubedl-material
-          path: build
-  release:
-    runs-on: ubuntu-latest
-    needs: build
-    if: contains(github.ref, '/tags/v')
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v2
-      - name: create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: YoutubeDL-Material ${{ github.ref }}
-          body: |
-            # New features
-            # Minor additions
-            # Bug fixes
-          draft: true
-          prerelease: false
-      - name: download build artifact
-        uses: actions/download-artifact@v1
-        with:
-          name: youtubedl-material
-          path: ${{runner.temp}}/youtubedl-material
-      - name: extract tag name
-        id: tag_name
-        run: echo ::set-output name=tag_name::${GITHUB_REF#refs/tags/}
-      - name: prepare release asset
-        shell: pwsh
-        run: Compress-Archive -Path ${{runner.temp}}/youtubedl-material -DestinationPath youtubedl-material-${{ steps.tag_name.outputs.tag_name }}.zip
-      - name: upload release asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./youtubedl-material-${{ steps.tag_name.outputs.tag_name }}.zip
-          asset_name: youtubedl-material-${{ steps.tag_name.outputs.tag_name }}.zip
-          asset_content_type: application/zip
-      - name: upload docker-compose asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./docker-compose.yml
-          asset_name: docker-compose.yml
-          asset_content_type: text/plain

.github/workflows/codeql-analysis.yml

@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 12 * * 6'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows/docker-release.yml

@@ -1,32 +0,0 @@
-name: docker-release
-
-on:
-  workflow_dispatch:
-    inputs:
-      tags:
-        description: 'Docker tags'
-        required: true
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v2
-      - name: setup platform emulator
-        uses: docker/setup-qemu-action@v1
-      - name: setup multi-arch docker build
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build & push images
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64/v8
-          push: true
-          tags: ${{ github.event.inputs.tags }}

.github/workflows/docker.yml

@@ -1,29 +0,0 @@
-name: docker
-
-on:
-  push:
-    branches: [master]
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v2
-      - name: setup platform emulator
-        uses: docker/setup-qemu-action@v1
-      - name: setup multi-arch docker build
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build & push images
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64/v8
-          push: true
-          tags: tzahi12345/youtubedl-material:nightly

Public API v1.yaml

@@ -261,12 +261,12 @@ paths:
                 $ref: '#/components/schemas/inline_response_200_10'
       security:
         - Auth query parameter: []
-  /api/getSubscriptions:
+  /api/getAllSubscriptions:
     post:
       tags:
         - subscriptions
       summary: Get all subscriptions
-      operationId: post-api-getSubscriptions
+      operationId: post-api-getAllSubscriptions
       requestBody:
         content:
           application/json:

README.md

@@ -1,12 +1,12 @@
 # YoutubeDL-Material
+[![](https://img.shields.io/docker/pulls/tzahi12345/youtubedl-material.svg)](https://hub.docker.com/r/tzahi12345/youtubedl-material)
+[![](https://img.shields.io/docker/image-size/tzahi12345/youtubedl-material?sort=date)](https://hub.docker.com/r/tzahi12345/youtubedl-material)
+[![](https://img.shields.io/badge/%E2%86%91_Deploy_to-Heroku-7056bf.svg)](https://heroku.com/deploy?template=https://github.com/Tzahi12345/YoutubeDL-Material)
+[![](https://img.shields.io/github/issues/Tzahi12345/YoutubeDL-Material)](https://github.com/Tzahi12345/YoutubeDL-Material/issues)
+[![](https://img.shields.io/github/license/Tzahi12345/YoutubeDL-Material)](https://github.com/Tzahi12345/YoutubeDL-Material/blob/master/LICENSE.md)
 
-[![Docker pulls badge](https://img.shields.io/docker/pulls/tzahi12345/youtubedl-material.svg)](https://hub.docker.com/r/tzahi12345/youtubedl-material)
-[![Docker image size badge](https://img.shields.io/docker/image-size/tzahi12345/youtubedl-material?sort=date)](https://hub.docker.com/r/tzahi12345/youtubedl-material)
-[![Heroku deploy badge](https://img.shields.io/badge/%E2%86%91_Deploy_to-Heroku-7056bf.svg)](https://heroku.com/deploy?template=https://github.com/Tzahi12345/YoutubeDL-Material)
-[![GitHub issues badge](https://img.shields.io/github/issues/Tzahi12345/YoutubeDL-Material)](https://github.com/Tzahi12345/YoutubeDL-Material/issues)
-[![License badge](https://img.shields.io/github/license/Tzahi12345/YoutubeDL-Material)](https://github.com/Tzahi12345/YoutubeDL-Material/blob/master/LICENSE.md)
 
-YoutubeDL-Material is a Material Design frontend for [youtube-dl](https://rg3.github.io/youtube-dl/). It's coded using [Angular 11](https://angular.io/) for the frontend, and [Node.js](https://nodejs.org/) on the backend.
+YoutubeDL-Material is a Material Design frontend for [youtube-dl](https://rg3.github.io/youtube-dl/). It's coded using [Angular 9](https://angular.io/) for the frontend, and [Node.js](https://nodejs.org/) on the backend.
 
 Now with [Docker](#Docker) support!
 
@@ -16,35 +16,27 @@ Check out the prerequisites, and go to the installation section. Easy as pie!
 
 Here's an image of what it'll look like once you're done:
 
-<img src="https://i.imgur.com/C6vFGbL.png" width="800">
+![frontpage](https://i.imgur.com/w8iofbb.png)
+
+With optional file management enabled (default):
+
+![frontpage_with_files](https://i.imgur.com/FTATqBM.png)
 
 Dark mode:
 
-<img src="https://i.imgur.com/vOtvH5w.png" width="800">
+![dark_mode](https://i.imgur.com/r5ZtBqd.png)
 
 ### Prerequisites
 
 NOTE: If you would like to use Docker, you can skip down to the [Docker](#Docker) section for a setup guide.
 
-Debian/Ubuntu:
+Make sure you have these dependencies installed on your system: nodejs and youtube-dl. If you don't, run this command:
 
-```bash
-sudo apt-get install nodejs youtube-dl ffmpeg
 ```
-
-CentOS 7:
-
-```bash
-sudo yum install epel-release
-sudo yum localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm
-sudo yum install centos-release-scl-rh
-sudo yum install rh-nodejs12
-scl enable rh-nodejs12 bash
-sudo yum install nodejs youtube-dl ffmpeg ffmpeg-devel
+sudo apt-get install nodejs youtube-dl
 ```
 
 Optional dependencies:
-
 * AtomicParsley (for embedding thumbnails, package name `atomicparsley`)
 
 ### Installing
@@ -83,16 +75,14 @@ If you are looking to setup YoutubeDL-Material with Docker, this section is for
 
 1. Run `curl -L https://github.com/Tzahi12345/YoutubeDL-Material/releases/latest/download/docker-compose.yml -o docker-compose.yml` to download the latest Docker Compose, or go to the [releases](https://github.com/Tzahi12345/YoutubeDL-Material/releases/) page to grab the version you'd like.
 2. Run `docker-compose pull`. This will download the official YoutubeDL-Material docker image.
-3. Run `docker-compose up` to start it up. If successful, it should say "HTTP(S): Started on port 17443" or something similar. This tells you the *container-internal* port of the application. Please check your `docker-compose.yml` file for the *external* port. If you downloaded the file as described above, it defaults to **8998**.
-4. Make sure you can connect to the specified URL + *external* port, and if so, you are done!
-
-NOTE: It is currently recommended that you use the `nightly` tag on Docker. To do so, simply update the docker-compose.yml `image` field so that it points to `tzahi12345/youtubedl-material:nightly`.
+3. Run `docker-compose up` to start it up. If successful, it should say "HTTP(S): Started on port 8998" or something similar.
+4. Make sure you can connect to the specified URL + port, and if so, you are done!
 
 ### Custom UID/GID
 
 By default, the Docker container runs as non-root with UID=1000 and GID=1000. To set this to your own UID/GID, simply update the `environment` section in your `docker-compose.yml` like so:
 
-```yml
+```
 environment:
     UID: YOUR_UID
     GID: YOUR_GID
@@ -119,10 +109,8 @@ If you're interested in translating the app into a new language, check out the [
 * **Isaac Grynsztein** (me!) - *Initial work*
 
 Official translators:
-
 * Spanish - tzahi12345
 * German - UnlimitedCookies
-* Chinese - TyRoyal
 
 See also the list of [contributors](https://github.com/your/project/contributors) who participated in this project.
 

angular.json

@@ -45,6 +45,8 @@
               ],
               "optimization": true,
               "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,

backend/appdata/default.json

@@ -7,7 +7,6 @@
     "Downloader": {
       "path-audio": "audio/",
       "path-video": "video/",
-      "default_file_output": "",
       "use_youtubedl_archive": false,
       "custom_args": "",
       "safe_download_override": false,
@@ -20,17 +19,13 @@
       "allow_quality_select": true,
       "download_only_mode": false,
       "allow_multi_download_mode": true,
-      "enable_downloads_manager": true,
-      "allow_playlist_categorization": true
+      "enable_downloads_manager": true
     },
     "API": {
       "use_API_key": false,
       "API_key": "",
       "use_youtube_API": false,
-      "youtube_API_key": "",
-      "use_twitch_API": false,
-      "twitch_API_key": "",
-      "twitch_auto_download_chat": false
+      "youtube_API_key": ""
     },
     "Themes": {
       "default_theme": "default",
@@ -39,8 +34,7 @@
     "Subscriptions": {
       "allow_subscriptions": true,
       "subscriptions_base_path": "subscriptions/",
-      "subscriptions_check_interval": "300",
-      "redownload_fresh_uploads": false
+      "subscriptions_check_interval": "300"
     },
     "Users": {
       "base_path": "users/",
@@ -55,7 +49,6 @@
       }
     },
     "Advanced": {
-      "default_downloader": "youtube-dl",
       "use_default_downloading_agent": true,
       "custom_downloading_agent": "",
       "multi_user_mode": false,

backend/authentication/auth.js

@@ -15,16 +15,15 @@ var JwtStrategy = require('passport-jwt').Strategy,
 
 // other required vars
 let logger = null;
-let db =  null;
-let users_db = null;
+var users_db = null;
 let SERVER_SECRET = null;
 let JWT_EXPIRATION = null;
 let opts = null;
 let saltRounds = null;
 
-exports.initialize = function(input_db, input_users_db, input_logger) {
+exports.initialize = function(input_users_db, input_logger) {
   setLogger(input_logger)
-  setDB(input_db, input_users_db);
+  setDB(input_users_db);
 
   /*************************
    * Authentication module
@@ -62,8 +61,7 @@ function setLogger(input_logger) {
   logger = input_logger;
 }
 
-function setDB(input_db, input_users_db) {
-  db = input_db;
+function setDB(input_users_db) {
   users_db = input_users_db;
 }
 
@@ -91,12 +89,6 @@ exports.registerUser = function(req, res) {
     return;
   }
 
-  if (plaintextPassword === "") {
-    res.sendStatus(400);
-    logger.error(`Registration failed for user ${userid}. A password must be provided.`);
-    return;
-  }
-
   bcrypt.hash(plaintextPassword, saltRounds)
     .then(function(hash) {
       let new_user = generateUserObject(userid, username, hash);
@@ -147,12 +139,12 @@ exports.registerUser = function(req, res) {
 exports.passport.use(new LocalStrategy({
     usernameField: 'username',
     passwordField: 'password'},
-    async function(username, password, done) {
+    function(username, password, done) {
         const user = users_db.get('users').find({name: username}).value();
         if (!user) { logger.error(`User ${username} not found`); return done(null, false); }
         if (user.auth_method && user.auth_method !== 'internal') { return done(null, false); }
         if (user) {
-            return done(null, (await bcrypt.compare(password, user.passhash)) ? user : false);
+            return done(null, bcrypt.compareSync(password, user.passhash) ? user : false);
         }
     }
 ));
@@ -168,7 +160,7 @@ exports.passport.use(new LdapStrategy(getLDAPConfiguration,
     // check if ldap auth is enabled
     const ldap_enabled = config_api.getConfigItem('ytdl_auth_method') === 'ldap';
     if (!ldap_enabled) return done(null, false);
-
+    
     const user_uid = user.uid;
     let db_user = users_db.get('users').find({uid: user_uid}).value();
     if (!db_user) {
@@ -234,13 +226,15 @@ exports.ensureAuthenticatedElseError = function(req, res, next) {
 
 // change password
 exports.changeUserPassword = async function(user_uid, new_pass) {
-  try {
-    const hash = await bcrypt.hash(new_pass, saltRounds);
-    users_db.get('users').find({uid: user_uid}).assign({passhash: hash}).write();
-    return true;
-  } catch (err) {
-    return false;
-  }
+  return new Promise(resolve => {
+    bcrypt.hash(new_pass, saltRounds)
+    .then(function(hash) {
+      users_db.get('users').find({uid: user_uid}).assign({passhash: hash}).write();
+      resolve(true);
+    }).catch(err => {
+      resolve(false);
+    });
+  });
 }
 
 // change user permissions
@@ -285,70 +279,60 @@ exports.adminExists = function() {
 
 exports.getUserVideos = function(user_uid, type) {
     const user = users_db.get('users').find({uid: user_uid}).value();
-    return type ? user['files'].filter(file => file.isAudio === (type === 'audio')) : user['files'];
+    return user['files'][type];
 }
 
-exports.getUserVideo = function(user_uid, file_uid, requireSharing = false) {
-  let file = users_db.get('users').find({uid: user_uid}).get(`files`).find({uid: file_uid}).value();
+exports.getUserVideo = function(user_uid, file_uid, type, requireSharing = false) {
+  if (!type) {
+    file = users_db.get('users').find({uid: user_uid}).get(`files.audio`).find({uid: file_uid}).value();
+    if (!file) {
+        file = users_db.get('users').find({uid: user_uid}).get(`files.video`).find({uid: file_uid}).value();
+        if (file) type = 'video';
+    } else {
+        type = 'audio';
+    }
+  }
+
+  if (!file && type) file = users_db.get('users').find({uid: user_uid}).get(`files.${type}`).find({uid: file_uid}).value();
 
   // prevent unauthorized users from accessing the file info
-  if (file && !file['sharingEnabled'] && requireSharing) file = null;
+  if (requireSharing && !file['sharingEnabled']) file = null;
 
   return file;
 }
 
-exports.addPlaylist = function(user_uid, new_playlist) {
-  users_db.get('users').find({uid: user_uid}).get(`playlists`).push(new_playlist).write();
+exports.addPlaylist = function(user_uid, new_playlist, type) {
+  users_db.get('users').find({uid: user_uid}).get(`playlists.${type}`).push(new_playlist).write();
   return true;
 }
 
-exports.updatePlaylistFiles = function(user_uid, playlistID, new_filenames) {
-  users_db.get('users').find({uid: user_uid}).get(`playlists`).find({id: playlistID}).assign({fileNames: new_filenames});
+exports.updatePlaylistFiles = function(user_uid, playlistID, new_filenames, type) {
+  users_db.get('users').find({uid: user_uid}).get(`playlists.${type}`).find({id: playlistID}).assign({fileNames: new_filenames});
   return true;
 }
 
-exports.removePlaylist = function(user_uid, playlistID) {
-  users_db.get('users').find({uid: user_uid}).get(`playlists`).remove({id: playlistID}).write();
+exports.removePlaylist = function(user_uid, playlistID, type) {
+  users_db.get('users').find({uid: user_uid}).get(`playlists.${type}`).remove({id: playlistID}).write();
   return true;
 }
 
-exports.getUserPlaylists = function(user_uid, user_files = null) {
+exports.getUserPlaylists = function(user_uid, type) {
   const user = users_db.get('users').find({uid: user_uid}).value();
-  const playlists = JSON.parse(JSON.stringify(user['playlists']));
-  const categories = db.get('categories').value();
-  if (categories && user_files) {
-      categories.forEach(category => {
-          const audio_files = user_files && user_files.filter(file => file.category && file.category.uid === category.uid && file.isAudio);
-          const video_files = user_files && user_files.filter(file => file.category && file.category.uid === category.uid && !file.isAudio);
-          if (audio_files && audio_files.length > 0) {
-              playlists.push({
-                  name: category['name'],
-                  thumbnailURL: audio_files[0].thumbnailURL,
-                  thumbnailPath: audio_files[0].thumbnailPath,
-                  fileNames: audio_files.map(file => file.id),
-                  type: 'audio',
-                  uid: user_uid,
-                  auto: true
-              });
-          }
-          if (video_files && video_files.length > 0) {
-              playlists.push({
-                  name: category['name'],
-                  thumbnailURL: video_files[0].thumbnailURL,
-                  thumbnailPath: video_files[0].thumbnailPath,
-                  fileNames: video_files.map(file => file.id),
-                  type: 'video',
-                  uid: user_uid,
-                  auto: true
-              });
-          }
-      });
-  }
-  return playlists;
+  return user['playlists'][type];
 }
 
-exports.getUserPlaylist = function(user_uid, playlistID, requireSharing = false) {
-  let playlist = users_db.get('users').find({uid: user_uid}).get(`playlists`).find({id: playlistID}).value();
+exports.getUserPlaylist = function(user_uid, playlistID, type, requireSharing = false) {
+  let playlist = null;
+  if (!type) {
+    playlist = users_db.get('users').find({uid: user_uid}).get(`playlists.audio`).find({id: playlistID}).value();
+    if (!playlist) {
+      playlist = users_db.get('users').find({uid: user_uid}).get(`playlists.video`).find({id: playlistID}).value();
+      if (playlist) type = 'video';
+    } else {
+        type = 'audio';
+    }
+  }
+  if (!playlist) playlist = users_db.get('users').find({uid: user_uid}).get(`playlists.${type}`).find({id: playlistID}).value();
 
   // prevent unauthorized users from accessing the file info
   if (requireSharing && !playlist['sharingEnabled']) playlist = null;
@@ -356,22 +340,21 @@ exports.getUserPlaylist = function(user_uid, playlistID, requireSharing = false)
   return playlist;
 }
 
-exports.registerUserFile = function(user_uid, file_object) {
-  users_db.get('users').find({uid: user_uid}).get(`files`)
+exports.registerUserFile = function(user_uid, file_object, type) {
+  users_db.get('users').find({uid: user_uid}).get(`files.${type}`)
     .remove({
         path: file_object['path']
     }).write();
 
-  users_db.get('users').find({uid: user_uid}).get(`files`)
+  users_db.get('users').find({uid: user_uid}).get(`files.${type}`)
       .push(file_object)
       .write();
 }
 
-exports.deleteUserFile = async function(user_uid, file_uid, blacklistMode = false) {
+exports.deleteUserFile = function(user_uid, file_uid, type, blacklistMode = false) {
   let success = false;
-  const file_obj = users_db.get('users').find({uid: user_uid}).get(`files`).find({uid: file_uid}).value();
+  const file_obj = users_db.get('users').find({uid: user_uid}).get(`files.${type}`).find({uid: file_uid}).value();
   if (file_obj) {
-    const type = file_obj.isAudio ? 'audio' : 'video';
     const usersFileFolder = config_api.getConfigItem('ytdl_users_base_path');
     const ext = type === 'audio' ? '.mp3' : '.mp4';
 
@@ -387,24 +370,24 @@ exports.deleteUserFile = async function(user_uid, file_uid, blacklistMode = fals
     }
 
     const full_path = path.join(usersFileFolder, user_uid, type, file_obj.id + ext);
-    users_db.get('users').find({uid: user_uid}).get(`files`)
+    users_db.get('users').find({uid: user_uid}).get(`files.${type}`)
       .remove({
           uid: file_uid
       }).write();
-    if (await fs.pathExists(full_path)) {
+    if (fs.existsSync(full_path)) {
       // remove json and file
       const json_path = path.join(usersFileFolder, user_uid, type, file_obj.id + '.info.json');
       const alternate_json_path = path.join(usersFileFolder, user_uid, type, file_obj.id + ext + '.info.json');
       let youtube_id = null;
-      if (await fs.pathExists(json_path)) {
-        youtube_id = await fs.readJSON(json_path).id;
-        await fs.unlink(json_path);
-      } else if (await fs.pathExists(alternate_json_path)) {
-        youtube_id = await fs.readJSON(alternate_json_path).id;
-        await fs.unlink(alternate_json_path);
+      if (fs.existsSync(json_path)) {
+        youtube_id = fs.readJSONSync(json_path).id;
+        fs.unlinkSync(json_path);
+      } else if (fs.existsSync(alternate_json_path)) {
+        youtube_id = fs.readJSONSync(alternate_json_path).id;
+        fs.unlinkSync(alternate_json_path);
       }
 
-      await fs.unlink(full_path);
+      fs.unlinkSync(full_path);
 
       // do archive stuff
 
@@ -413,17 +396,17 @@ exports.deleteUserFile = async function(user_uid, file_uid, blacklistMode = fals
           const archive_path = path.join(usersFileFolder, user_uid, 'archives', `archive_${type}.txt`);
 
           // use subscriptions API to remove video from the archive file, and write it to the blacklist
-          if (await fs.pathExists(archive_path)) {
-              const line = youtube_id ? await subscriptions_api.removeIDFromArchive(archive_path, youtube_id) : null;
+          if (fs.existsSync(archive_path)) {
+              const line = youtube_id ? subscriptions_api.removeIDFromArchive(archive_path, youtube_id) : null;
               if (blacklistMode && line) {
                 let blacklistPath = path.join(usersFileFolder, user_uid, 'archives', `blacklist_${type}.txt`);
                 // adds newline to the beginning of the line
                 line = '\n' + line;
-                await fs.appendFile(blacklistPath, line);
+                fs.appendFileSync(blacklistPath, line);
               }
           } else {
               logger.info(`Could not find archive file for ${type} files. Creating...`);
-              await fs.ensureFile(archive_path);
+              fs.ensureFileSync(archive_path);
           }
       }
     }
@@ -436,11 +419,11 @@ exports.deleteUserFile = async function(user_uid, file_uid, blacklistMode = fals
   return success;
 }
 
-exports.changeSharingMode = function(user_uid, file_uid, is_playlist, enabled) {
+exports.changeSharingMode = function(user_uid, file_uid, type, is_playlist, enabled) {
   let success = false;
   const user_db_obj = users_db.get('users').find({uid: user_uid});
   if (user_db_obj.value()) {
-    const file_db_obj = is_playlist ? user_db_obj.get(`playlists`).find({id: file_uid}) : user_db_obj.get(`files`).find({uid: file_uid});
+    const file_db_obj = is_playlist ? user_db_obj.get(`playlists.${type}`).find({id: file_uid}) : user_db_obj.get(`files.${type}`).find({uid: file_uid});
     if (file_db_obj.value()) {
       success = true;
       file_db_obj.assign({sharingEnabled: enabled}).write();
@@ -536,14 +519,20 @@ function generateUserObject(userid, username, hash, auth_method = 'internal') {
     name: username,
     uid: userid,
     passhash: auth_method === 'internal' ? hash : null,
-    files: [],
-    playlists: [],
+    files: {
+      audio: [],
+      video: []
+    },
+    playlists: {
+      audio: [],
+      video: []
+    },
     subscriptions: [],
     created: Date.now(),
     role: userid === 'admin' && auth_method === 'internal' ? 'admin' : 'user',
     permissions: [],
     permission_overrides: [],
-    auth_method: auth_method
+    auth_method: auth_method 
   };
   return new_user;
 }

backend/categories.js

@@ -1,129 +0,0 @@
-const config_api = require('./config');
-
-var logger = null;
-var db = null;
-var users_db = null;
-var db_api = null;
-
-function setDB(input_db, input_users_db, input_db_api) { db = input_db; users_db = input_users_db; db_api = input_db_api }
-function setLogger(input_logger) { logger = input_logger; }
-
-function initialize(input_db, input_users_db, input_logger, input_db_api) {
-    setDB(input_db, input_users_db, input_db_api);
-    setLogger(input_logger);
-}
-
-/*
-
-Categories:
-
-    Categories are a way to organize videos based on dynamic rules set by the user. Categories are universal (so not per-user).
-    
-    Categories, besides rules, have an optional custom output. This custom output can help users create their
-        desired directory structure.
-
-Rules:
-    A category rule consists of a property, a comparison, and a value. For example, "uploader includes 'VEVO'"
-
-    Rules are stored as an object with the above fields. In addition to those fields, it also has a preceding_operator, which
-        is either OR or AND, and signifies whether the rule should be ANDed with the previous rules, or just ORed. For the first
-        rule, this field is null.
-
-    Ex. (title includes 'Rihanna' OR title includes 'Beyonce' AND uploader includes 'VEVO')
-
-*/
-
-async function categorize(file_jsons) {
-    // to make the logic easier, let's assume the file metadata is an array
-    if (!Array.isArray(file_jsons)) file_jsons = [file_jsons];
-
-    let selected_category = null;
-    const categories = getCategories();
-    if (!categories) {
-        logger.warn('Categories could not be found. Initializing categories...');
-        db.assign({categories: []}).write();
-        return null;
-    }
-
-    for (let i = 0; i < file_jsons.length; i++) {
-        const file_json = file_jsons[i];
-        for (let j = 0; j < categories.length; j++) {
-            const category = categories[i];
-            const rules = category['rules'];
-    
-            // if rules for current category apply, then that is the selected category
-            if (applyCategoryRules(file_json, rules, category['name'])) {
-                selected_category = category;
-                logger.verbose(`Selected category ${category['name']} for ${file_json['webpage_url']}`);
-                return selected_category;
-            }
-        }
-    }
-    
-    return selected_category;
-}
-
-function getCategories() {
-    const categories = db.get('categories').value();
-    return categories ? categories : null;
-}
-
-function applyCategoryRules(file_json, rules, category_name) {
-    let rules_apply = false;
-    for (let i = 0; i < rules.length; i++) {
-        const rule = rules[i];
-        let rule_applies = null;
-
-        let preceding_operator = rule['preceding_operator'];
-
-        switch (rule['comparator']) {
-            case 'includes':
-                rule_applies = file_json[rule['property']].includes(rule['value']);
-                break;
-            case 'not_includes':
-                rule_applies = !(file_json[rule['property']].includes(rule['value']));
-                break;
-            case 'equals':
-                rule_applies = file_json[rule['property']] === rule['value'];
-                break;
-            case 'not_equals':
-                rule_applies = file_json[rule['property']] !== rule['value'];
-                break;
-            default:
-                logger.warn(`Invalid comparison used for category ${category_name}`)
-                break;
-        }
-
-        // OR the first rule with rules_apply, which will be initially false
-        if (i === 0) preceding_operator = 'or';
-
-        // update rules_apply based on current rule
-        if (preceding_operator === 'or')
-            rules_apply = rules_apply || rule_applies;
-        else
-            rules_apply = rules_apply && rule_applies;
-    }
-
-    return rules_apply;
-}
-
-async function addTagToVideo(tag, video, user_uid) {
-    // TODO: Implement
-}
-
-async function removeTagFromVideo(tag, video, user_uid) {
-    // TODO: Implement
-}
-
-// adds tag to list of existing tags (used for tag suggestions)
-async function addTagToExistingTags(tag) {
-    const existing_tags = db.get('tags').value();
-    if (!existing_tags.includes(tag)) {
-        db.get('tags').push(tag).write();
-    }
-}
-
-module.exports = {
-    initialize: initialize,
-    categorize: categorize,
-}

backend/config.js

@@ -184,7 +184,6 @@ DEFAULT_CONFIG = {
       "Downloader": {
         "path-audio": "audio/",
         "path-video": "video/",
-        "default_file_output": "",
         "use_youtubedl_archive": false,
         "custom_args": "",
         "safe_download_override": false,
@@ -197,17 +196,13 @@ DEFAULT_CONFIG = {
         "allow_quality_select": true,
         "download_only_mode": false,
         "allow_multi_download_mode": true,
-        "enable_downloads_manager": true,
-        "allow_playlist_categorization": true
+        "enable_downloads_manager": true
       },
       "API": {
         "use_API_key": false,
         "API_key": "",
         "use_youtube_API": false,
-        "youtube_API_key": "",
-        "use_twitch_API": false,
-        "twitch_API_key": "",
-        "twitch_auto_download_chat": false
+        "youtube_API_key": ""
       },
       "Themes": {
         "default_theme": "default",
@@ -216,8 +211,7 @@ DEFAULT_CONFIG = {
       "Subscriptions": {
         "allow_subscriptions": true,
         "subscriptions_base_path": "subscriptions/",
-        "subscriptions_check_interval": "300",
-        "redownload_fresh_uploads": false
+        "subscriptions_check_interval": "300"
       },
       "Users": {
         "base_path": "users/",
@@ -232,7 +226,6 @@ DEFAULT_CONFIG = {
         }
       },
       "Advanced": {
-        "default_downloader": "youtube-dl",
         "use_default_downloading_agent": true,
         "custom_downloading_agent": "",
         "multi_user_mode": false,

backend/consts.js

@@ -18,10 +18,6 @@ let CONFIG_ITEMS = {
         'key': 'ytdl_video_folder_path',
         'path': 'YoutubeDLMaterial.Downloader.path-video'
     },
-    'ytdl_default_file_output': {
-        'key': 'ytdl_default_file_output',
-        'path': 'YoutubeDLMaterial.Downloader.default_file_output'
-    },
     'ytdl_use_youtubedl_archive': {
         'key': 'ytdl_use_youtubedl_archive',
         'path': 'YoutubeDLMaterial.Downloader.use_youtubedl_archive'
@@ -68,10 +64,6 @@ let CONFIG_ITEMS = {
         'key': 'ytdl_enable_downloads_manager',
         'path': 'YoutubeDLMaterial.Extra.enable_downloads_manager'
     },
-    'ytdl_allow_playlist_categorization': {
-        'key': 'ytdl_allow_playlist_categorization',
-        'path': 'YoutubeDLMaterial.Extra.allow_playlist_categorization'
-    },
 
     // API
     'ytdl_use_api_key': {
@@ -90,18 +82,6 @@ let CONFIG_ITEMS = {
         'key': 'ytdl_youtube_api_key',
         'path': 'YoutubeDLMaterial.API.youtube_API_key'
     },
-    'ytdl_use_twitch_api': {
-        'key': 'ytdl_use_twitch_api',
-        'path': 'YoutubeDLMaterial.API.use_twitch_API'
-    },
-    'ytdl_twitch_api_key': {
-        'key': 'ytdl_twitch_api_key',
-        'path': 'YoutubeDLMaterial.API.twitch_API_key'
-    },
-    'ytdl_twitch_auto_download_chat': {
-        'key': 'ytdl_twitch_auto_download_chat',
-        'path': 'YoutubeDLMaterial.API.twitch_auto_download_chat'
-    },
 
     // Themes
     'ytdl_default_theme': {
@@ -130,10 +110,6 @@ let CONFIG_ITEMS = {
         'key': 'ytdl_subscriptions_check_interval',
         'path': 'YoutubeDLMaterial.Subscriptions.subscriptions_check_interval'
     },
-    'ytdl_subscriptions_redownload_fresh_uploads': {
-        'key': 'ytdl_subscriptions_redownload_fresh_uploads',
-        'path': 'YoutubeDLMaterial.Subscriptions.redownload_fresh_uploads'
-    },
 
     // Users
     'ytdl_users_base_path': {
@@ -154,10 +130,6 @@ let CONFIG_ITEMS = {
     },
 
     // Advanced
-    'ytdl_default_downloader': {
-        'key': 'ytdl_default_downloader',
-        'path': 'YoutubeDLMaterial.Advanced.default_downloader'
-    },
     'ytdl_use_default_downloading_agent': {
         'key': 'ytdl_use_default_downloading_agent',
         'path': 'YoutubeDLMaterial.Advanced.use_default_downloading_agent'
@@ -200,5 +172,5 @@ AVAILABLE_PERMISSIONS = [
 module.exports = {
     CONFIG_ITEMS: CONFIG_ITEMS,
     AVAILABLE_PERMISSIONS: AVAILABLE_PERMISSIONS,
-    CURRENT_VERSION: 'v4.2'
+    CURRENT_VERSION: 'v4.1'
 }

backend/db.js

@@ -15,10 +15,10 @@ function initialize(input_db, input_users_db, input_logger) {
     setLogger(input_logger);
 }
 
-function registerFileDB(file_path, type, multiUserMode = null, sub = null, customPath = null, category = null) {
+function registerFileDB(file_path, type, multiUserMode = null, sub = null) {
     let db_path = null;
-    const file_id = utils.removeFileExtension(file_path);
-    const file_object = generateFileObject(file_id, type, customPath || multiUserMode && multiUserMode.file_path, sub);
+    const file_id = file_path.substring(0, file_path.length-4);
+    const file_object = generateFileObject(file_id, type, multiUserMode && multiUserMode.file_path, sub);
     if (!file_object) {
         logger.error(`Could not find associated JSON file for ${type} file ${file_id}`);
         return false;
@@ -27,17 +27,14 @@ function registerFileDB(file_path, type, multiUserMode = null, sub = null, custo
     utils.fixVideoMetadataPerms(file_id, type, multiUserMode && multiUserMode.file_path);
 
     // add thumbnail path
-    file_object['thumbnailPath'] = utils.getDownloadedThumbnail(file_id, type, customPath || multiUserMode && multiUserMode.file_path);
-
-    // if category exists, only include essential info
-    if (category) file_object['category'] = {name: category['name'], uid: category['uid']};
+    file_object['thumbnailPath'] = utils.getDownloadedThumbnail(file_id, type, multiUserMode && multiUserMode.file_path);
 
     if (!sub) {
         if (multiUserMode) {
             const user_uid = multiUserMode.user;
-            db_path = users_db.get('users').find({uid: user_uid}).get(`files`);
+            db_path = users_db.get('users').find({uid: user_uid}).get(`files.${type}`);
         } else {
-            db_path = db.get(`files`);
+            db_path = db.get(`files.${type}`)
         }
     } else {
         if (multiUserMode) {
@@ -97,18 +94,18 @@ function generateFileObject(id, type, customPath = null, sub = null) {
     var thumbnail = jsonobj.thumbnail;
     var duration = jsonobj.duration;
     var isaudio = type === 'audio';
-    var description = jsonobj.description;
-    var file_obj = new utils.File(id, title, thumbnail, isaudio, duration, url, uploader, size, file_path, upload_date, description, jsonobj.view_count, jsonobj.height, jsonobj.abr);
+    var file_obj = new utils.File(id, title, thumbnail, isaudio, duration, url, uploader, size, file_path, upload_date);
     return file_obj;
 }
 
 function updatePlaylist(playlist, user_uid) {
     let playlistID = playlist.id;
+    let type = playlist.type;
     let db_loc = null;
     if (user_uid) {
-        db_loc = users_db.get('users').find({uid: user_uid}).get(`playlists`).find({id: playlistID});
+        db_loc = users_db.get('users').find({uid: user_uid}).get(`playlists.${type}`).find({id: playlistID});
     } else {
-        db_loc = db.get(`playlists`).find({id: playlistID});
+        db_loc = db.get(`playlists.${type}`).find({id: playlistID});
     }
     db_loc.assign(playlist).write();
     return true;
@@ -118,7 +115,7 @@ function getAppendedBasePathSub(sub, base_path) {
     return path.join(base_path, (sub.isPlaylist ? 'playlists/' : 'channels/'), sub.name);
 }
 
-function getFileDirectoriesAndDBs() {
+async function importUnregisteredFiles() {
     let dirs_to_check = [];
     let subscriptions_to_check = [];
     const subscriptions_base_path = config_api.getConfigItem('ytdl_subscriptions_base_path'); // only for single-user mode
@@ -135,14 +132,14 @@ function getFileDirectoriesAndDBs() {
             // add user's audio dir to check list
             dirs_to_check.push({
                 basePath: path.join(usersFileFolder, user.uid, 'audio'),
-                dbPath: users_db.get('users').find({uid: user.uid}).get('files'),
+                dbPath: users_db.get('users').find({uid: user.uid}).get('files.audio'),
                 type: 'audio'
             });
 
             // add user's video dir to check list
             dirs_to_check.push({
                 basePath: path.join(usersFileFolder, user.uid, 'video'),
-                dbPath: users_db.get('users').find({uid: user.uid}).get('files'),
+                dbPath: users_db.get('users').find({uid: user.uid}).get('files.video'),
                 type: 'video'
             });
         }
@@ -156,14 +153,14 @@ function getFileDirectoriesAndDBs() {
         // add audio dir to check list
         dirs_to_check.push({
             basePath: audioFolderPath,
-            dbPath: db.get('files'),
+            dbPath: db.get('files.audio'),
             type: 'audio'
         });
 
         // add video dir to check list
         dirs_to_check.push({
             basePath: videoFolderPath,
-            dbPath: db.get('files'),
+            dbPath: db.get('files.video'),
             type: 'video'
         });
     }
@@ -184,16 +181,10 @@ function getFileDirectoriesAndDBs() {
         });
     }
 
-    return dirs_to_check;
-}
-
-async function importUnregisteredFiles() {
-    const dirs_to_check = getFileDirectoriesAndDBs();
-
     // run through check list and check each file to see if it's missing from the db
-    for (const dir_to_check of dirs_to_check) {
+    dirs_to_check.forEach(dir_to_check => {
         // recursively get all files in dir's path
-        const files = await utils.getDownloadedFilesByType(dir_to_check.basePath, dir_to_check.type);
+        const files = utils.getDownloadedFilesByType(dir_to_check.basePath, dir_to_check.type);
 
         files.forEach(file => {
             // check if file exists in db, if not add it
@@ -204,32 +195,13 @@ async function importUnregisteredFiles() {
                 logger.verbose(`Added discovered file to the database: ${file.id}`);
             }
         });
-    }
+    });
 
 }
 
-async function getVideo(file_uid, uuid, sub_id) {
-    const base_db_path = uuid ? users_db.get('users').find({uid: uuid}) : db;
-    const sub_db_path = sub_id ? base_db_path.get('subscriptions').find({id: sub_id}).get('videos') : base_db_path.get('files');
-    return sub_db_path.find({uid: file_uid}).value();
-}
-
-async function setVideoProperty(file_uid, assignment_obj, uuid, sub_id) {
-    const base_db_path = uuid ? users_db.get('users').find({uid: uuid}) : db;
-    const sub_db_path = sub_id ? base_db_path.get('subscriptions').find({id: sub_id}).get('videos') : base_db_path.get('files');
-    const file_db_path = sub_db_path.find({uid: file_uid});
-    if (!(file_db_path.value())) {
-        logger.error(`Failed to find file with uid ${file_uid}`);
-    }
-    sub_db_path.find({uid: file_uid}).assign(assignment_obj).write();
-}
-
 module.exports = {
     initialize: initialize,
     registerFileDB: registerFileDB,
     updatePlaylist: updatePlaylist,
-    getFileDirectoriesAndDBs: getFileDirectoriesAndDBs,
-    importUnregisteredFiles: importUnregisteredFiles,
-    getVideo: getVideo,
-    setVideoProperty: setVideoProperty
+    importUnregisteredFiles: importUnregisteredFiles
 }

backend/package-lock.json

@@ -252,14 +252,6 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
       "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
     },
-    "axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-      "requires": {
-        "follow-redirects": "^1.10.0"
-      }
-    },
     "backoff": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
@@ -1080,11 +1072,6 @@
         }
       }
     },
-    "follow-redirects": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
-      "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
-    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -1863,9 +1850,10 @@
       }
     },
     "moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==",
+      "optional": true
     },
     "ms": {
       "version": "2.0.0",

backend/package.json

@@ -30,7 +30,6 @@
   "dependencies": {
     "archiver": "^3.1.1",
     "async": "^3.1.0",
-    "axios": "^0.21.1",
     "bcryptjs": "^2.4.0",
     "compression": "^1.7.4",
     "config": "^3.2.3",
@@ -43,7 +42,6 @@
     "lowdb": "^1.0.0",
     "md5": "^2.2.1",
     "merge-files": "^0.1.2",
-    "moment": "^2.29.1",
     "multer": "^1.4.2",
     "node-fetch": "^2.6.1",
     "node-id3": "^0.1.14",

backend/subscriptions.js

@@ -6,8 +6,7 @@ var path = require('path');
 
 var youtubedl = require('youtube-dl');
 const config_api = require('./config');
-const twitch_api = require('./twitch');
-var utils = require('./utils');
+var utils = require('./utils')
 
 const debugMode = process.env.YTDL_MODE === 'debug';
 
@@ -80,18 +79,17 @@ async function getSubscriptionInfo(sub, user_uid = null) {
     else
         basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
 
-    // get videos
-    let downloadConfig = ['--dump-json', '--playlist-end', '1'];
-    let useCookies = config_api.getConfigItem('ytdl_use_cookies');
-    if (useCookies) {
-        if (await fs.pathExists(path.join(__dirname, 'appdata', 'cookies.txt'))) {
-            downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt'));
-        } else {
-            logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.');
-        }
-    }
-
     return new Promise(resolve => {
+        // get videos
+        let downloadConfig = ['--dump-json', '--playlist-end', '1'];
+        let useCookies = config_api.getConfigItem('ytdl_use_cookies');
+        if (useCookies) {
+            if (fs.existsSync(path.join(__dirname, 'appdata', 'cookies.txt'))) {
+                downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt'));
+            } else {
+                logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.');
+            }
+        }
         youtubedl.exec(sub.url, downloadConfig, {}, function(err, output) {
             if (debugMode) {
                 logger.info('Subscribe: got info for subscription ' + sub.id);
@@ -115,11 +113,7 @@ async function getSubscriptionInfo(sub, user_uid = null) {
                         continue;
                     }
                     if (!sub.name) {
-                        if (sub.isPlaylist) {
-                            sub.name = output_json.playlist_title ? output_json.playlist_title : output_json.playlist;
-                        } else {
-                            sub.name = output_json.uploader;
-                        }
+                        sub.name = sub.isPlaylist ? output_json.playlist_title : output_json.uploader;
                         // if it's now valid, update
                         if (sub.name) {
                             if (user_uid)
@@ -158,36 +152,39 @@ async function getSubscriptionInfo(sub, user_uid = null) {
 }
 
 async function unsubscribe(sub, deleteMode, user_uid = null) {
-    let basePath = null;
-    if (user_uid)
-        basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions');
-    else
-        basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
-    let result_obj = { success: false, error: '' };
+    return new Promise(async resolve => {
+        let basePath = null;
+        if (user_uid)
+            basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions');
+        else
+            basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
+        let result_obj = { success: false, error: '' };
 
-    let id = sub.id;
-    if (user_uid)
-        users_db.get('users').find({uid: user_uid}).get('subscriptions').remove({id: id}).write();
-    else
-        db.get('subscriptions').remove({id: id}).write();
+        let id = sub.id;
+        if (user_uid)
+            users_db.get('users').find({uid: user_uid}).get('subscriptions').remove({id: id}).write();
+        else
+            db.get('subscriptions').remove({id: id}).write();
 
-    // failed subs have no name, on unsubscribe they shouldn't error
-    if (!sub.name) {
-        return;
-    }
-
-    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
-            if (await fs.pathExists(archive_file_path)) {
-                await fs.unlink(archive_file_path);
-            }
-            await fs.rmdir(sub.archive);
+        // failed subs have no name, on unsubscribe they shouldn't error
+        if (!sub.name) {
+            return;
         }
-        await fs.remove(appendedBasePath);
-    }
+
+        const appendedBasePath = getAppendedBasePath(sub, basePath);
+        if (deleteMode && fs.existsSync(appendedBasePath)) {
+            if (sub.archive && fs.existsSync(sub.archive)) {
+                const archive_file_path = path.join(sub.archive, 'archive.txt');
+                // deletes archive if it exists
+                if (fs.existsSync(archive_file_path)) {
+                    fs.unlinkSync(archive_file_path);
+                }
+                fs.rmdirSync(sub.archive);
+            }
+            deleteFolderRecursive(appendedBasePath);
+        }
+    });
+
 }
 
 async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null, user_uid = null) {
@@ -205,98 +202,159 @@ async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null,
     const name = file;
     let retrievedID = null;
     sub_db.get('videos').remove({uid: file_uid}).write();
+    return new Promise(resolve => {
+        let filePath = appendedBasePath;
+        const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4'
+        var jsonPath = path.join(__dirname,filePath,name+'.info.json');
+        var videoFilePath = path.join(__dirname,filePath,name+ext);
+        var imageFilePath = path.join(__dirname,filePath,name+'.jpg');
+        var altImageFilePath = path.join(__dirname,filePath,name+'.jpg');
 
-    let filePath = appendedBasePath;
-    const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4'
-    var jsonPath = path.join(__dirname,filePath,name+'.info.json');
-    var videoFilePath = path.join(__dirname,filePath,name+ext);
-    var imageFilePath = path.join(__dirname,filePath,name+'.jpg');
-    var altImageFilePath = path.join(__dirname,filePath,name+'.webp');
+        jsonExists = fs.existsSync(jsonPath);
+        videoFileExists = fs.existsSync(videoFilePath);
+        imageFileExists = fs.existsSync(imageFilePath);
+        altImageFileExists = fs.existsSync(altImageFilePath);
 
-    const [jsonExists, videoFileExists, imageFileExists, altImageFileExists] = await Promise.all([
-        fs.pathExists(jsonPath),
-        fs.pathExists(videoFilePath),
-        fs.pathExists(imageFilePath),
-        fs.pathExists(altImageFilePath),
-    ]);
-
-    if (jsonExists) {
-        retrievedID = JSON.parse(await fs.readFile(jsonPath, 'utf8'))['id'];
-        await fs.unlink(jsonPath);
-    }
-
-    if (imageFileExists) {
-        await fs.unlink(imageFilePath);
-    }
-
-    if (altImageFileExists) {
-        await fs.unlink(altImageFilePath);
-    }
-
-    if (videoFileExists) {
-        await fs.unlink(videoFilePath);
-        if ((await fs.pathExists(jsonPath)) || (await fs.pathExists(videoFilePath))) {
-            return false;
-        } else {
-            // check if the user wants the video to be redownloaded (deleteForever === false)
-            if (!deleteForever && useArchive && sub.archive && retrievedID) {
-                const archive_path = path.join(sub.archive, 'archive.txt')
-                // if archive exists, remove line with video ID
-                if (await fs.pathExists(archive_path)) {
-                    await removeIDFromArchive(archive_path, retrievedID);
-                }
-            }
-            return true;
+        if (jsonExists) {
+            retrievedID = JSON.parse(fs.readFileSync(jsonPath, 'utf8'))['id'];
+            fs.unlinkSync(jsonPath);
         }
-    } else {
-        // TODO: tell user that the file didn't exist
-        return true;
-    }
+
+        if (imageFileExists) {
+            fs.unlinkSync(imageFilePath);
+        }
+
+        if (altImageFileExists) {
+            fs.unlinkSync(altImageFilePath);
+        }
+
+        if (videoFileExists) {
+            fs.unlink(videoFilePath, function(err) {
+                if (fs.existsSync(jsonPath) || fs.existsSync(videoFilePath)) {
+                    resolve(false);
+                } else {
+                    // check if the user wants the video to be redownloaded (deleteForever === false)
+                    if (!deleteForever && useArchive && sub.archive && retrievedID) {
+                        const archive_path = path.join(sub.archive, 'archive.txt')
+                        // if archive exists, remove line with video ID
+                        if (fs.existsSync(archive_path)) {
+                            removeIDFromArchive(archive_path, retrievedID);
+                        }
+                    }
+                    resolve(true);
+                }
+            });
+        } else {
+            // TODO: tell user that the file didn't exist
+            resolve(true);
+        }
+
+    });
 }
 
 async function getVideosForSub(sub, user_uid = null) {
-    // get sub_db
-    let sub_db = null;
-    if (user_uid)
-        sub_db = users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id});
-    else
-        sub_db = db.get('subscriptions').find({id: sub.id});
-
-    const latest_sub_obj = sub_db.value();
-    if (!latest_sub_obj || latest_sub_obj['downloading']) {
-        return false;
-    }
-
-    updateSubscriptionProperty(sub, {downloading: true}, user_uid);
-
-    // get basePath
-    let basePath = null;
-    if (user_uid)
-        basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions');
-    else
-        basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
-
-    let appendedBasePath = getAppendedBasePath(sub, basePath);
-
-    let multiUserMode = null;
-    if (user_uid) {
-        multiUserMode = {
-            user: user_uid,
-            file_path: appendedBasePath
-        }
-    }
-
-    const downloadConfig = await generateArgsForSubscription(sub, user_uid);
-
-    // get videos
-    logger.verbose('Subscription: getting videos for subscription ' + sub.name);
-
     return new Promise(resolve => {
-        youtubedl.exec(sub.url, downloadConfig, {}, async function(err, output) {
-            updateSubscriptionProperty(sub, {downloading: false}, user_uid);
+        if (!subExists(sub.id, user_uid)) {
+            resolve(false);
+            return;
+        }
+
+        // get sub_db
+        let sub_db = null;
+        if (user_uid)
+            sub_db = users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id});
+        else
+            sub_db = db.get('subscriptions').find({id: sub.id});
+
+        // get basePath
+        let basePath = null;
+        if (user_uid)
+            basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions');
+        else
+            basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
+
+        const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
+
+        let appendedBasePath = null
+        appendedBasePath = getAppendedBasePath(sub, basePath);
+
+        let multiUserMode = null;
+        if (user_uid) {
+            multiUserMode = {
+                user: user_uid,
+                file_path: appendedBasePath
+            }
+        }
+
+        const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4'
+
+        let fullOutput = appendedBasePath + '/%(title)s' + ext;
+        if (sub.custom_output) {
+            fullOutput = appendedBasePath + '/' + sub.custom_output + ext;
+        }
+
+        let downloadConfig = ['-o', fullOutput, '-ciw', '--write-info-json', '--print-json'];
+
+        let qualityPath = null;
+        if (sub.type && sub.type === 'audio') {
+            qualityPath = ['-f', 'bestaudio']
+            qualityPath.push('-x');
+            qualityPath.push('--audio-format', 'mp3');
+        } else {
+            qualityPath = ['-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4']
+        }
+
+        downloadConfig.push(...qualityPath)
+
+        if (sub.custom_args) {
+            customArgsArray = sub.custom_args.split(',,');
+            if (customArgsArray.indexOf('-f') !== -1) {
+                // if custom args has a custom quality, replce the original quality with that of custom args
+                const original_output_index = downloadConfig.indexOf('-f');
+                downloadConfig.splice(original_output_index, 2);
+            }
+            downloadConfig.push(...customArgsArray);
+        }
+
+        let archive_dir = null;
+        let archive_path = null;
+
+        if (useArchive) {
+            if (sub.archive) {
+                archive_dir = sub.archive;
+                archive_path = path.join(archive_dir, 'archive.txt')
+            }
+            downloadConfig.push('--download-archive', archive_path);
+        }
+
+        // if streaming only mode, just get the list of videos
+        if (sub.streamingOnly) {
+            downloadConfig = ['-f', 'best', '--dump-json'];
+        }
+
+        if (sub.timerange) {
+            downloadConfig.push('--dateafter', sub.timerange);
+        }
+
+        let useCookies = config_api.getConfigItem('ytdl_use_cookies');
+        if (useCookies) {
+            if (fs.existsSync(path.join(__dirname, 'appdata', 'cookies.txt'))) {
+                downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt'));
+            } else {
+                logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.');
+            }
+        }
+
+        if (config_api.getConfigItem('ytdl_include_thumbnail')) {
+            downloadConfig.push('--write-thumbnail');
+        }
+
+        // get videos
+        logger.verbose('Subscription: getting videos for subscription ' + sub.name);
+        youtubedl.exec(sub.url, downloadConfig, {}, function(err, output) {
             logger.verbose('Subscription: finished check for ' + sub.name);
             if (err && !output) {
-                logger.error(err.stderr ? err.stderr : err.message);
+                logger.error(err.stderr);
                 if (err.stderr.includes('This video is unavailable')) {
                     logger.info('An error was encountered with at least one video, backup method will be used.')
                     try {
@@ -306,11 +364,7 @@ async function getVideosForSub(sub, user_uid = null) {
                             handleOutputJSON(sub, sub_db, output, i === 0, multiUserMode)
                             if (err.stderr.includes(output['id']) && archive_path) {
                                 // we found a video that errored! add it to the archive to prevent future errors
-                                if (sub.archive) {
-                                    archive_dir = sub.archive;
-                                    archive_path = path.join(archive_dir, 'archive.txt')
-                                    fs.appendFileSync(archive_path, output['id']);
-                                }
+                                fs.appendFileSync(archive_path, output['id']);
                             }
                         }
                     } catch(e) {
@@ -323,7 +377,6 @@ async function getVideosForSub(sub, user_uid = null) {
                 if (output.length === 0 || (output.length === 1 && output[0] === '')) {
                     logger.verbose('No additional videos to download for ' + sub.name);
                     resolve(true);
-                    return;
                 }
                 for (let i = 0; i < output.length; i++) {
                     let output_json = null;
@@ -338,101 +391,18 @@ async function getVideosForSub(sub, user_uid = null) {
 
                     const reset_videos = i === 0;
                     handleOutputJSON(sub, sub_db, output_json, multiUserMode, reset_videos);
-                }
 
-                if (config_api.getConfigItem('ytdl_subscriptions_redownload_fresh_uploads')) {
-                    await setFreshUploads(sub, user_uid);
-                    checkVideosForFreshUploads(sub, user_uid);
-                }
+                    // TODO: Potentially store downloaded files in db?
 
+                }
                 resolve(true);
             }
         });
     }, err => {
         logger.error(err);
-        updateSubscriptionProperty(sub, {downloading: false}, user_uid);
     });
 }
 
-async function generateArgsForSubscription(sub, user_uid, redownload = false, desired_path = null) {
-    // get basePath
-    let basePath = null;
-    if (user_uid)
-        basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions');
-    else
-        basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
-
-    const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
-
-    let appendedBasePath = getAppendedBasePath(sub, basePath);
-
-    let fullOutput = `${appendedBasePath}/%(title)s.%(ext)s`;
-    if (desired_path) {
-        fullOutput = `${desired_path}.%(ext)s`;
-    } else if (sub.custom_output) {
-        fullOutput = `${appendedBasePath}/${sub.custom_output}.%(ext)s`;
-    }
-
-    let downloadConfig = ['-o', fullOutput, !redownload ? '-ciw' : '-ci', '--write-info-json', '--print-json'];
-
-    let qualityPath = null;
-    if (sub.type && sub.type === 'audio') {
-        qualityPath = ['-f', 'bestaudio']
-        qualityPath.push('-x');
-        qualityPath.push('--audio-format', 'mp3');
-    } else {
-        if (!sub.maxQuality || sub.maxQuality === 'best') qualityPath = ['-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4'];
-        else qualityPath = ['-f', `bestvideo[height<=${sub.maxQuality}]+bestaudio/best[height<=${sub.maxQuality}]`, '--merge-output-format', 'mp4'];
-    }
-
-    downloadConfig.push(...qualityPath)
-
-    if (sub.custom_args) {
-        customArgsArray = sub.custom_args.split(',,');
-        if (customArgsArray.indexOf('-f') !== -1) {
-            // if custom args has a custom quality, replce the original quality with that of custom args
-            const original_output_index = downloadConfig.indexOf('-f');
-            downloadConfig.splice(original_output_index, 2);
-        }
-        downloadConfig.push(...customArgsArray);
-    }
-
-    let archive_dir = null;
-    let archive_path = null;
-
-    if (useArchive && !redownload) {
-        if (sub.archive) {
-            archive_dir = sub.archive;
-            archive_path = path.join(archive_dir, 'archive.txt')
-        }
-        downloadConfig.push('--download-archive', archive_path);
-    }
-
-    // if streaming only mode, just get the list of videos
-    if (sub.streamingOnly) {
-        downloadConfig = ['-f', 'best', '--dump-json'];
-    }
-
-    if (sub.timerange && !redownload) {
-        downloadConfig.push('--dateafter', sub.timerange);
-    }
-
-    let useCookies = config_api.getConfigItem('ytdl_use_cookies');
-    if (useCookies) {
-        if (await fs.pathExists(path.join(__dirname, 'appdata', 'cookies.txt'))) {
-            downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt'));
-        } else {
-            logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.');
-        }
-    }
-
-    if (config_api.getConfigItem('ytdl_include_thumbnail')) {
-        downloadConfig.push('--write-thumbnail');
-    }
-
-    return downloadConfig;
-}
-
 function handleOutputJSON(sub, sub_db, output_json, multiUserMode = null, reset_videos = false) {
     if (sub.streamingOnly) {
         if (reset_videos) {
@@ -445,49 +415,17 @@ function handleOutputJSON(sub, sub_db, output_json, multiUserMode = null, reset_
         // add to db
         sub_db.get('videos').push(output_json).write();
     } else {
-        path_object = path.parse(output_json['_filename']);
-        const path_string = path.format(path_object);
-
-        if (sub_db.get('videos').find({path: path_string}).value()) {
-            // file already exists in DB, return early to avoid reseting the download date
-            return;
-        }
-
         db_api.registerFileDB(path.basename(output_json['_filename']), sub.type, multiUserMode, sub);
-        const url = output_json['webpage_url'];
-        if (sub.type === 'video' && url.includes('twitch.tv/videos/') && url.split('twitch.tv/videos/').length > 1
-            && config_api.getConfigItem('ytdl_use_twitch_api') && config_api.getConfigItem('ytdl_twitch_auto_download_chat')) {
-                const file_name = path.basename(output_json['_filename']);
-                const id = file_name.substring(0, file_name.length-4);
-                let vodId = url.split('twitch.tv/videos/')[1];
-                vodId = vodId.split('?')[0];
-                twitch_api.downloadTwitchChatByVODID(vodId, id, sub.type, multiUserMode.user, sub);
-        }
     }
 }
 
-function getSubscriptions(user_uid = null) {
+function getAllSubscriptions(user_uid = null) {
     if (user_uid)
         return users_db.get('users').find({uid: user_uid}).get('subscriptions').value();
     else
         return db.get('subscriptions').value();
 }
 
-function getAllSubscriptions() {
-    let subscriptions = null;
-    const multiUserMode = config_api.getConfigItem('ytdl_multi_user_mode');
-    if (multiUserMode) {
-        subscriptions = [];
-        let users = users_db.get('users').value();
-        for (let i = 0; i < users.length; i++) {
-            if (users[i]['subscriptions']) subscriptions = subscriptions.concat(users[i]['subscriptions']);
-        }
-    } else {
-        subscriptions = getSubscriptions();
-    }
-    return subscriptions;
-}
-
 function getSubscription(subID, user_uid = null) {
     if (user_uid)
         return users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: subID}).value();
@@ -495,13 +433,6 @@ function getSubscription(subID, user_uid = null) {
         return db.get('subscriptions').find({id: subID}).value();
 }
 
-function getSubscriptionByName(subName, user_uid = null) {
-    if (user_uid)
-        return users_db.get('users').find({uid: user_uid}).get('subscriptions').find({name: subName}).value();
-    else
-        return db.get('subscriptions').find({name: subName}).value();
-}
-
 function updateSubscription(sub, user_uid = null) {
     if (user_uid) {
         users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id}).assign(sub).write();
@@ -511,21 +442,6 @@ function updateSubscription(sub, user_uid = null) {
     return true;
 }
 
-function updateSubscriptionPropertyMultiple(subs, assignment_obj) {
-    subs.forEach(sub => {
-        updateSubscriptionProperty(sub, assignment_obj, sub.user_uid);
-    });
-}
-
-function updateSubscriptionProperty(sub, assignment_obj, user_uid = null) {
-    if (user_uid) {
-        users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id}).assign(assignment_obj).write();
-    } else {
-        db.get('subscriptions').find({id: sub.id}).assign(assignment_obj).write();
-    }
-    return true;
-}
-
 function subExists(subID, user_uid = null) {
     if (user_uid)
         return !!users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: subID}).value();
@@ -533,52 +449,6 @@ function subExists(subID, user_uid = null) {
         return !!db.get('subscriptions').find({id: subID}).value();
 }
 
-async function setFreshUploads(sub, user_uid) {
-    const current_date = new Date().toISOString().split('T')[0].replace(/-/g, '');
-    sub.videos.forEach(async video => {
-        if (current_date === video['upload_date'].replace(/-/g, '')) {
-            // set upload as fresh
-            const video_uid = video['uid'];
-            await db_api.setVideoProperty(video_uid, {'fresh_upload': true}, user_uid, sub['id']);
-        }
-    });
-}
-
-async function checkVideosForFreshUploads(sub, user_uid) {
-    const current_date = new Date().toISOString().split('T')[0].replace(/-/g, '');
-    sub.videos.forEach(async video => {
-        if (video['fresh_upload'] && current_date > video['upload_date'].replace(/-/g, '')) {
-            checkVideoIfBetterExists(video, sub, user_uid)
-        }
-    });
-}
-
-async function checkVideoIfBetterExists(file_obj, sub, user_uid) {
-    const new_path = file_obj['path'].substring(0, file_obj['path'].length - 4);
-    const downloadConfig = await generateArgsForSubscription(sub, user_uid, true, new_path);
-    logger.verbose(`Checking if a better version of the fresh upload ${file_obj['id']} exists.`);
-    // simulate a download to verify that a better version exists
-    youtubedl.getInfo(file_obj['url'], downloadConfig, (err, output) => {
-        if (err) {
-            // video is not available anymore for whatever reason
-        } else if (output) {
-            const metric_to_compare = sub.type === 'audio' ? 'abr' : 'height';
-            if (output[metric_to_compare] > file_obj[metric_to_compare]) {
-                // download new video as the simulated one is better
-                youtubedl.exec(file_obj['url'], downloadConfig, async (err, output) => {
-                    if (err) {
-                        logger.verbose(`Failed to download better version of video ${file_obj['id']}`);
-                    } else if (output) {
-                        logger.verbose(`Successfully upgraded video ${file_obj['id']}'s ${metric_to_compare} from ${file_obj[metric_to_compare]} to ${output[metric_to_compare]}`);
-                        await db_api.setVideoProperty(file_obj['uid'], {[metric_to_compare]: output[metric_to_compare]}, user_uid, sub['id']);
-                    }
-                });
-            } 
-        }
-    });
-    await db_api.setVideoProperty(file_obj['uid'], {'fresh_upload': false}, user_uid, sub['id']);
-}
-
 // helper functions
 
 function getAppendedBasePath(sub, base_path) {
@@ -586,8 +456,23 @@ function getAppendedBasePath(sub, base_path) {
     return path.join(base_path, (sub.isPlaylist ? 'playlists/' : 'channels/'), sub.name);
 }
 
-async function removeIDFromArchive(archive_path, id) {
-    let data = await fs.readFile(archive_path, {encoding: 'utf-8'});
+// https://stackoverflow.com/a/32197381/8088021
+const deleteFolderRecursive = function(folder_to_delete) {
+    if (fs.existsSync(folder_to_delete)) {
+      fs.readdirSync(folder_to_delete).forEach((file, index) => {
+        const curPath = path.join(folder_to_delete, file);
+        if (fs.lstatSync(curPath).isDirectory()) { // recurse
+          deleteFolderRecursive(curPath);
+        } else { // delete file
+          fs.unlinkSync(curPath);
+        }
+      });
+      fs.rmdirSync(folder_to_delete);
+    }
+  };
+
+function removeIDFromArchive(archive_path, id) {
+    let data = fs.readFileSync(archive_path, {encoding: 'utf-8'});
     if (!data) {
         logger.error('Archive could not be found.');
         return;
@@ -608,15 +493,13 @@ async function removeIDFromArchive(archive_path, id) {
 
     // UPDATE FILE WITH NEW DATA
     const updatedData = dataArray.join('\n');
-    await fs.writeFile(archive_path, updatedData);
+    fs.writeFileSync(archive_path, updatedData);
     if (line) return line;
     if (err) throw err;
 }
 
 module.exports = {
     getSubscription        : getSubscription,
-    getSubscriptionByName  : getSubscriptionByName,
-    getSubscriptions       : getSubscriptions,
     getAllSubscriptions    : getAllSubscriptions,
     updateSubscription     : updateSubscription,
     subscribe              : subscribe,
@@ -625,6 +508,5 @@ module.exports = {
     getVideosForSub        : getVideosForSub,
     removeIDFromArchive    : removeIDFromArchive,
     setLogger              : setLogger,
-    initialize             : initialize,
-    updateSubscriptionPropertyMultiple : updateSubscriptionPropertyMultiple
+    initialize             : initialize
 }

backend/twitch.js

@@ -1,128 +0,0 @@
-var moment = require('moment');
-var Axios = require('axios');
-var fs = require('fs-extra')
-var path = require('path');
-const config_api = require('./config');
-
-async function getCommentsForVOD(clientID, vodId) {
-    let url = `https://api.twitch.tv/v5/videos/${vodId}/comments?content_offset_seconds=0`,
-        batch,
-        cursor;
-
-    let comments = null;
-
-    try {
-        do {
-            batch = (await Axios.get(url, {
-                headers: {
-                    'Client-ID': clientID,
-                    Accept: 'application/vnd.twitchtv.v5+json; charset=UTF-8',
-                    'Content-Type': 'application/json; charset=UTF-8',
-                }
-            })).data;
-
-            const str = batch.comments.map(c => {
-                let {
-                        created_at: msgCreated,
-                        content_offset_seconds: timestamp,
-                        commenter: {
-                            name,
-                            _id,
-                            created_at: acctCreated
-                        },
-                        message: {
-                            body: msg,
-                            user_color: user_color
-                        }
-                    } = c;
-
-                const timestamp_str = moment.duration(timestamp, 'seconds')
-                    .toISOString()
-                    .replace(/P.*?T(?:(\d+?)H)?(?:(\d+?)M)?(?:(\d+).*?S)?/,
-                        (_, ...ms) => {
-                            const seg = v => v ? v.padStart(2, '0') : '00';
-                            return `${seg(ms[0])}:${seg(ms[1])}:${seg(ms[2])}`;
-                        });
-
-                acctCreated = moment(acctCreated).utc();
-                msgCreated = moment(msgCreated).utc();
-
-                if (!comments) comments = [];
-
-                comments.push({
-                    timestamp: timestamp,
-                    timestamp_str: timestamp_str,
-                    name: name,
-                    message: msg,
-                    user_color: user_color
-                });
-                // let line = `${timestamp},${msgCreated.format(tsFormat)},${name},${_id},"${msg.replace(/"/g, '""')}",${acctCreated.format(tsFormat)}`;
-                // return line;
-            }).join('\n');
-
-            cursor = batch._next;
-            url = `https://api.twitch.tv/v5/videos/${vodId}/comments?cursor=${cursor}`;
-            await new Promise(res => setTimeout(res, 300));
-        } while (cursor);
-    } catch (err) {
-        console.error(err);
-    }
-
-    return comments;
-}
-
-async function getTwitchChatByFileID(id, type, user_uid, uuid, sub) {
-    let file_path = null;
-
-    if (user_uid) {
-        if (sub) {
-            file_path = path.join('users', user_uid, 'subscriptions', sub.isPlaylist ? 'playlists' : 'channels', sub.name, id + '.twitch_chat.json');
-        } else {
-            file_path = path.join('users', user_uid, type, id + '.twitch_chat.json');
-        }
-    } else {
-        if (sub) {
-            file_path = path.join('subscriptions', sub.isPlaylist ? 'playlists' : 'channels', sub.name, id + '.twitch_chat.json');
-        } else {
-            file_path = path.join(type, id + '.twitch_chat.json');
-        }
-    }
-
-    var chat_file = null;
-    if (fs.existsSync(file_path)) {
-        chat_file = fs.readJSONSync(file_path);
-    }
-
-    return chat_file;
-}
-
-async function downloadTwitchChatByVODID(vodId, id, type, user_uid, sub) {
-    const twitch_api_key = config_api.getConfigItem('ytdl_twitch_api_key');
-    const chat = await getCommentsForVOD(twitch_api_key, vodId);
-
-    // save file if needed params are included
-    let file_path = null;
-    if (user_uid) {
-        if (sub) {
-            file_path = path.join('users', user_uid, 'subscriptions', sub.isPlaylist ? 'playlists' : 'channels', sub.name, id + '.twitch_chat.json');
-        } else {
-            file_path = path.join('users', user_uid, type, id + '.twitch_chat.json');
-        }
-    } else {
-        if (sub) {
-            file_path = path.join('subscriptions', sub.isPlaylist ? 'playlists' : 'channels', sub.name, id + '.twitch_chat.json');
-        } else {
-            file_path = path.join(type, id + '.twitch_chat.json');
-        }
-    }
-
-    if (chat) fs.writeJSONSync(file_path, chat);
-
-    return chat;
-}
-
-module.exports = {
-    getCommentsForVOD: getCommentsForVOD,
-    getTwitchChatByFileID: getTwitchChatByFileID,
-    downloadTwitchChatByVODID: downloadTwitchChatByVODID
-}

backend/utils.js

@@ -4,7 +4,6 @@ const config_api = require('./config');
 
 const is_windows = process.platform === 'win32';
 
-// replaces .webm with appropriate extension
 function getTrueFileName(unfixed_path, type) {
     let fixed_path = unfixed_path;
 
@@ -20,33 +19,34 @@ function getTrueFileName(unfixed_path, type) {
     return fixed_path;
 }
 
-async function getDownloadedFilesByType(basePath, type, full_metadata = false) {
+function getDownloadedFilesByType(basePath, type) {
     // return empty array if the path doesn't exist
-    if (!(await fs.pathExists(basePath))) return [];
+    if (!fs.existsSync(basePath)) return [];
 
     let files = [];
     const ext = type === 'audio' ? 'mp3' : 'mp4';
-    var located_files = await recFindByExt(basePath, ext);
+    var located_files = recFindByExt(basePath, ext);
     for (let i = 0; i < located_files.length; i++) {
         let file = located_files[i];
         var file_path = file.substring(basePath.includes('\\') ? basePath.length+1 : basePath.length, file.length);
 
-        var stats = await fs.stat(file);
+        var stats = fs.statSync(file);
 
         var id = file_path.substring(0, file_path.length-4);
-        var jsonobj = await getJSONByType(type, id, basePath);
+        var jsonobj = getJSONByType(type, id, basePath);
         if (!jsonobj) continue;
-        if (full_metadata) {
-            jsonobj['id'] = id;
-            files.push(jsonobj);
-            continue;
-        }
+        var title = jsonobj.title;
+        var url = jsonobj.webpage_url;
+        var uploader = jsonobj.uploader;
         var upload_date = jsonobj.upload_date;
         upload_date = upload_date ? `${upload_date.substring(0, 4)}-${upload_date.substring(4, 6)}-${upload_date.substring(6, 8)}` : null;
+        var thumbnail = jsonobj.thumbnail;
+        var duration = jsonobj.duration;
+
+        var size = stats.size;
 
         var isaudio = type === 'audio';
-        var file_obj = new File(id, jsonobj.title, jsonobj.thumbnail, isaudio, jsonobj.duration, jsonobj.webpage_url, jsonobj.uploader,
-                                stats.size, file, upload_date, jsonobj.description, jsonobj.view_count, jsonobj.height, jsonobj.abr);
+        var file_obj = new File(id, title, thumbnail, isaudio, duration, url, uploader, size, file, upload_date);
         files.push(file_obj);
     }
     return files;
@@ -110,6 +110,7 @@ function getExpectedFileSize(input_info_jsons) {
     const info_jsons = Array.isArray(input_info_jsons) ? input_info_jsons : [input_info_jsons];
 
     let expected_filesize = 0;
+
     info_jsons.forEach(info_json => {
         if (info_json['filesize']) {
             expected_filesize += info_json['filesize'];
@@ -136,7 +137,7 @@ function fixVideoMetadataPerms(name, type, customPath = null) {
                                                    : config_api.getConfigItem('ytdl_video_folder_path');
 
     const ext = type === 'audio' ? '.mp3' : '.mp4';
-
+    
     const files_to_fix = [
         // JSONs
         path.join(customPath, name + '.info.json'),
@@ -165,37 +166,33 @@ function deleteJSONFile(name, type, customPath = null) {
 }
 
 
-async function recFindByExt(base,ext,files,result)
+function recFindByExt(base,ext,files,result)
 {
-    files = files || (await fs.readdir(base))
+    files = files || fs.readdirSync(base)
     result = result || []
 
-    for (const file of files) {
-        var newbase = path.join(base,file)
-        if ( (await fs.stat(newbase)).isDirectory() )
-        {
-            result = await recFindByExt(newbase,ext,await fs.readdir(newbase),result)
-        }
-        else
-        {
-            if ( file.substr(-1*(ext.length+1)) == '.' + ext )
+    files.forEach(
+        function (file) {
+            var newbase = path.join(base,file)
+            if ( fs.statSync(newbase).isDirectory() )
             {
-                result.push(newbase)
+                result = recFindByExt(newbase,ext,fs.readdirSync(newbase),result)
+            }
+            else
+            {
+                if ( file.substr(-1*(ext.length+1)) == '.' + ext )
+                {
+                    result.push(newbase)
+                }
             }
         }
-    }
+    )
     return result
 }
 
-function removeFileExtension(filename) {
-    const filename_parts = filename.split('.');
-    filename_parts.splice(filename_parts.length - 1);
-    return filename_parts.join('.');
-}
-
 // objects
 
-function File(id, title, thumbnailURL, isAudio, duration, url, uploader, size, path, upload_date, description, view_count, height, abr) {
+function File(id, title, thumbnailURL, isAudio, duration, url, uploader, size, path, upload_date) {
     this.id = id;
     this.title = title;
     this.thumbnailURL = thumbnailURL;
@@ -206,10 +203,6 @@ function File(id, title, thumbnailURL, isAudio, duration, url, uploader, size, p
     this.size = size;
     this.path = path;
     this.upload_date = upload_date;
-    this.description = description;
-    this.view_count = view_count;
-    this.height = height;
-    this.abr = abr;
 }
 
 module.exports = {
@@ -222,6 +215,5 @@ module.exports = {
     deleteJSONFile: deleteJSONFile,
     getDownloadedFilesByType: getDownloadedFilesByType,
     recFindByExt: recFindByExt,
-    removeFileExtension: removeFileExtension,
     File: File
 }

chrome-extension/background.js

@@ -0,0 +1,20 @@
+// background.js
+
+// Called when the user clicks on the browser action.
+chrome.browserAction.onClicked.addListener(function(tab) {
+    // get the frontend_url
+    chrome.storage.sync.get({
+        frontend_url: 'http://localhost',
+        audio_only: false
+    }, function(items) {
+        chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
+            var activeTab = tabs[0];
+            var url = activeTab.url;
+            if (url.includes('youtube.com')) {
+                var new_url = items.frontend_url + '/#/home;url=' + encodeURIComponent(url) + ';audioOnly=' + items.audio_only;
+              chrome.tabs.create({ url: new_url });
+            }
+        });
+    });
+    
+});

chrome-extension/manifest.json

@@ -1,17 +1,17 @@
 {
     "manifest_version": 2,
     "name": "YoutubeDL-Material",
-    "version": "0.4",
+    "version": "0.3",
     "description": "The Official Firefox & Chrome Extension of YoutubeDL-Material, an open-source and self-hosted YouTube downloader.",
+    "background": {
+        "scripts": ["background.js"]
+    },
     "browser_action": {
-        "default_icon": "favicon.png",
-        "default_popup": "popup.html",
-        "default_title": "YoutubeDL-Material"
+        "default_icon": "favicon.png"
     },
     "permissions": [
         "tabs",
-        "storage",
-        "contextMenus"
+        "storage"
     ],
     "options_ui": {
         "page": "options.html",

chrome-extension/popup.html

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <!-- Scripts -->
-    <script src="js/jquery-3.4.1.min.js"></script>
-    <script src="js/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-    
-    <!-- Cascading Style Sheets -->
-    <link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
-</head>
-<body>
-
-<div style="width: 400px; margin: 0 auto;">
-    <div style="margin: 10px;">
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" id="audio_only">
-                Audio only
-            </label>
-        </div>
-
-        <div class="input-group mb-3">
-            <input id="url_input" type="text" class="form-control" placeholder="URL" aria-label="URL" aria-describedby="basic-addon2">
-            <div class="input-group-append">
-            <button class="btn btn-outline-secondary" type="button" id="download">Download</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script src="popup.js"></script>
-
-</body>
-</html>

chrome-extension/popup.js

@@ -1,50 +0,0 @@
-function audioOnlyClicked() {
-    console.log('audio only clicked');
-    var audio_only = document.getElementById("audio_only").checked;
-
-    // save state
-
-    chrome.storage.sync.set({
-        audio_only: audio_only
-    }, function() {});
-}
-
-function downloadVideo() {
-    var input_url = document.getElementById("url_input").value
-    // get the frontend_url
-    chrome.storage.sync.get({
-        frontend_url: 'http://localhost',
-        audio_only: false
-    }, function(items) {
-        var download_url = items.frontend_url + '/#/home;url=' + encodeURIComponent(input_url) + ';audioOnly=' + items.audio_only;
-        chrome.tabs.create({ url: download_url });
-    });
-}
-
-function loadInputs() {
-    // load audio-only input
-    chrome.storage.sync.get({
-        frontend_url: 'http://localhost',
-        audio_only: false
-    }, function(items) {
-        document.getElementById("audio_only").checked = items.audio_only;
-    });
-    
-    // load url input
-    chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
-        var activeTab = tabs[0];
-        var current_url = activeTab.url;
-        console.log(current_url);
-        if (current_url && current_url.includes('youtube.com')) {
-            document.getElementById("url_input").value = current_url;
-        }
-    });
-}
-
-document.getElementById('download').addEventListener('click',
-      downloadVideo);
-
-document.getElementById('audio_only').addEventListener('click',
-      audioOnlyClicked);
-
-document.addEventListener('DOMContentLoaded', loadInputs);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "youtube-dl-material",
-  "version": "4.2.0",
+  "version": "4.1.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -18,20 +18,19 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/core": "^11.0.4",
-    "@angular/animations": "^11.0.4",
-    "@angular/cdk": "^11.0.2",
-    "@angular/common": "^11.0.4",
-    "@angular/compiler": "^11.0.4",
-    "@angular/core": "^11.0.4",
-    "@angular/forms": "^11.0.4",
-    "@angular/localize": "^11.0.4",
-    "@angular/material": "^11.0.2",
-    "@angular/platform-browser": "^11.0.4",
-    "@angular/platform-browser-dynamic": "^11.0.4",
-    "@angular/router": "^11.0.4",
+    "@angular-devkit/core": "^9.0.6",
+    "@angular/animations": "^9.1.0",
+    "@angular/cdk": "^9.2.0",
+    "@angular/common": "^9.1.0",
+    "@angular/compiler": "^9.1.0",
+    "@angular/core": "^9.0.7",
+    "@angular/forms": "^9.1.0",
+    "@angular/localize": "^9.1.0",
+    "@angular/material": "^9.2.0",
+    "@angular/platform-browser": "^9.1.0",
+    "@angular/platform-browser-dynamic": "^9.1.0",
+    "@angular/router": "^9.1.0",
     "@ngneat/content-loader": "^5.0.0",
-    "@videogular/ngx-videogular": "^2.1.0",
     "core-js": "^2.4.1",
     "file-saver": "^2.0.2",
     "filesize": "^6.1.0",
@@ -40,34 +39,35 @@
     "ng-lazyload-image": "^7.0.1",
     "ngx-avatar": "^4.0.0",
     "ngx-file-drop": "^9.0.1",
-    "rxjs": "^6.6.3",
+    "ngx-videogular": "^9.0.1",
+    "rxjs": "^6.5.3",
     "rxjs-compat": "^6.0.0-rc.0",
-    "tslib": "^2.0.0",
-    "typescript": "~4.0.5",
+    "tslib": "^1.10.0",
+    "typescript": "~3.7.5",
     "web-animations-js": "^2.3.2",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1100.4",
-    "@angular/cli": "^11.0.4",
-    "@angular/compiler-cli": "^11.0.4",
-    "@angular/language-service": "^11.0.4",
+    "@angular-devkit/build-angular": "^0.901.0",
+    "@angular/cli": "^9.0.7",
+    "@angular/compiler-cli": "^9.0.7",
+    "@angular/language-service": "^9.0.7",
     "@types/core-js": "^2.5.2",
     "@types/file-saver": "^2.0.1",
-    "@types/jasmine": "~3.6.0",
+    "@types/jasmine": "2.5.45",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
+    "codelyzer": "^5.1.2",
     "electron": "^8.0.1",
-    "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
-    "karma-chrome-launcher": "~3.1.0",
+    "jasmine-core": "~2.6.2",
+    "jasmine-spec-reporter": "~4.1.0",
+    "karma": "~1.7.0",
+    "karma-chrome-launcher": "~2.1.1",
     "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
-    "protractor": "~7.0.0",
+    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "protractor": "~5.1.2",
     "ts-node": "~3.0.4",
-    "tslint": "~6.1.0"
+    "tslint": "~5.3.2"
   }
 }

src/app/app-routing.module.ts

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

src/app/app.component.html

@@ -46,7 +46,7 @@
                     <a *ngIf="postsService.config && enableDownloadsManager && (!postsService.config.Advanced.multi_user_mode || (postsService.isLoggedIn && postsService.permissions.includes('downloads_manager')))" mat-list-item (click)="postsService.sidepanel_mode === 'over' ? sidenav.close() : null" routerLink='/downloads'><ng-container i18n="Navigation menu Downloads Page title">Downloads</ng-container></a>
                     <ng-container *ngIf="postsService.config && allowSubscriptions && postsService.subscriptions && (!postsService.config.Advanced.multi_user_mode || (postsService.isLoggedIn && postsService.permissions.includes('subscriptions')))">
                         <mat-divider></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-avatar [style.margin-right]="'10px'" size="32" [name]="subscription.name"></ngx-avatar>{{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-avatar [style.margin-right]="'10px'" size="32" [name]="subscription.name"></ngx-avatar><ng-container i18n="Navigation menu Downloads Page title">{{subscription.name}}</ng-container></a>
                     </ng-container>
                 </mat-nav-list>
             </mat-sidenav>

src/app/app.component.spec.ts

@@ -1,9 +1,9 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import { TestBed, async } from '@angular/core/testing';
 
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
         AppComponent
@@ -11,19 +11,19 @@ describe('AppComponent', () => {
     }).compileComponents();
   }));
 
-  it('should create the app', waitForAsync(() => {
+  it('should create the app', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
     expect(app).toBeTruthy();
   }));
 
-  it(`should have as title 'app'`, waitForAsync(() => {
+  it(`should have as title 'app'`, async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
     expect(app.title).toEqual('app');
   }));
 
-  it('should render title in a h1 tag', waitForAsync(() => {
+  it('should render title in a h1 tag', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;

src/app/app.component.ts

@@ -116,8 +116,6 @@ export class AppComponent implements OnInit, AfterViewInit {
     if (this.allowSubscriptions) {
       this.postsService.reloadSubscriptions();
     }
-
-    this.postsService.reloadCategories();
   }
 
   // theme stuff

src/app/app.module.ts

@@ -32,17 +32,14 @@ import { DragDropModule } from '@angular/cdk/drag-drop';
 import { ClipboardModule } from '@angular/cdk/clipboard';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { AppComponent } from './app.component';
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClientModule, HttpClient } from '@angular/common/http';
 import { PostsService } from 'app/posts.services';
 import { FileCardComponent } from './file-card/file-card.component';
 import { RouterModule } from '@angular/router';
 import { AppRoutingModule } from './app-routing.module';
 import { MainComponent } from './main/main.component';
 import { PlayerComponent } from './player/player.component';
-import { VgControlsModule } from '@videogular/ngx-videogular/controls';
-import { VgBufferingModule } from '@videogular/ngx-videogular/buffering';
-import { VgOverlayPlayModule } from '@videogular/ngx-videogular/overlay-play';
-import { VgCoreModule } from '@videogular/ngx-videogular/core';
+import { VgCoreModule, VgControlsModule, VgOverlayPlayModule, VgBufferingModule } from 'ngx-videogular';
 import { InputDialogComponent } from './input-dialog/input-dialog.component';
 import { LazyLoadImageModule, IsVisibleProps } from 'ng-lazyload-image';
 import { audioFilesMouseHovering, videoFilesMouseHovering, audioFilesOpened, videoFilesOpened } from './main/main.component';
@@ -82,10 +79,6 @@ import { UnifiedFileCardComponent } from './components/unified-file-card/unified
 import { RecentVideosComponent } from './components/recent-videos/recent-videos.component';
 import { EditSubscriptionDialogComponent } from './dialogs/edit-subscription-dialog/edit-subscription-dialog.component';
 import { CustomPlaylistsComponent } from './components/custom-playlists/custom-playlists.component';
-import { EditCategoryDialogComponent } from './dialogs/edit-category-dialog/edit-category-dialog.component';
-import { TwitchChatComponent } from './components/twitch-chat/twitch-chat.component';
-import { LinkifyPipe, SeeMoreComponent } from './components/see-more/see-more.component';
-import { H401Interceptor } from './http.interceptor';
 
 registerLocaleData(es, 'es');
 
@@ -112,7 +105,6 @@ export function isVisible({ event, element, scrollContainer, offset }: IsVisible
     VideoInfoDialogComponent,
     ArgModifierDialogComponent,
     HighlightPipe,
-    LinkifyPipe,
     UpdaterComponent,
     UpdateProgressDialogComponent,
     ShareMediaDialogComponent,
@@ -131,10 +123,7 @@ export function isVisible({ event, element, scrollContainer, offset }: IsVisible
     UnifiedFileCardComponent,
     RecentVideosComponent,
     EditSubscriptionDialogComponent,
-    CustomPlaylistsComponent,
-    EditCategoryDialogComponent,
-    TwitchChatComponent,
-    SeeMoreComponent
+    CustomPlaylistsComponent
   ],
   imports: [
     CommonModule,
@@ -192,12 +181,10 @@ export function isVisible({ event, element, scrollContainer, offset }: IsVisible
     SettingsComponent
   ],
   providers: [
-    PostsService,
-    { provide: HTTP_INTERCEPTORS, useClass: H401Interceptor, multi: true }
+    PostsService
   ],
   exports: [
-    HighlightPipe,
-    LinkifyPipe
+    HighlightPipe
   ],
   bootstrap: [AppComponent]
 })

src/app/components/custom-playlists/custom-playlists.component.html

@@ -2,7 +2,7 @@
     <div class="container">
         <div class="row justify-content-center">
             <div *ngFor="let playlist of playlists; let i = index" class="mb-2 mt-2" [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" (goToFile)="goToPlaylist($event)" [file_obj]="playlist" [is_playlist]="true" (editPlaylist)="editPlaylistDialog($event)" (deleteFile)="deletePlaylist($event)" [loading]="false"></app-unified-file-card>
+                <app-unified-file-card [index]="i" [card_size]="postsService.card_size" (goToFile)="goToPlaylist($event)" [file_obj]="playlist" [is_playlist]="true" (editPlaylist)="editPlaylistDialog($event)" (deleteFile)="deletePlaylist($event)" [loading]="false"></app-unified-file-card>
             </div>
         </div>
     </div>

src/app/components/custom-playlists/custom-playlists.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CustomPlaylistsComponent } from './custom-playlists.component';
 
@@ -6,7 +6,7 @@ describe('CustomPlaylistsComponent', () => {
   let component: CustomPlaylistsComponent;
   let fixture: ComponentFixture<CustomPlaylistsComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ CustomPlaylistsComponent ]
     })

src/app/components/custom-playlists/custom-playlists.component.ts

@@ -62,7 +62,7 @@ export class CustomPlaylistsComponent implements OnInit {
       } else {
         localStorage.setItem('player_navigator', this.router.url);
         const fileNames = playlist.fileNames;
-        this.router.navigate(['/player', {fileNames: fileNames.join('|nvr|'), type: type, id: playlistID, uid: playlistID, auto: playlist.auto}]);
+        this.router.navigate(['/player', {fileNames: fileNames.join('|nvr|'), type: type, id: playlistID, uid: playlistID}]);
       }
     } else {
       // playlist not found
@@ -83,7 +83,7 @@ export class CustomPlaylistsComponent implements OnInit {
     const playlist = args.file;
     const index = args.index;
     const playlistID = playlist.id;
-    this.postsService.removePlaylist(playlistID, playlist.type).subscribe(res => {
+    this.postsService.removePlaylist(playlistID, 'audio').subscribe(res => {
       if (res['success']) {
         this.playlists.splice(index, 1);
         this.postsService.openSnackBar('Playlist successfully removed.', '');

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DownloadsComponent } from './downloads.component';
 
@@ -6,7 +6,7 @@ describe('DownloadsComponent', () => {
   let component: DownloadsComponent;
   let fixture: ComponentFixture<DownloadsComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ DownloadsComponent ]
     })

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LoginComponent } from './login.component';
 
@@ -6,7 +6,7 @@ describe('LoginComponent', () => {
   let component: LoginComponent;
   let fixture: ComponentFixture<LoginComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ LoginComponent ]
     })

src/app/components/login/login.component.ts

@@ -27,7 +27,7 @@ export class LoginComponent implements OnInit {
   constructor(private postsService: PostsService, private snackBar: MatSnackBar, private router: Router) { }
 
   ngOnInit(): void {
-    if (this.postsService.isLoggedIn && localStorage.getItem('jwt_token') !== 'null') {
+    if (this.postsService.isLoggedIn) {
       this.router.navigate(['/home']);
     }
     this.postsService.service_initialized.subscribe(init => {

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LogsViewerComponent } from './logs-viewer.component';
 
@@ -6,7 +6,7 @@ describe('LogsViewerComponent', () => {
   let component: LogsViewerComponent;
   let fixture: ComponentFixture<LogsViewerComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ LogsViewerComponent ]
     })

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

@@ -61,8 +61,7 @@ export class LogsViewerComponent implements OnInit {
       data: {
         dialogTitle: 'Clear logs',
         dialogText: 'Would you like to clear your logs? This will delete all your current logs, permanently.',
-        submitText: 'Clear',
-        warnSubmitColor: true
+        submitText: 'Clear'
       }
     });
     dialogRef.afterClosed().subscribe(confirmed => {

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ManageRoleComponent } from './manage-role.component';
 
@@ -6,7 +6,7 @@ describe('ManageRoleComponent', () => {
   let component: ManageRoleComponent;
   let fixture: ComponentFixture<ManageRoleComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ManageRoleComponent ]
     })

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ManageUserComponent } from './manage-user.component';
 
@@ -6,7 +6,7 @@ describe('ManageUserComponent', () => {
   let component: ManageUserComponent;
   let fixture: ComponentFixture<ManageUserComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ManageUserComponent ]
     })

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ModifyUsersComponent } from './modify-users.component';
 
@@ -6,7 +6,7 @@ describe('ModifyUsersComponent', () => {
   let component: ModifyUsersComponent;
   let fixture: ComponentFixture<ModifyUsersComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ModifyUsersComponent ]
     })

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

@@ -30,24 +30,16 @@
 <div>
     <div class="container">
         <div class="row justify-content-center">
-            <ng-container *ngIf="normal_files_received && paged_data">
-                <div *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 [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']" [loading]="false" (deleteFile)="deleteFile($event)" [baseStreamPath]="postsService.path" [jwtString]="postsService.isLoggedIn ? '?jwt=' + this.postsService.token : ''"></app-unified-file-card>
-                </div>
-                <div *ngIf="filtered_files.length === 0">
-                    <ng-container i18n="No videos found">No videos found.</ng-container>
+            <ng-container *ngIf="normal_files_received">
+                <div *ngFor="let file of filtered_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" (goToFile)="goToFile($event)" (goToSubscription)="goToSubscription($event)" [file_obj]="file" [use_youtubedl_archive]="postsService.config['Downloader']['use_youtubedl_archive']" [loading]="false" (deleteFile)="deleteFile($event)"></app-unified-file-card>
                 </div>
             </ng-container>
             <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>
+                    <app-unified-file-card [index]="i" [card_size]="postsService.card_size" [loading]="true" [theme]="postsService.theme"></app-unified-file-card>
                 </div>
             </ng-container>
         </div>
     </div>
-
-    <mat-paginator class="paginator" #paginator *ngIf="filtered_files && filtered_files.length > 0" (page)="pageChangeEvent($event)" [length]="filtered_files.length"
-              [pageSize]="pageSize"
-              [pageSizeOptions]="[5, 10, 25, 100, this.paged_data && this.paged_data.length > 100 ? this.paged_data.length : 250]">
-    </mat-paginator>
 </div>

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

@@ -47,10 +47,6 @@
     top: 10px;
 }
 
-.paginator {
-    margin-top: 5px;
-}
-
 .my-videos-title {
     text-align: center;
     position: relative;

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { RecentVideosComponent } from './recent-videos.component';
 
@@ -6,7 +6,7 @@ describe('RecentVideosComponent', () => {
   let component: RecentVideosComponent;
   let fixture: ComponentFixture<RecentVideosComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ RecentVideosComponent ]
     })

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

@@ -1,7 +1,6 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { PostsService } from 'app/posts.services';
 import { Router } from '@angular/router';
-import { MatPaginator } from '@angular/material/paginator';
 
 @Component({
   selector: 'app-recent-videos',
@@ -51,16 +50,10 @@ export class RecentVideosComponent implements OnInit {
   };
   filterProperty = this.filterProperties['upload_date'];
 
-  pageSize = 10;
-  paged_data = null;
-
-  @ViewChild('paginator') paginator: MatPaginator
-
   constructor(public postsService: PostsService, private router: Router) {
     // get cached file count
     if (localStorage.getItem('cached_file_count')) {
-      this.cached_file_count = +localStorage.getItem('cached_file_count') <= 10 ? +localStorage.getItem('cached_file_count') : 10;
-      
+      this.cached_file_count = +localStorage.getItem('cached_file_count');
       this.loading_files = Array(this.cached_file_count).fill(0);
     }
   }
@@ -98,8 +91,7 @@ export class RecentVideosComponent implements OnInit {
 
   private filterFiles(value: string) {
     const filterValue = value.toLowerCase();
-    this.filtered_files = this.files.filter(option => option.id.toLowerCase().includes(filterValue) || option.category?.name?.toLowerCase().includes(filterValue));
-    this.pageChangeEvent({pageSize: this.pageSize, pageIndex: this.paginator.pageIndex});
+    this.filtered_files = this.files.filter(option => option.id.toLowerCase().includes(filterValue));
   }
 
   filterByProperty(prop) {
@@ -108,7 +100,6 @@ export class RecentVideosComponent implements OnInit {
     } else {
       this.filtered_files = this.filtered_files.sort((a, b) => (a[prop] > b[prop] ? 1 : -1));
     }
-    if (this.paginator) { this.pageChangeEvent({pageSize: this.pageSize, pageIndex: this.paginator.pageIndex}) };
   }
 
   filterOptionChanged(value) {
@@ -127,11 +118,10 @@ export class RecentVideosComponent implements OnInit {
     this.normal_files_received = false;
     this.postsService.getAllFiles().subscribe(res => {
       this.files = res['files'];
-      this.files.sort(this.sortFiles);
-      for (let i = 0; i < this.files.length; i++) {
-        const file = this.files[i];
+      this.files.forEach(file => {
         file.duration = typeof file.duration !== 'string' ? file.duration : this.durationStringToNumber(file.duration);
-      }
+      });
+      this.files.sort(this.sortFiles);
       if (this.search_mode) {
         this.filterFiles(this.search_text);
       } else {
@@ -143,8 +133,6 @@ export class RecentVideosComponent implements OnInit {
       localStorage.setItem('cached_file_count', '' + this.files.length);
 
       this.normal_files_received = true;
-
-      this.paged_data = this.filtered_files.slice(0, 10);
     });
   }
 
@@ -222,7 +210,7 @@ export class RecentVideosComponent implements OnInit {
 
       if (!this.postsService.config.Extra.file_manager_enabled) {
         // tell server to delete the file once downloaded
-        this.postsService.deleteFile(name, type).subscribe(delRes => {
+        this.postsService.deleteFile(name, false).subscribe(delRes => {
           // reload mp4s
           this.getAllFiles();
         });
@@ -238,17 +226,17 @@ export class RecentVideosComponent implements OnInit {
     const blacklistMode = args.blacklistMode;
 
     if (file.sub_id) {
-      this.deleteSubscriptionFile(file, blacklistMode);
+      this.deleteSubscriptionFile(file, index, blacklistMode);
     } else {
-      this.deleteNormalFile(file, blacklistMode);
+      this.deleteNormalFile(file, index, blacklistMode);
     }
   }
 
-  deleteNormalFile(file, blacklistMode = false) {
-    this.postsService.deleteFile(file.uid, file.isAudio ? 'audio' : 'video', blacklistMode).subscribe(result => {
+  deleteNormalFile(file, index, blacklistMode = false) {
+    this.postsService.deleteFile(file.uid, file.isAudio, blacklistMode).subscribe(result => {
       if (result) {
         this.postsService.openSnackBar('Delete success!', 'OK.');
-        this.removeFileCard(file);
+        this.files.splice(index, 1);
       } else {
         this.postsService.openSnackBar('Delete failed!', 'OK.');
       }
@@ -257,39 +245,30 @@ export class RecentVideosComponent implements OnInit {
     });
   }
 
-  deleteSubscriptionFile(file, blacklistMode = false) {
+  deleteSubscriptionFile(file, index, blacklistMode = false) {
     if (blacklistMode) {
-      this.deleteForever(file);
+      this.deleteForever(file, index);
     } else {
-      this.deleteAndRedownload(file);
+      this.deleteAndRedownload(file, index);
     }
   }
 
-  deleteAndRedownload(file) {
+  deleteAndRedownload(file, index) {
     const sub = this.postsService.getSubscriptionByID(file.sub_id);
     this.postsService.deleteSubscriptionFile(sub, file.id, false, file.uid).subscribe(res => {
       this.postsService.openSnackBar(`Successfully deleted file: '${file.id}'`);
-      this.removeFileCard(file);
+      this.files.splice(index, 1);
     });
   }
 
-  deleteForever(file) {
+  deleteForever(file, index) {
     const sub = this.postsService.getSubscriptionByID(file.sub_id);
     this.postsService.deleteSubscriptionFile(sub, file.id, true, file.uid).subscribe(res => {
       this.postsService.openSnackBar(`Successfully deleted file: '${file.id}'`);
-      this.removeFileCard(file);
+      this.files.splice(index, 1);
     });
   }
 
-  removeFileCard(file_to_remove) {
-    const index = this.files.map(e => e.uid).indexOf(file_to_remove.uid);
-    this.files.splice(index, 1);
-    if (this.search_mode) {
-      this.filterFiles(this.search_text);
-    }
-    this.filterByProperty(this.filterProperty['property']);
-  }
-
   // sorting and filtering
 
   sortFiles(a, b) {
@@ -297,18 +276,13 @@ export class RecentVideosComponent implements OnInit {
     const result = b.registered - a.registered;
     return result;
   }
-
+  
   durationStringToNumber(dur_str) {
     let num_sum = 0;
     const dur_str_parts = dur_str.split(':');
-    for (let i = dur_str_parts.length - 1; i >= 0; i--) {
-      num_sum += parseInt(dur_str_parts[i]) * (60 ** (dur_str_parts.length - 1 - i));
+    for (let i = dur_str_parts.length-1; i >= 0; i--) {
+      num_sum += parseInt(dur_str_parts[i])*(60**(dur_str_parts.length-1-i));
     }
     return num_sum;
   }
-
-  pageChangeEvent(event) {
-    const offset = ((event.pageIndex + 1) - 1) * event.pageSize;
-    this.paged_data = this.filtered_files.slice(offset).slice(0, event.pageSize);
-  }
 }

src/app/components/see-more/see-more.component.html

@@ -1,11 +0,0 @@
-<span class="text" [ngStyle]="{'-webkit-line-clamp': !see_more_active ? line_limit : null}" [innerHTML]="text | linkify"></span>
-<span>
-    <a [routerLink]="" (click)="toggleSeeMore()">
-        <ng-container *ngIf="!see_more_active" i18n="See more">
-            See more.
-        </ng-container>
-        <ng-container *ngIf="see_more_active" i18n="See less">
-            See less.
-        </ng-container>
-    </a>
-</span>

src/app/components/see-more/see-more.component.scss

@@ -1,7 +0,0 @@
-.text {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    word-wrap: break-word;
- }

src/app/components/see-more/see-more.component.spec.ts

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

src/app/components/see-more/see-more.component.ts

@@ -1,60 +0,0 @@
-import { Component, Input, OnInit, Pipe, PipeTransform } from '@angular/core';
-import { DomSanitizer } from '@angular/platform-browser';
-
-@Pipe({ name: 'linkify' })
-export class LinkifyPipe implements PipeTransform {
-
-  constructor(private _domSanitizer: DomSanitizer) {}
-
-  transform(value: any, args?: any): any {
-    return this._domSanitizer.bypassSecurityTrustHtml(this.stylize(value));
-  }
-
-  // Modify this method according to your custom logic
-  private stylize(text: string): string {
-    let stylizedText: string = '';
-    if (text && text.length > 0) {
-      for (let line of text.split("\n")) {
-        for (let t of line.split(" ")) {
-          if (t.startsWith("http") && t.length>7) {  
-            stylizedText += `<a target="_blank" href="${t}">${t}</a> `;
-          }
-          else
-            stylizedText += t + " ";
-        }
-        stylizedText += '<br>';
-      }
-      return stylizedText;
-    }
-    else return text;
-  }
-
-}
-
-@Component({
-  selector: 'app-see-more',
-  templateUrl: './see-more.component.html',
-  providers: [LinkifyPipe],
-  styleUrls: ['./see-more.component.scss']
-})
-export class SeeMoreComponent implements OnInit {
-
-  see_more_active = false;
-
-  @Input() text = '';
-  @Input() line_limit = 2;
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-  toggleSeeMore() {
-    this.see_more_active = !this.see_more_active;
-  }
-
-  parseText() {
-    return this.text.replace(/(http.*?\s)/, "<a href=\"$1\">$1</a>")
-  }
-
-}

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

@@ -1,12 +0,0 @@
-<div class="chat-container" #scrollContainer *ngIf="visible_chat">
-    <div style="width: 250px; text-align: center;"><strong>Twitch Chat</strong></div>
-    <div #chat style="max-width: 250px" *ngFor="let chat of visible_chat; let last = last">
-        {{chat.timestamp_str}} - <strong [style.color]="chat.user_color ? chat.user_color : null">{{chat.name}}</strong>: {{chat.message}}
-        {{last ? scrollToBottom() : ''}}
-    </div>
-</div>
-
-<ng-container *ngIf="chat_response_received && !full_chat">
-    <button [disabled]="downloading_chat" (click)="downloadTwitchChat()" class="download-button" mat-raised-button color="accent"><ng-container i18n="Download Twitch Chat button">Download Twitch Chat</ng-container></button>
-    <mat-spinner *ngIf="downloading_chat" class="downloading-spinner" [diameter]="30"></mat-spinner>
-</ng-container>

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

@@ -1,13 +0,0 @@
-.chat-container {
-    height: 100%;
-    overflow-y: scroll;
-}
-
-.download-button {
-    margin: 10px;
-}
-
-.downloading-spinner {
-    top: 50%;
-    left: 80px;
-}

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

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

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

@@ -1,138 +0,0 @@
-import { AfterViewInit, Component, ElementRef, Input, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
-import { PostsService } from 'app/posts.services';
-
-@Component({
-  selector: 'app-twitch-chat',
-  templateUrl: './twitch-chat.component.html',
-  styleUrls: ['./twitch-chat.component.scss']
-})
-export class TwitchChatComponent implements OnInit, AfterViewInit {
-
-  full_chat = null;
-  visible_chat = null;
-  chat_response_received = false;
-  downloading_chat = false;
-
-  current_chat_index = null;
-
-  CHAT_CHECK_INTERVAL_MS = 200;
-  chat_check_interval_obj = null;
-
-  scrollContainer = null;
-
-  @Input() db_file = null;
-  @Input() sub = null;
-  @Input() current_timestamp = null;
-
-  @ViewChild('scrollContainer') scrollRef: ElementRef;
-  @ViewChildren('chat') chat: QueryList<any>;
-
-  constructor(private postsService: PostsService) { }
-
-  ngOnInit(): void {
-    this.getFullChat();
-  }
-
-  ngAfterViewInit() {
-  }
-
-  private isUserNearBottom(): boolean {
-    const threshold = 150;
-    const position = this.scrollContainer.scrollTop + this.scrollContainer.offsetHeight;
-    const height = this.scrollContainer.scrollHeight;
-    return position > height - threshold;
-  }
-
-  scrollToBottom = (force_scroll) => {
-    if (force_scroll || this.isUserNearBottom()) {
-      this.scrollContainer.scrollTop = this.scrollContainer.scrollHeight;
-    }
-  }
-
-  addNewChatMessages() {
-    const next_chat_index = this.getIndexOfNextChat();
-    if (!this.scrollContainer) {
-      this.scrollContainer = this.scrollRef.nativeElement;
-    }
-    if (this.current_chat_index === null) {
-      this.current_chat_index = next_chat_index;
-    }
-
-    if (Math.abs(next_chat_index - this.current_chat_index) > 25) {
-      this.visible_chat = [];
-      this.current_chat_index = next_chat_index - 25;
-      setTimeout(() => this.scrollToBottom(true), 100);
-    }
-
-    const latest_chat_timestamp = this.visible_chat.length ? this.visible_chat[this.visible_chat.length - 1]['timestamp'] : 0;
-
-    for (let i = this.current_chat_index + 1; i < this.full_chat.length; i++) {
-      if (this.full_chat[i]['timestamp'] >= latest_chat_timestamp && this.full_chat[i]['timestamp'] <= this.current_timestamp) {
-        this.visible_chat.push(this.full_chat[i]);
-        this.current_chat_index = i;
-      } else if (this.full_chat[i]['timestamp'] > this.current_timestamp) {
-        break;
-      }
-    }
-  }
-
-  getIndexOfNextChat() {
-    const index = binarySearch(this.full_chat, 'timestamp', this.current_timestamp);
-    return index;
-  }
-
-  getFullChat() {
-    this.postsService.getFullTwitchChat(this.db_file.id, this.db_file.isAudio ? 'audio' : 'video', null, this.sub).subscribe(res => {
-      this.chat_response_received = true;
-      if (res['chat']) {
-        this.initializeChatCheck(res['chat']);
-      }
-    });
-  }
-
-  downloadTwitchChat() {
-    this.downloading_chat = true;
-    let vodId = this.db_file.url.split('videos/').length > 1 && this.db_file.url.split('videos/')[1];
-    vodId = vodId.split('?')[0];
-    if (!vodId) {
-      this.postsService.openSnackBar('VOD url for this video is not supported. VOD ID must be after "twitch.tv/videos/"');
-    }
-    this.postsService.downloadTwitchChat(this.db_file.id, this.db_file.isAudio ? 'audio' : 'video', vodId, null, this.sub).subscribe(res => {
-      if (res['chat']) {
-        this.initializeChatCheck(res['chat']);
-      } else {
-        this.downloading_chat = false;
-        this.postsService.openSnackBar('Download failed.')
-      }
-    }, err => {
-      this.downloading_chat = false;
-      this.postsService.openSnackBar('Chat could not be downloaded.')
-    });
-  }
-
-  initializeChatCheck(full_chat) {
-    this.full_chat = full_chat;
-    this.visible_chat = [];
-    this.chat_check_interval_obj = setInterval(() => this.addNewChatMessages(), this.CHAT_CHECK_INTERVAL_MS);
-  }
-
-}
-
-function binarySearch(arr, key, n) {
-  let min = 0;
-  let max = arr.length - 1;
-  let mid;
-  while (min <= max) {
-    // tslint:disable-next-line: no-bitwise
-    mid = (min + max) >>> 1;
-    if (arr[mid][key] === n) {
-      return mid;
-    } else if (arr[mid][key] < n) {
-      min = mid + 1;
-    } else {
-      max = mid - 1;
-    }
-  }
-
-  return min;
-}

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

@@ -1,24 +1,7 @@
-<div (mouseover)="elevated=true" (mouseout)="elevated=false" (contextmenu)="onRightClick($event)" style="position: relative; width: fit-content;">
-    <div *ngIf="!loading" class="download-time">
-        <mat-icon class="audio-video-icon">{{(file_obj.type === 'audio' || file_obj.isAudio) ? 'audiotrack' : 'movie'}}</mat-icon>
-        &nbsp;&nbsp;
-        <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 (mouseover)="elevated=true" (mouseout)="elevated=false" style="position: relative; width: fit-content;">
+    <div *ngIf="!loading" class="download-time"><mat-icon class="audio-video-icon">{{(file_obj.type === 'audio' || file_obj.isAudio) ? 'audiotrack' : 'movie'}}</mat-icon>&nbsp;&nbsp;{{file_obj.registered | date:'shortDate'}}</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"
-        [style.top]="contextMenuPosition.y"
-        [matMenuTriggerFor]="context_menu">
-    </div>
-    <button *ngIf="!file_obj || !file_obj.auto" [disabled]="loading" [matMenuTriggerFor]="action_menu" class="menuButton" mat-icon-button><mat-icon>more_vert</mat-icon></button>
-    <mat-menu #context_menu>
-        <ng-container *ngIf="!loading">
-            <button (click)="navigateToFile($event)" mat-menu-item><mat-icon>open_in_browser</mat-icon><ng-container i18n="Open file button">Open file</ng-container></button>
-            <button (click)="navigateToFile({ctrlKey: true})" mat-menu-item><mat-icon>open_in_new</mat-icon><ng-container i18n="Open file in new tab">Open file in new tab</ng-container></button>
-        </ng-container>
-    </mat-menu>
+    <button [disabled]="loading" [matMenuTriggerFor]="action_menu" class="menuButton" mat-icon-button><mat-icon>more_vert</mat-icon></button>
     <mat-menu #action_menu="matMenu">
         <ng-container *ngIf="!is_playlist && !loading">
             <button (click)="openFileInfoDialog()" mat-menu-item><mat-icon>info</mat-icon><ng-container i18n="Video info button">Info</ng-container></button>
@@ -46,7 +29,7 @@
         <div style="padding:5px">
             <div *ngIf="!loading && file_obj.thumbnailURL" class="img-div">
                 <div style="position: relative">
-                    <img [ngClass]="{'image-small': card_size === 'small', 'image': card_size === 'medium', 'image-large': card_size === 'large'}" [src]="file_obj.thumbnailPath ? thumbnailBlobURL : file_obj.thumbnailURL" alt="Thumbnail">
+                    <img [ngClass]="{'image-small': card_size === 'small', 'image': card_size === 'medium', 'image-large': card_size === 'large'}" [src]="file_obj.thumbnailBlob ? thumbnailBlobURL : file_obj.thumbnailURL" alt="Thumbnail">
                     <div class="duration-time">
                         {{file_length}}
                     </div>

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

@@ -110,12 +110,7 @@
   position: absolute;
   top: 1px;
   left: 5px;
-  z-index: 999;
-  width: calc(100% - 8px);
-  white-space: nowrap;
-  overflow: hidden;
-  display: block;
-  text-overflow: ellipsis;
+  z-index: 99999;
 }
 
 .audio-video-icon {

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { UnifiedFileCardComponent } from './unified-file-card.component';
 
@@ -6,7 +6,7 @@ describe('UnifiedFileCardComponent', () => {
   let component: UnifiedFileCardComponent;
   let fixture: ComponentFixture<UnifiedFileCardComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ UnifiedFileCardComponent ]
     })

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

@@ -1,22 +1,7 @@
-import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { VideoInfoDialogComponent } from 'app/dialogs/video-info-dialog/video-info-dialog.component';
 import { DomSanitizer } from '@angular/platform-browser';
-import { MatMenuTrigger } from '@angular/material/menu';
-import { registerLocaleData } from '@angular/common';
-import localeGB from '@angular/common/locales/en-GB';
-import localeFR from '@angular/common/locales/fr';
-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';
-
-registerLocaleData(localeGB);
-registerLocaleData(localeFR);
-registerLocaleData(localeES);
-registerLocaleData(localeDE);
-registerLocaleData(localeZH);
-registerLocaleData(localeNB);
 
 @Component({
   selector: 'app-unified-file-card',
@@ -43,18 +28,11 @@ export class UnifiedFileCardComponent implements OnInit {
   @Input() use_youtubedl_archive = false;
   @Input() is_playlist = false;
   @Input() index: number;
-  @Input() locale = null;
-  @Input() baseStreamPath = null;
-  @Input() jwtString = null;
   @Output() goToFile = new EventEmitter<any>();
   @Output() goToSubscription = new EventEmitter<any>();
   @Output() deleteFile = new EventEmitter<any>();
   @Output() editPlaylist = new EventEmitter<any>();
 
-
-  @ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger;
-  contextMenuPosition = { x: '0px', y: '0px' };
-
   /*
     Planned sizes:
     small: 150x175
@@ -69,12 +47,11 @@ export class UnifiedFileCardComponent implements OnInit {
       this.file_length = fancyTimeFormat(this.file_obj.duration);
     }
 
-    if (this.file_obj && this.file_obj.thumbnailPath) {
-      this.thumbnailBlobURL = `${this.baseStreamPath}thumbnail/${encodeURIComponent(this.file_obj.thumbnailPath)}${this.jwtString}`;
-      /*const mime = getMimeByFilename(this.file_obj.thumbnailPath);
+    if (this.file_obj && this.file_obj.thumbnailBlob) {
+      const mime = getMimeByFilename(this.file_obj.thumbnailPath);
       const blob = new Blob([new Uint8Array(this.file_obj.thumbnailBlob.data)], {type: mime});
       const bloburl = URL.createObjectURL(blob);
-      this.thumbnailBlobURL = this.sanitizer.bypassSecurityTrustUrl(bloburl);*/
+      this.thumbnailBlobURL = this.sanitizer.bypassSecurityTrustUrl(bloburl);
     }
   }
 
@@ -110,15 +87,6 @@ export class UnifiedFileCardComponent implements OnInit {
     });
   }
 
-  onRightClick(event) {
-    event.preventDefault();
-    this.contextMenuPosition.x = event.clientX + 'px';
-    this.contextMenuPosition.y = event.clientY + 'px';
-    this.contextMenu.menuData = { 'item': {id: 1, name: 'hi'} };
-    this.contextMenu.menu.focusFirstItem('mouse');
-    this.contextMenu.openMenu();
-  }
-
 }
 
 function fancyTimeFormat(time) {

src/app/consts.ts

@@ -1 +1 @@
-export const CURRENT_VERSION = 'v4.2';
+export const CURRENT_VERSION = 'v4.1';

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

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CreatePlaylistComponent } from './create-playlist.component';
 
@@ -6,7 +6,7 @@ describe('CreatePlaylistComponent', () => {
   let component: CreatePlaylistComponent;
   let fixture: ComponentFixture<CreatePlaylistComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ CreatePlaylistComponent ]
     })

src/app/dialogs/about-dialog/about-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AboutDialogComponent } from './about-dialog.component';
 
@@ -6,7 +6,7 @@ describe('AboutDialogComponent', () => {
   let component: AboutDialogComponent;
   let fixture: ComponentFixture<AboutDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ AboutDialogComponent ]
     })

src/app/dialogs/add-user-dialog/add-user-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AddUserDialogComponent } from './add-user-dialog.component';
 
@@ -6,7 +6,7 @@ describe('AddUserDialogComponent', () => {
   let component: AddUserDialogComponent;
   let fixture: ComponentFixture<AddUserDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ AddUserDialogComponent ]
     })

src/app/dialogs/arg-modifier-dialog/arg-modifier-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ArgModifierDialogComponent } from './arg-modifier-dialog.component';
 
@@ -6,7 +6,7 @@ describe('ArgModifierDialogComponent', () => {
   let component: ArgModifierDialogComponent;
   let fixture: ComponentFixture<ArgModifierDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ArgModifierDialogComponent ]
     })

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

@@ -6,7 +6,7 @@
 </mat-dialog-content>
 <mat-dialog-actions>
   <!-- The mat-dialog-close directive optionally accepts a value as a result for the dialog. -->
-  <button [color]="warnSubmitColor ? 'warn' : 'primary'" mat-flat-button type="submit" (click)="confirmClicked()">{{submitText}}</button>
+  <button color="primary" mat-flat-button type="submit" (click)="confirmClicked()">{{submitText}}</button>
   <div class="mat-spinner" *ngIf="submitClicked">
     <mat-spinner [diameter]="25"></mat-spinner>
   </div>

src/app/dialogs/confirm-dialog/confirm-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ConfirmDialogComponent } from './confirm-dialog.component';
 
@@ -6,7 +6,7 @@ describe('ConfirmDialogComponent', () => {
   let component: ConfirmDialogComponent;
   let fixture: ComponentFixture<ConfirmDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ConfirmDialogComponent ]
     })

src/app/dialogs/confirm-dialog/confirm-dialog.component.ts

@@ -15,14 +15,12 @@ export class ConfirmDialogComponent implements OnInit {
 
   doneEmitter: EventEmitter<any> = null;
   onlyEmitOnDone = false;
-
-  warnSubmitColor = false;
+  
 
   constructor(@Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef<ConfirmDialogComponent>) {
     if (this.data.dialogTitle) { this.dialogTitle = this.data.dialogTitle };
     if (this.data.dialogText) { this.dialogText = this.data.dialogText };
     if (this.data.submitText) { this.submitText = this.data.submitText };
-    if (this.data.warnSubmitColor) { this.warnSubmitColor = this.data.warnSubmitColor };
 
     // checks if emitter exists, if so don't autoclose as it should be handled by caller
     if (this.data.doneEmitter) {

src/app/dialogs/cookies-uploader-dialog/cookies-uploader-dialog.component.html

@@ -17,7 +17,7 @@
                 </ng-template>
             </ngx-file-drop>
             <div style="margin-top: 15px;">
-                <p style="font-size: 14px;" i18n="Cookies upload warning">NOTE: Uploading new cookies will override your previous cookies. Also note that cookies are instance-wide, not per-user.</p>
+                <p style="font-size: 14px;" i18n="Cookies upload warning">NOTE: Uploading new cookies will overrride your previous cookies. Also note that cookies are instance-wide, not per-user.</p>
             </div>
             <div style="margin-top: 10px;">
                 <table class="table">

src/app/dialogs/cookies-uploader-dialog/cookies-uploader-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CookiesUploaderDialogComponent } from './cookies-uploader-dialog.component';
 
@@ -6,7 +6,7 @@ describe('CookiesUploaderDialogComponent', () => {
   let component: CookiesUploaderDialogComponent;
   let fixture: ComponentFixture<CookiesUploaderDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ CookiesUploaderDialogComponent ]
     })

src/app/dialogs/edit-category-dialog/edit-category-dialog.component.html

@@ -1,60 +0,0 @@
-<h4 mat-dialog-title><ng-container i18n="Editing category dialog title">Editing category</ng-container>&nbsp;{{category['name']}}</h4>
-
-<mat-dialog-content style="max-height: 50vh">
-    <mat-form-field style="width: 250px; margin-bottom: 5px;">
-        <input matInput placeholder="Name" i18n-placeholder="Name" [(ngModel)]="category['name']" required>
-    </mat-form-field>
-
-    <mat-divider></mat-divider>
-
-    <h6 style="margin-top: 20px;" i18n="Rules">Rules</h6>
-
-    <mat-list>
-        <mat-list-item *ngFor="let rule of category['rules']; let i = index">
-            <mat-form-field [style.visibility]="i === 0 ? 'hidden' : null" class="operator-select">
-                <mat-select [disabled]="i === 0" [(ngModel)]="rule['preceding_operator']">
-                    <mat-option value="or">OR</mat-option>
-                    <mat-option value="and">AND</mat-option>
-                </mat-select>
-            </mat-form-field>
-            <mat-form-field class="property-select">
-                <mat-select [(ngModel)]="rule['property']">
-                    <mat-option *ngFor="let propertyOption of propertyOptions" [value]="propertyOption.value">{{propertyOption.label}}</mat-option>
-                </mat-select>
-            </mat-form-field>
-            <mat-form-field class="comparator-select">
-                <mat-select [(ngModel)]="rule['comparator']">
-                    <mat-option *ngFor="let comparatorOption of comparatorOptions" [value]="comparatorOption.value">{{comparatorOption.label}}</mat-option>
-                </mat-select>
-            </mat-form-field>
-            <mat-form-field class="value-input">
-                <input matInput [(ngModel)]="rule['value']">
-            </mat-form-field>
-            <button [disabled]="i === category['rules'].length-1" (click)="swapRules(i, i+1)" mat-icon-button><mat-icon>arrow_downward</mat-icon></button>
-            <button [disabled]="i === 0" (click)="swapRules(i, i-1)" mat-icon-button><mat-icon>arrow_upward</mat-icon></button>
-            <button (click)="removeRule(i)" mat-icon-button><mat-icon>cancel</mat-icon></button>
-        </mat-list-item>
-    </mat-list>
-
-    <button style="margin-bottom: 8px;" mat-icon-button (click)="addNewRule()" matTooltip="Add new rule" i18n-matTooltip="Add new rule tooltip"><mat-icon>add</mat-icon></button>
-
-    <mat-divider></mat-divider>
-
-    <mat-form-field style="width: 250px; margin-top: 10px;">
-        <input matInput [(ngModel)]="category['custom_output']" placeholder="Custom file output" i18n-placeholder="Category custom file output placeholder">
-        <mat-hint>
-            <a target="_blank" href="https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template">
-            <ng-container i18n="Custom output template documentation link">Documentation</ng-container></a>.
-            <ng-container i18n="Custom Output input hint">Path is relative to the config download path. Don't include extension.</ng-container>
-        </mat-hint>
-    </mat-form-field>
-</mat-dialog-content>
-
-<mat-dialog-actions>
-    <button mat-button mat-dialog-close><ng-container i18n="Cancel">Cancel</ng-container></button>
-
-    <button mat-button [disabled]="categoryChanged()" type="submit" (click)="saveClicked()"><ng-container i18n="Save button">Save</ng-container></button>
-    <div class="mat-spinner" *ngIf="updating">
-      <mat-spinner [diameter]="25"></mat-spinner>
-    </div>
-</mat-dialog-actions>

src/app/dialogs/edit-category-dialog/edit-category-dialog.component.scss

@@ -1,16 +0,0 @@
-.operator-select {
-    width: 55px;
-}
-
-.property-select {
-    margin-left: 10px;
-    width: 110px;
-}
-
-.comparator-select {
-    margin-left: 10px;
-}
-
-.value-input {
-    margin-left: 10px;
-}

src/app/dialogs/edit-category-dialog/edit-category-dialog.component.spec.ts

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

src/app/dialogs/edit-category-dialog/edit-category-dialog.component.ts

@@ -1,111 +0,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { PostsService } from 'app/posts.services';
-
-@Component({
-  selector: 'app-edit-category-dialog',
-  templateUrl: './edit-category-dialog.component.html',
-  styleUrls: ['./edit-category-dialog.component.scss']
-})
-export class EditCategoryDialogComponent implements OnInit {
-
-  updating = false;
-  original_category = null;
-  category = null;
-
-  propertyOptions = [
-    {
-      value: 'fulltitle',
-      label: 'Title'
-    },
-    {
-      value: 'id',
-      label: 'ID'
-    },
-    {
-      value: 'webpage_url',
-      label: 'URL'
-    },
-    {
-      value: 'view_count',
-      label: 'Views'
-    },
-    {
-      value: 'uploader',
-      label: 'Uploader'
-    },
-    {
-      value: '_filename',
-      label: 'File Name'
-    },
-    {
-      value: 'tags',
-      label: 'Tags'
-    }
-  ];
-
-  comparatorOptions = [
-    {
-      value: 'includes',
-      label: 'includes'
-    },
-    {
-      value: 'not_includes',
-      label: 'not includes'
-    },
-    {
-      value: 'equals',
-      label: 'equals'
-    },
-    {
-      value: 'not_equals',
-      label: 'not equals'
-    },
-
-  ];
-
-  constructor(@Inject(MAT_DIALOG_DATA) public data: any, private postsService: PostsService) {
-    if (this.data) {
-      this.original_category = this.data.category;
-      this.category = JSON.parse(JSON.stringify(this.original_category));
-    }
-  }
-
-  ngOnInit(): void {
-  }
-
-  addNewRule() {
-    this.category['rules'].push({
-      preceding_operator: 'or',
-      property: 'fulltitle',
-      comparator: 'includes',
-      value: ''
-    });
-  }
-
-  saveClicked() {
-    this.updating = true;
-    this.postsService.updateCategory(this.category).subscribe(res => {
-      this.updating = false;
-      this.original_category = JSON.parse(JSON.stringify(this.category));
-      this.postsService.reloadCategories();
-    }, err => {
-      this.updating = false;
-      console.error(err);
-    });
-  }
-
-  categoryChanged() {
-    return JSON.stringify(this.category) === JSON.stringify(this.original_category);
-  }
-
-  swapRules(original_index, new_index) {
-    [this.category.rules[original_index], this.category.rules[new_index]] = [this.category.rules[new_index],
-                                                                            this.category.rules[original_index]];
-  }
-
-  removeRule(index) {
-    this.category['rules'].splice(index, 1);
-  }
-
-}

src/app/dialogs/edit-subscription-dialog/edit-subscription-dialog.component.html

@@ -1,11 +1,8 @@
-<h4 mat-dialog-title><ng-container i18n="Edit subscription dialog title prefix">Editing</ng-container>&nbsp;{{sub.name}}&nbsp;<ng-container *ngIf="sub.paused" i18n="Paused suffix">(Paused)</ng-container></h4>
+<h4 mat-dialog-title i18n="Edit subscription dialog title">Editing {{sub.name}}</h4>
 
 <mat-dialog-content>
     <div class="container-fluid">
         <div class="row">
-            <div class="col-12 mt-3">
-                <mat-checkbox [(ngModel)]="new_sub.paused"><ng-container i18n="Paused subscription setting">Paused</ng-container></mat-checkbox>
-            </div>
             <div class="col-12 mt-3">
                 <mat-checkbox (change)="downloadAllToggled()" [(ngModel)]="download_all"><ng-container i18n="Download all uploads subscription setting">Download all uploads</ng-container></mat-checkbox>
             </div>
@@ -27,14 +24,7 @@
                     <mat-checkbox [disabled]="true" [(ngModel)]="audioOnlyMode"><ng-container i18n="Streaming-only mode">Audio-only mode</ng-container></mat-checkbox>
                 </div>
             </div>
-            <div class="col-12 mt-2">
-                <mat-form-field>
-                    <mat-select placeholder="Max quality" i18n-placeholder="Max quality placeholder" [disabled]="new_sub.type === 'audio'" [(ngModel)]="new_sub.maxQuality">
-                        <mat-option *ngFor="let available_quality of available_qualities" [value]="available_quality['value']">{{available_quality['label']}}</mat-option>
-                    </mat-select>
-                </mat-form-field>
-            </div>
-            <div class="col-12 mt-1">
+            <div class="col-12">
                 <div>
                     <mat-checkbox [disabled]="new_sub.type === 'audio'" [(ngModel)]="new_sub.streamingOnly"><ng-container i18n="Streaming-only mode">Streaming-only mode</ng-container></mat-checkbox>
                 </div>

src/app/dialogs/edit-subscription-dialog/edit-subscription-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { EditSubscriptionDialogComponent } from './edit-subscription-dialog.component';
 
@@ -6,7 +6,7 @@ describe('EditSubscriptionDialogComponent', () => {
   let component: EditSubscriptionDialogComponent;
   let fixture: ComponentFixture<EditSubscriptionDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ EditSubscriptionDialogComponent ]
     })

src/app/dialogs/edit-subscription-dialog/edit-subscription-dialog.component.ts

@@ -22,36 +22,6 @@ export class EditSubscriptionDialogComponent implements OnInit {
   audioOnlyMode = null;
   download_all = null;
 
-  available_qualities = [
-    {
-      'label': 'Best',
-      'value': 'best'
-    },
-    {
-      'label': '4K',
-      'value': '2160'
-    },
-    {
-      'label': '1440p',
-      'value': '1440'
-    },
-    {
-      'label': '1080p',
-      'value': '1080'
-    },
-    {
-      'label': '720p',
-      'value': '720'
-    },
-    {
-      'label': '480p',
-      'value': '480'
-    },
-    {
-      'label': '360p',
-      'value': '360'
-    }
-  ];
 
   time_units = [
     'day',
@@ -61,24 +31,24 @@ export class EditSubscriptionDialogComponent implements OnInit {
   ];
 
   constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialog: MatDialog, private postsService: PostsService) {
-    this.sub = JSON.parse(JSON.stringify(this.data.sub));
+    this.sub = this.data.sub;
     this.new_sub = JSON.parse(JSON.stringify(this.sub));
 
-    // ignore videos to keep requests small
-    delete this.sub['videos'];
-    delete this.new_sub['videos'];
-
     this.audioOnlyMode = this.sub.type === 'audio';
     this.download_all = !this.sub.timerange;
 
     if (this.sub.timerange) {
       const timerange_str = this.sub.timerange.split('-')[1];
+      console.log(timerange_str);
       const number = timerange_str.replace(/\D/g,'');
       let units = timerange_str.replace(/[0-9]/g, '');
 
-      if (+number === 1) {
-        units = units.replace('s', '');
-      }
+      console.log(units);
+
+      // // remove plural on units
+      // if (units[units.length-1] === 's') {
+      //   units = units.substring(0, units.length-1);
+      // }
 
       this.timerange_amount = parseInt(number);
       this.timerange_unit = units;
@@ -101,10 +71,9 @@ export class EditSubscriptionDialogComponent implements OnInit {
   }
 
   saveSubscription() {
-    this.postsService.updateSubscription(this.new_sub).subscribe(res => {
+    this.postsService.updateSubscription(this.sub).subscribe(res => {
       this.sub = this.new_sub;
       this.new_sub = JSON.parse(JSON.stringify(this.sub));
-      this.postsService.reloadSubscriptions();
     })
   }
 
@@ -116,16 +85,12 @@ export class EditSubscriptionDialogComponent implements OnInit {
   }
 
   timerangeChanged(value, select_changed) {
-    if (+this.timerange_amount === 1) {
-      this.timerange_unit = this.timerange_unit.replace('s', '');
-    } else {
-      if (!this.timerange_unit.includes('s')) {
-        this.timerange_unit += 's';
-      }
-    }
+    console.log(this.timerange_amount);
+    console.log(this.timerange_unit);
 
     if (this.timerange_amount && this.timerange_unit && !this.download_all) {
       this.new_sub.timerange = 'now-' + this.timerange_amount.toString() + this.timerange_unit;
+      console.log(this.new_sub.timerange);
     } else {
       this.new_sub.timerange = null;
     }

src/app/dialogs/modify-playlist/modify-playlist.component.html

@@ -8,24 +8,14 @@
         </mat-form-field>
     </div>
 
-    <div style="margin-bottom: 10px; height: 40px;">
-        <div style="float: left">
-            <span *ngIf="reverse_order === false" i18n="Normal order">Normal order&nbsp;</span>
-            <span *ngIf="reverse_order === true" i18n="Reverse order">Reverse order&nbsp;</span>
-            <button (click)="togglePlaylistOrder()" mat-icon-button><mat-icon>{{!reverse_order ? 'arrow_downward' : 'arrow_upward'}}</mat-icon></button>
-        </div>
-
-        <div style="float: right">
-            <button [disabled]="available_files.length === 0" mat-stroked-button [matMenuTriggerFor]="menu"><ng-container i18n="Add content">Add content</ng-container></button>
-        </div>
-    </div>
-
     <!-- Playlist order -->
     <mat-button-toggle-group class="media-list" cdkDropList (cdkDropListDropped)="drop($event)" style="width: 80%; left: 9%" vertical name="videoSelect" aria-label="Video Select" #group="matButtonToggleGroup">
-        <!-- The following for loop can be optimized but it requires a pipe https://stackoverflow.com/a/35703364/8088021 -->
-        <mat-button-toggle class="media-box" cdkDrag *ngFor="let playlist_item of (reverse_order ? playlist.fileNames.slice().reverse() : playlist.fileNames); let i = index" [checked]="false"><div><div class="playlist-item-text">{{playlist_item}}</div> <button (click)="removeContent(i)" class="remove-item-button" mat-icon-button><mat-icon>cancel</mat-icon></button></div></mat-button-toggle>
+        <mat-button-toggle class="media-box" cdkDrag *ngFor="let playlist_item of playlist.fileNames; let i = index" [checked]="false"><div><div class="playlist-item-text">{{playlist_item}}</div> <button (click)="removeContent(i)" class="remove-item-button" mat-icon-button><mat-icon>cancel</mat-icon></button></div></mat-button-toggle>
     </mat-button-toggle-group>
-    
+
+    <div class="add-content-button">
+        <button [disabled]="available_files.length === 0" mat-stroked-button [matMenuTriggerFor]="menu">Add more content</button>
+    </div>
     <mat-menu #menu="matMenu">
         <button *ngFor="let file of available_files" (click)="addContent(file)" mat-menu-item>{{file}}</button>
     </mat-menu>
@@ -34,5 +24,5 @@
 
 <mat-dialog-actions>
     <!-- Save -->
-    <button [disabled]="!playlistChanged()" (click)="updatePlaylist()" [disabled]="playlistChanged()" mat-raised-button color="accent"><ng-container i18n="Save">Save</ng-container></button>
+    <button [disabled]="!playlistChanged()" (click)="updatePlaylist()" [disabled]="playlistChanged()" mat-raised-button color="accent">Save</button>
 </mat-dialog-actions>

src/app/dialogs/modify-playlist/modify-playlist.component.scss

@@ -30,6 +30,11 @@ border: none;
 transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
 }
 
+.add-content-button {
+margin-top: 15px;
+margin-bottom: 10px;
+}
+
 .remove-item-button {
     right: 10px;
     position: absolute;

src/app/dialogs/modify-playlist/modify-playlist.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ModifyPlaylistComponent } from './modify-playlist.component';
 
@@ -6,7 +6,7 @@ describe('ModifyPlaylistComponent', () => {
   let component: ModifyPlaylistComponent;
   let fixture: ComponentFixture<ModifyPlaylistComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ModifyPlaylistComponent ]
     })

src/app/dialogs/modify-playlist/modify-playlist.component.ts

@@ -15,7 +15,6 @@ export class ModifyPlaylistComponent implements OnInit {
   available_files = [];
   all_files = [];
   playlist_updated = false;
-  reverse_order = false;
 
   constructor(@Inject(MAT_DIALOG_DATA) public data: any,
               private postsService: PostsService,
@@ -27,8 +26,6 @@ export class ModifyPlaylistComponent implements OnInit {
       this.original_playlist = JSON.parse(JSON.stringify(this.data.playlist));
       this.getFiles();
     }
-
-    this.reverse_order = localStorage.getItem('default_playlist_order_reversed') === 'true';
   }
 
   getFiles() {
@@ -75,23 +72,11 @@ export class ModifyPlaylistComponent implements OnInit {
   }
 
   removeContent(index) {
-    if (this.reverse_order) {
-      index = this.playlist.fileNames.length - 1 - index;
-    }
     this.playlist.fileNames.splice(index, 1);
     this.processFiles();
   }
 
-  togglePlaylistOrder() {
-    this.reverse_order = !this.reverse_order;
-    localStorage.setItem('default_playlist_order_reversed', '' + this.reverse_order);
-  }
-
   drop(event: CdkDragDrop<string[]>) {
-    if (this.reverse_order) {
-      event.previousIndex = this.playlist.fileNames.length - 1 - event.previousIndex;
-      event.currentIndex = this.playlist.fileNames.length - 1 - event.currentIndex;
-    }
     moveItemInArray(this.playlist.fileNames, event.previousIndex, event.currentIndex);
   }
 

src/app/dialogs/set-default-admin-dialog/set-default-admin-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SetDefaultAdminDialogComponent } from './set-default-admin-dialog.component';
 
@@ -6,7 +6,7 @@ describe('SetDefaultAdminDialogComponent', () => {
   let component: SetDefaultAdminDialogComponent;
   let fixture: ComponentFixture<SetDefaultAdminDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ SetDefaultAdminDialogComponent ]
     })

src/app/dialogs/share-media-dialog/share-media-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ShareMediaDialogComponent } from './share-media-dialog.component';
 
@@ -6,7 +6,7 @@ describe('ShareMediaDialogComponent', () => {
   let component: ShareMediaDialogComponent;
   let fixture: ComponentFixture<ShareMediaDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ShareMediaDialogComponent ]
     })

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

@@ -35,13 +35,6 @@
                     </mat-select>
                 </mat-form-field>
             </div>
-            <div class="col-12 mt-2">
-                <mat-form-field>
-                    <mat-select placeholder="Max quality" i18n-placeholder="Max quality placeholder" [disabled]="audioOnlyMode" [(ngModel)]="maxQuality">
-                        <mat-option *ngFor="let available_quality of available_qualities" [value]="available_quality['value']">{{available_quality['label']}}</mat-option>
-                    </mat-select>
-                </mat-form-field>
-            </div>
             <div class="col-12">
                 <div>
                     <mat-checkbox [(ngModel)]="audioOnlyMode"><ng-container i18n="Streaming-only mode">Audio-only mode</ng-container></mat-checkbox>

src/app/dialogs/subscribe-dialog/subscribe-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SubscribeDialogComponent } from './subscribe-dialog.component';
 
@@ -6,7 +6,7 @@ describe('SubscribeDialogComponent', () => {
   let component: SubscribeDialogComponent;
   let fixture: ComponentFixture<SubscribeDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ SubscribeDialogComponent ]
     })

src/app/dialogs/subscribe-dialog/subscribe-dialog.component.ts

@@ -17,8 +17,6 @@ export class SubscribeDialogComponent implements OnInit {
   url = null;
   name = null;
 
-  maxQuality = 'best';
-
   // state
   subscribing = false;
 
@@ -31,43 +29,12 @@ export class SubscribeDialogComponent implements OnInit {
   customFileOutput = '';
   customArgs = '';
 
-  available_qualities = [
-    {
-      'label': 'Best',
-      'value': 'best'
-    },
-    {
-      'label': '4K',
-      'value': '2160'
-    },
-    {
-      'label': '1440p',
-      'value': '1440'
-    },
-    {
-      'label': '1080p',
-      'value': '1080'
-    },
-    {
-      'label': '720p',
-      'value': '720'
-    },
-    {
-      'label': '480p',
-      'value': '480'
-    },
-    {
-      'label': '360p',
-      'value': '360'
-    }
-  ];
-
   time_units = [
     'day',
     'week',
     'month',
     'year'
-  ];
+  ]
 
   constructor(private postsService: PostsService,
               private snackBar: MatSnackBar,
@@ -90,7 +57,7 @@ export class SubscribeDialogComponent implements OnInit {
       if (!this.download_all) {
         timerange = 'now-' + this.timerange_amount.toString() + this.timerange_unit;
       }
-      this.postsService.createSubscription(this.url, this.name, timerange, this.streamingOnlyMode, this.maxQuality,
+      this.postsService.createSubscription(this.url, this.name, timerange, this.streamingOnlyMode,
                                           this.audioOnlyMode, this.customArgs, this.customFileOutput).subscribe(res => {
         this.subscribing = false;
         if (res['new_sub']) {

src/app/dialogs/subscription-info-dialog/subscription-info-dialog.component.html

@@ -1,4 +1,4 @@
-<h4 mat-dialog-title>{{sub.name}}&nbsp;<ng-container *ngIf="sub.paused" i18n="Paused suffix">(Paused)</ng-container></h4>
+<h4 mat-dialog-title>{{sub.name}}</h4>
 
 <mat-dialog-content>
     <div class="info-item">

src/app/dialogs/subscription-info-dialog/subscription-info-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SubscriptionInfoDialogComponent } from './subscription-info-dialog.component';
 
@@ -6,7 +6,7 @@ describe('SubscriptionInfoDialogComponent', () => {
   let component: SubscriptionInfoDialogComponent;
   let fixture: ComponentFixture<SubscriptionInfoDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ SubscriptionInfoDialogComponent ]
     })

src/app/dialogs/update-progress-dialog/update-progress-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { UpdateProgressDialogComponent } from './update-progress-dialog.component';
 
@@ -6,7 +6,7 @@ describe('UpdateProgressDialogComponent', () => {
   let component: UpdateProgressDialogComponent;
   let fixture: ComponentFixture<UpdateProgressDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ UpdateProgressDialogComponent ]
     })

src/app/dialogs/user-profile-dialog/user-profile-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { UserProfileDialogComponent } from './user-profile-dialog.component';
 
@@ -6,7 +6,7 @@ describe('UserProfileDialogComponent', () => {
   let component: UserProfileDialogComponent;
   let fixture: ComponentFixture<UserProfileDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ UserProfileDialogComponent ]
     })

src/app/dialogs/video-info-dialog/video-info-dialog.component.html

@@ -25,10 +25,6 @@
         <div class="info-item-label"><strong><ng-container i18n="Video upload date property">Upload Date:</ng-container>&nbsp;</strong></div>
         <div class="info-item-value">{{file.upload_date ? file.upload_date : 'N/A'}}</div>
     </div>
-    <div class="info-item">
-        <div class="info-item-label"><strong><ng-container i18n="Category property">Category:</ng-container>&nbsp;</strong></div>
-        <div class="info-item-value"><ng-container *ngIf="file.category"><mat-chip-list><mat-chip>{{file.category.name}}</mat-chip></mat-chip-list></ng-container><ng-container *ngIf="!file.category">N/A</ng-container></div>
-    </div>
 </mat-dialog-content>
 
 <mat-dialog-actions>

src/app/dialogs/video-info-dialog/video-info-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { VideoInfoDialogComponent } from './video-info-dialog.component';
 
@@ -6,7 +6,7 @@ describe('VideoInfoDialogComponent', () => {
   let component: VideoInfoDialogComponent;
   let fixture: ComponentFixture<VideoInfoDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ VideoInfoDialogComponent ]
     })

src/app/download-item/download-item.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DownloadItemComponent } from './download-item.component';
 
@@ -6,7 +6,7 @@ describe('DownloadItemComponent', () => {
   let component: DownloadItemComponent;
   let fixture: ComponentFixture<DownloadItemComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ DownloadItemComponent ]
     })

src/app/file-card/file-card.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { FileCardComponent } from './file-card.component';
 
@@ -6,7 +6,7 @@ describe('FileCardComponent', () => {
   let component: FileCardComponent;
   let fixture: ComponentFixture<FileCardComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ FileCardComponent ]
     })

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

@@ -56,7 +56,7 @@ export class FileCardComponent implements OnInit {
 
   deleteFile(blacklistMode = false) {
     if (!this.playlist) {
-      this.postsService.deleteFile(this.uid, this.isAudio ? 'audio' : 'video', blacklistMode).subscribe(result => {
+      this.postsService.deleteFile(this.uid, this.isAudio, blacklistMode).subscribe(result => {
         if (result) {
           this.openSnackBar('Delete success!', 'OK.');
           this.removeFile.emit(this.name);

src/app/http.interceptor.ts

@@ -1,34 +0,0 @@
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { Router } from '@angular/router';
-import { Observable, throwError } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-
-@Injectable()
-export class H401Interceptor implements HttpInterceptor {
-
-    constructor(private router: Router, private snackBar: MatSnackBar) { }
-
-    intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-        return next.handle(request).pipe(catchError(err => {
-            if (err.status === 401) {
-                localStorage.setItem('jwt_token', null);
-                if (this.router.url !== '/login') {
-                    this.router.navigate(['/login']).then(() => {
-                        this.openSnackBar('Login expired, please login again.');
-                    });
-                }
-            }
-
-            const error = err.error.message || err.statusText;
-            return throwError(error);
-        }));
-    }
-
-    public openSnackBar(message: string, action: string = '') {
-        this.snackBar.open(message, action, {
-          duration: 2000,
-        });
-      }
-}

src/app/input-dialog/input-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { InputDialogComponent } from './input-dialog.component';
 
@@ -6,7 +6,7 @@ describe('InputDialogComponent', () => {
   let component: InputDialogComponent;
   let fixture: ComponentFixture<InputDialogComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ InputDialogComponent ]
     })

src/app/main/main.component.html

@@ -182,8 +182,97 @@
 </ng-template>
 
 <ng-container *ngIf="cachedFileManagerEnabled || fileManagerEnabled">
-    <app-recent-videos #recentVideos></app-recent-videos>
+    <app-recent-videos></app-recent-videos>
     <br/>
     <h4 style="text-align: center">Custom playlists</h4>
     <app-custom-playlists></app-custom-playlists>
 </ng-container>
+
+<!--<div style="margin: 20px" *ngIf="fileManagerEnabled && (!postsService.isLoggedIn || postsService.permissions.includes('filemanager'))">
+    <mat-accordion>
+        <mat-expansion-panel (opened)="accordionOpened('audio')" (closed)="accordionClosed('audio')" (mouseleave)="accordionLeft('audio')" (mouseenter)="accordionEntered('audio')" class="big">
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <ng-container i18n="Audio files title">
+                        Audio
+                    </ng-container>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <ng-container i18n="Audio files description">
+                        Your audio files are here
+                    </ng-container>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+            <div *ngIf="mp3s.length > 0;else nomp3s">
+                <mat-grid-list style="margin-bottom: 15px;" (window:resize)="onResize($event)" [cols]="files_cols" rowHeight="150px">
+                    <mat-grid-tile *ngFor="let file of mp3s; index as i;">
+                        <app-file-card #audiofilecard (removeFile)="removeFromMp3($event)" [file]="file" [title]="file.title" [name]="file.id" [uid]="file.uid" [thumbnailURL]="file.thumbnailURL"
+                                [length]="file.duration" [isAudio]="true" [use_youtubedl_archive]="use_youtubedl_archive"></app-file-card>
+                        <mat-progress-bar *ngIf="downloading_content['audio'][file.id]" class="download-progress-bar" mode="indeterminate"></mat-progress-bar>
+                    </mat-grid-tile>
+                </mat-grid-list>
+                <mat-divider></mat-divider>
+                <div style="width: 100%; text-align: center; margin-top: 10px;">
+                    <h6 i18n="Playlists title">Playlists</h6>
+                </div>
+                <mat-grid-list *ngIf="playlists.audio.length > 0" (window:resize)="onResize($event)" [cols]="files_cols" rowHeight="150px">
+                    <mat-grid-tile *ngFor="let playlist of playlists.audio; let i = index;">
+                        <app-file-card #audiofilecard (removeFile)="removePlaylistMp3(playlist.id, i)" [title]="playlist.name" [name]="playlist.id" [thumbnailURL]="playlist_thumbnails[playlist.id]"
+                            [length]="null" [isAudio]="true" [playlist]="playlist" [count]="playlist.fileNames.length" [use_youtubedl_archive]="use_youtubedl_archive"></app-file-card>
+                        <mat-progress-bar *ngIf="downloading_content['audio'][playlist.id]" class="download-progress-bar" mode="indeterminate"></mat-progress-bar>
+                    </mat-grid-tile>
+                </mat-grid-list>
+                <div class="add-playlist-button"><button (click)="openCreatePlaylistDialog('audio')" mat-fab><mat-icon>add</mat-icon></button></div>
+                <div *ngIf="playlists.audio.length === 0">
+                    <ng-container i18n="No video playlists available text">
+                        No playlists available. Create one from your downloading audio files by clicking the blue plus button.
+                    </ng-container>
+                </div>
+            </div>
+
+        </mat-expansion-panel>
+        <mat-expansion-panel (opened)="accordionOpened('video')" (closed)="accordionClosed('video')" (mouseleave)="accordionLeft('video')" (mouseenter)="accordionEntered('video')" class="big">
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <ng-container i18n="Video files title">
+                        Video
+                    </ng-container>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <ng-container i18n="Video files description">
+                        Your video files are here
+                    </ng-container>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+            <div *ngIf="mp4s.length > 0;else nomp4s">
+                <mat-grid-list style="margin-bottom: 15px;" (window:resize)="onResize($event)" [cols]="files_cols" rowHeight="150px">
+                    <mat-grid-tile *ngFor="let file of mp4s; index as i;">
+                        <app-file-card #videofilecard (removeFile)="removeFromMp4($event)" [file]="file" [title]="file.title" [name]="file.id" [uid]="file.uid" [thumbnailURL]="file.thumbnailURL"
+                            [length]="file.duration" [isAudio]="false" [use_youtubedl_archive]="use_youtubedl_archive"></app-file-card>
+                        <mat-progress-bar *ngIf="downloading_content['video'][file.id]" class="download-progress-bar" mode="indeterminate"></mat-progress-bar>
+                    </mat-grid-tile>
+                </mat-grid-list>
+                <mat-divider></mat-divider>
+
+                <div style="width: 100%; text-align: center; margin-top: 10px;">
+                    <h6 i18n="Playlists title">Playlists</h6>
+                </div>
+                <mat-grid-list *ngIf="playlists.video.length > 0" (window:resize)="onResize($event)" [cols]="files_cols" rowHeight="150px">
+                    <mat-grid-tile *ngFor="let playlist of playlists.video; let i = index;">
+                        <app-file-card #videofilecard (removeFile)="removePlaylistMp4(playlist.id, i)" [title]="playlist.name" [name]="playlist.id" [thumbnailURL]="playlist_thumbnails[playlist.id]"
+                            [length]="null" [isAudio]="false" [playlist]="playlist" [count]="playlist.fileNames.length" [use_youtubedl_archive]="use_youtubedl_archive"></app-file-card>
+                        <mat-progress-bar *ngIf="downloading_content['video'][playlist.id]" class="download-progress-bar" mode="indeterminate"></mat-progress-bar>
+                    </mat-grid-tile>
+                </mat-grid-list>
+        
+                <!-- Add video playlist button --<
+                <div class="add-playlist-button"><button (click)="openCreatePlaylistDialog('video')" mat-fab><mat-icon>add</mat-icon></button></div>
+                <div *ngIf="playlists.video.length === 0">
+                    <ng-container i18n="No video playlists available text">
+                        No playlists available. Create one from your downloading video files by clicking the blue plus button.
+                    </ng-container>
+                </div>
+            </div>
+        </mat-expansion-panel>
+    </mat-accordion>
+</div>-->

src/app/main/main.component.spec.ts

@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MainComponent } from './main.component';
 
@@ -6,7 +6,7 @@ describe('MainComponent', () => {
   let component: MainComponent;
   let fixture: ComponentFixture<MainComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ MainComponent ]
     })

src/app/main/main.component.ts

@@ -1,17 +1,25 @@
 import { Component, OnInit, ElementRef, ViewChild, ViewChildren, QueryList } from '@angular/core';
 import {PostsService} from '../posts.services';
 import {FileCardComponent} from '../file-card/file-card.component';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 import {FormControl, Validators} from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { saveAs } from 'file-saver';
+import 'rxjs/add/observable/of';
+import 'rxjs/add/operator/mapTo';
+import 'rxjs/add/operator/toPromise';
+import 'rxjs/add/observable/fromEvent'
+import 'rxjs/add/operator/filter'
+import 'rxjs/add/operator/debounceTime'
+import 'rxjs/add/operator/do'
+import 'rxjs/add/operator/switch'
 import { YoutubeSearchService, Result } from '../youtube-search.service';
 import { Router, ActivatedRoute } from '@angular/router';
+import { CreatePlaylistComponent } from 'app/create-playlist/create-playlist.component';
 import { Platform } from '@angular/cdk/platform';
 import { v4 as uuid } from 'uuid';
 import { ArgModifierDialogComponent } from 'app/dialogs/arg-modifier-dialog/arg-modifier-dialog.component';
-import { RecentVideosComponent } from 'app/components/recent-videos/recent-videos.component';
 
 export let audioFilesMouseHovering = false;
 export let videoFilesMouseHovering = false;
@@ -192,7 +200,6 @@ export class MainComponent implements OnInit {
   formats_loading = false;
 
   @ViewChild('urlinput', { read: ElementRef }) urlInput: ElementRef;
-  @ViewChild('recentVideos') recentVideos: RecentVideosComponent;
   @ViewChildren('audiofilecard') audioFileCards: QueryList<FileCardComponent>;
   @ViewChildren('videofilecard') videoFileCards: QueryList<FileCardComponent>;
   last_valid_url = '';
@@ -243,6 +250,13 @@ export class MainComponent implements OnInit {
     this.useDefaultDownloadingAgent = this.postsService.config['Advanced']['use_default_downloading_agent'];
     this.customDownloadingAgent = this.postsService.config['Advanced']['custom_downloading_agent'];
 
+
+
+    if (this.fileManagerEnabled) {
+      this.getMp3s();
+      this.getMp4s();
+    }
+
     if (this.youtubeSearchEnabled && this.youtubeAPIKey) {
       this.youtubeSearch.initializeAPI(this.youtubeAPIKey);
       this.attachToInput();
@@ -327,6 +341,61 @@ export class MainComponent implements OnInit {
     this.setCols();
   }
 
+  // file manager stuff
+
+  getMp3s() {
+    this.postsService.getMp3s().subscribe(result => {
+      const mp3s = result['mp3s'];
+      const playlists = result['playlists'];
+      // if they are different
+      if (JSON.stringify(this.mp3s) !== JSON.stringify(mp3s)) { this.mp3s = mp3s };
+      this.playlists.audio = playlists;
+
+      // get thumbnail url by using first video. this is a temporary hack
+      for (let i = 0; i < this.playlists.audio.length; i++) {
+        const playlist = this.playlists.audio[i];
+        let videoToExtractThumbnail = null;
+        for (let j = 0; j < this.mp3s.length; j++) {
+          if (this.mp3s[j].id === playlist.fileNames[0]) {
+            // found the corresponding file
+            videoToExtractThumbnail = this.mp3s[j];
+          }
+        }
+
+        if (videoToExtractThumbnail) { this.playlist_thumbnails[playlist.id] = videoToExtractThumbnail.thumbnailURL; }
+      }
+    }, error => {
+      console.log(error);
+    });
+  }
+
+  getMp4s() {
+    this.postsService.getMp4s().subscribe(result => {
+      const mp4s = result['mp4s'];
+      const playlists = result['playlists'];
+      // if they are different
+      if (JSON.stringify(this.mp4s) !== JSON.stringify(mp4s)) { this.mp4s = mp4s };
+      this.playlists.video = playlists;
+
+      // get thumbnail url by using first video. this is a temporary hack
+      for (let i = 0; i < this.playlists.video.length; i++) {
+        const playlist = this.playlists.video[i];
+        let videoToExtractThumbnail = null;
+        for (let j = 0; j < this.mp4s.length; j++) {
+          if (this.mp4s[j].id === playlist.fileNames[0]) {
+            // found the corresponding file
+            videoToExtractThumbnail = this.mp4s[j];
+          }
+        }
+
+        if (videoToExtractThumbnail) { this.playlist_thumbnails[playlist.id] = videoToExtractThumbnail.thumbnailURL; }
+      }
+    },
+    error => {
+      console.log(error);
+    });
+  }
+
   public setCols() {
     if (window.innerWidth <= 350) {
       this.files_cols = 1;
@@ -374,13 +443,50 @@ export class MainComponent implements OnInit {
     return null;
   }
 
+  public removeFromMp3(name: string) {
+    for (let i = 0; i < this.mp3s.length; i++) {
+      if (this.mp3s[i].id === name || this.mp3s[i].id + '.mp3' === name) {
+        this.mp3s.splice(i, 1);
+      }
+    }
+    this.getMp3s();
+  }
+
+  public removePlaylistMp3(playlistID, index) {
+    this.postsService.removePlaylist(playlistID, 'audio').subscribe(res => {
+      if (res['success']) {
+        this.playlists.audio.splice(index, 1);
+        this.openSnackBar('Playlist successfully removed.', '');
+      }
+      this.getMp3s();
+    });
+  }
+
+  public removeFromMp4(name: string) {
+    for (let i = 0; i < this.mp4s.length; i++) {
+      if (this.mp4s[i].id === name || this.mp4s[i].id + '.mp4' === name) {
+        this.mp4s.splice(i, 1);
+      }
+    }
+    this.getMp4s();
+  }
+
+  public removePlaylistMp4(playlistID, index) {
+    this.postsService.removePlaylist(playlistID, 'video').subscribe(res => {
+      if (res['success']) {
+        this.playlists.video.splice(index, 1);
+        this.openSnackBar('Playlist successfully removed.', '');
+      }
+      this.getMp4s();
+    });
+  }
+
   // download helpers
 
   downloadHelperMp3(name, uid, is_playlist = false, forceView = false, new_download = null, navigate_mode = false) {
     this.downloadingfile = false;
     if (this.multiDownloadMode && !this.downloadOnlyMode && !navigate_mode) {
       // do nothing
-      this.reloadRecentVideos();
     } else {
       // if download only mode, just download the file. no redirect
       if (forceView === false && this.downloadOnlyMode && !this.iOS) {
@@ -390,7 +496,6 @@ export class MainComponent implements OnInit {
         } else {
           this.downloadAudioFile(decodeURI(name));
         }
-        this.reloadRecentVideos();
       } else {
         localStorage.setItem('player_navigator', this.router.url.split(';')[0]);
         if (is_playlist) {
@@ -403,13 +508,22 @@ export class MainComponent implements OnInit {
 
     // remove download from current downloads
     this.removeDownloadFromCurrentDownloads(new_download);
+
+    // reloads mp3s
+    if (this.fileManagerEnabled) {
+      this.getMp3s();
+      setTimeout(() => {
+        this.audioFileCards.forEach(filecard => {
+          filecard.onHoverResponse();
+        });
+      }, 200);
+    }
   }
 
   downloadHelperMp4(name, uid, is_playlist = false, forceView = false, new_download = null, navigate_mode = false) {
     this.downloadingfile = false;
     if (this.multiDownloadMode && !this.downloadOnlyMode && !navigate_mode) {
       // do nothing
-      this.reloadRecentVideos();
     } else {
       // if download only mode, just download the file. no redirect
       if (forceView === false && this.downloadOnlyMode) {
@@ -419,7 +533,6 @@ export class MainComponent implements OnInit {
         } else {
           this.downloadVideoFile(decodeURI(name));
         }
-        this.reloadRecentVideos();
       } else {
         localStorage.setItem('player_navigator', this.router.url.split(';')[0]);
         if (is_playlist) {
@@ -432,6 +545,16 @@ export class MainComponent implements OnInit {
 
     // remove download from current downloads
     this.removeDownloadFromCurrentDownloads(new_download);
+
+    // reloads mp4s
+    if (this.fileManagerEnabled) {
+      this.getMp4s();
+      setTimeout(() => {
+        this.videoFileCards.forEach(filecard => {
+          filecard.onHoverResponse();
+        });
+      }, 200);
+    }
   }
 
   // download click handler
@@ -623,7 +746,9 @@ export class MainComponent implements OnInit {
 
       if (!this.fileManagerEnabled) {
         // tell server to delete the file once downloaded
-        this.postsService.deleteFile(name, 'video').subscribe(delRes => {
+        this.postsService.deleteFile(name, true).subscribe(delRes => {
+          // reload mp3s
+          this.getMp3s();
         });
       }
     });
@@ -638,7 +763,9 @@ export class MainComponent implements OnInit {
 
       if (!this.fileManagerEnabled) {
         // tell server to delete the file once downloaded
-        this.postsService.deleteFile(name, 'audio').subscribe(delRes => {
+        this.postsService.deleteFile(name, false).subscribe(delRes => {
+          // reload mp4s
+          this.getMp4s();
         });
       }
     });
@@ -985,6 +1112,25 @@ export class MainComponent implements OnInit {
     }
   }
 
+  // creating a playlist
+  openCreatePlaylistDialog(type) {
+    const dialogRef = this.dialog.open(CreatePlaylistComponent, {
+      data: {
+        filesToSelectFrom: (type === 'audio') ? this.mp3s : this.mp4s,
+        type: type
+      }
+    });
+    dialogRef.afterClosed().subscribe(result => {
+      if (result) {
+        if (type === 'audio') { this.getMp3s() };
+        if (type === 'video') { this.getMp4s() };
+        this.openSnackBar('Successfully created playlist!', '');
+      } else if (result === false) {
+        this.openSnackBar('ERROR: failed to create playlist!', '');
+      }
+    });
+  }
+
   // modify custom args
   openArgsModifierDialog() {
     const dialogRef = this.dialog.open(ArgModifierDialogComponent, {
@@ -1015,10 +1161,4 @@ export class MainComponent implements OnInit {
       }
     });
   }
-
-  reloadRecentVideos() {
-    if (this.recentVideos) {
-      this.recentVideos.getAllFiles();
-    }
-  }
 }