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

Dockerfile

@@ -21,9 +21,6 @@ ENV UID=1000 \
   GID=1000 \
   USER=youtube
 
-ENV NO_UPDATE_NOTIFIER=true
-ENV FOREVER_ROOT=/app/.forever
-
 RUN addgroup -S $USER -g $GID && adduser -D -S $USER -G $USER -u $UID
 
 RUN apk add --no-cache \
@@ -36,7 +33,6 @@ RUN apk add --no-cache \
 
 WORKDIR /app
 COPY --chown=$UID:$GID [ "backend/package.json", "backend/package-lock.json", "/app/" ]
-RUN npm install forever -g
 RUN npm install && chown -R $UID:$GID ./
 
 COPY --chown=$UID:$GID --from=frontend [ "/build/backend/public/", "/app/public/" ]
@@ -44,4 +40,4 @@ COPY --chown=$UID:$GID [ "/backend/", "/app/" ]
 
 EXPOSE 17442
 ENTRYPOINT [ "/app/entrypoint.sh" ]
-CMD [ "forever", "app.js" ]
+CMD [ "node", "app.js" ]

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 unzip python npm
 ```
-
-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/",
@@ -54,12 +48,7 @@
         "searchFilter": "(uid={{username}})"
       }
     },
-    "Database": {
-      "use_local_db": false,
-      "mongodb_connection_string": "mongodb://127.0.0.1:27017/?compressors=zlib"
-    },
     "Advanced": {
-      "default_downloader": "youtube-dl",
       "use_default_downloading_agent": true,
       "custom_downloading_agent": "",
       "multi_user_mode": false,

backend/authentication/auth.js

@@ -1,10 +1,12 @@
 const path = require('path');
 const config_api = require('../config');
 const consts = require('../consts');
+var subscriptions_api = require('../subscriptions')
 const fs = require('fs-extra');
-const jwt = require('jsonwebtoken');
+var jwt = require('jsonwebtoken');
 const { uuid } = require('uuidv4');
-const bcrypt = require('bcryptjs');
+var bcrypt = require('bcryptjs');
+
 
 var LocalStrategy = require('passport-local').Strategy;
 var LdapStrategy = require('passport-ldapauth');
@@ -13,15 +15,15 @@ var JwtStrategy = require('passport-jwt').Strategy,
 
 // other required vars
 let logger = null;
-let db_api = null;
+var users_db = null;
 let SERVER_SECRET = null;
 let JWT_EXPIRATION = null;
 let opts = null;
 let saltRounds = null;
 
-exports.initialize = function(db_api, input_logger) {
+exports.initialize = function(input_users_db, input_logger) {
   setLogger(input_logger)
-  setDB(db_api);
+  setDB(input_users_db);
 
   /*************************
    * Authentication module
@@ -31,19 +33,21 @@ exports.initialize = function(db_api, input_logger) {
   JWT_EXPIRATION = config_api.getConfigItem('ytdl_jwt_expiration');
 
   SERVER_SECRET = null;
-  if (db_api.users_db.get('jwt_secret').value()) {
-    SERVER_SECRET = db_api.users_db.get('jwt_secret').value();
+  if (users_db.get('jwt_secret').value()) {
+    SERVER_SECRET = users_db.get('jwt_secret').value();
   } else {
     SERVER_SECRET = uuid();
-    db_api.users_db.set('jwt_secret', SERVER_SECRET).write();
+    users_db.set('jwt_secret', SERVER_SECRET).write();
   }
 
   opts = {}
   opts.jwtFromRequest = ExtractJwt.fromUrlQueryParameter('jwt');
   opts.secretOrKey = SERVER_SECRET;
+  /*opts.issuer = 'example.com';
+  opts.audience = 'example.com';*/
 
-  exports.passport.use(new JwtStrategy(opts, async function(jwt_payload, done) {
-    const user = await db_api.getRecord('users', {uid: jwt_payload.user});
+  exports.passport.use(new JwtStrategy(opts, function(jwt_payload, done) {
+    const user = users_db.get('users').find({uid: jwt_payload.user}).value();
     if (user) {
         return done(null, user);
     } else {
@@ -57,8 +61,8 @@ function setLogger(input_logger) {
   logger = input_logger;
 }
 
-function setDB(input_db_api) {
-  db_api = input_db_api;
+function setDB(input_users_db) {
+  users_db = input_users_db;
 }
 
 exports.passport = require('passport');
@@ -74,7 +78,7 @@ exports.passport.deserializeUser(function(user, done) {
 /***************************************
  * Register user with hashed password
  **************************************/
-exports.registerUser = async function(req, res) {
+exports.registerUser = function(req, res) {
   var userid = req.body.userid;
   var username = req.body.username;
   var plaintextPassword = req.body.password;
@@ -85,27 +89,21 @@ exports.registerUser = async 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(async function(hash) {
+    .then(function(hash) {
       let new_user = generateUserObject(userid, username, hash);
       // check if user exists
-      if (await db_api.getRecord('users', {uid: userid})) {
+      if (users_db.get('users').find({uid: userid}).value()) {
         // user id is taken!
         logger.error('Registration failed: UID is already taken!');
         res.status(409).send('UID is already taken!');
-      } else if (await db_api.getRecord('users', {name: username})) {
+      } else if (users_db.get('users').find({name: username}).value()) {
           // user name is taken!
           logger.error('Registration failed: User name is already taken!');
           res.status(409).send('User name is already taken!');
       } else {
         // add to db
-        await db_api.insertRecordIntoTable('users', new_user);
+        users_db.get('users').push(new_user).write();
         logger.verbose(`New user created: ${new_user.name}`);
         res.send({
           user: new_user
@@ -138,18 +136,16 @@ exports.registerUser = async function(req, res) {
  ************************************************/
 
 
-exports.login = async (username, password) => {
-  const user = await db_api.getRecord('users', {name: username});
-  if (!user) { logger.error(`User ${username} not found`); false }
-  if (user.auth_method && user.auth_method !== 'internal') { return false }
-  return await bcrypt.compare(password, user.passhash) ? user : false;
-}
-
 exports.passport.use(new LocalStrategy({
     usernameField: 'username',
     passwordField: 'password'},
-    async function(username, password, done) {
-      return done(null, await exports.login(username, password));
+    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, bcrypt.compareSync(password, user.passhash) ? user : false);
+        }
     }
 ));
 
@@ -160,17 +156,17 @@ var getLDAPConfiguration = function(req, callback) {
 };
 
 exports.passport.use(new LdapStrategy(getLDAPConfiguration,
-  async function(user, done) {
+  function(user, done) {
     // 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 = await db_api.getRecord('users', {uid: user_uid});
+    let db_user = users_db.get('users').find({uid: user_uid}).value();
     if (!db_user) {
       // generate DB user
       let new_user = generateUserObject(user_uid, user_uid, null, 'ldap');
-      await db_api.insertRecordIntoTable('users', new_user);
+      users_db.get('users').push(new_user).write();
       db_user = new_user;
       logger.verbose(`Generated new user ${user_uid} using LDAP`);
     }
@@ -194,11 +190,11 @@ exports.generateJWT = function(req, res, next) {
   next();
 }
 
-exports.returnAuthResponse = async function(req, res) {
+exports.returnAuthResponse = function(req, res) {
   res.status(200).json({
     user: req.user,
     token: req.token,
-    permissions: await exports.userPermissions(req.user.uid),
+    permissions: exports.userPermissions(req.user.uid),
     available_permissions: consts['AVAILABLE_PERMISSIONS']
   });
 }
@@ -211,7 +207,7 @@ exports.returnAuthResponse = async function(req, res) {
  * It also passes the user object to the next
  * middleware through res.locals
  **************************************/
-exports.ensureAuthenticatedElseError = (req, res, next) => {
+exports.ensureAuthenticatedElseError = function(req, res, next) {
   var token = getToken(req.query);
   if( token ) {
     try {
@@ -229,26 +225,29 @@ exports.ensureAuthenticatedElseError = (req, res, next) => {
 }
 
 // change password
-exports.changeUserPassword = async (user_uid, new_pass) => {
-  try {
-    const hash = await bcrypt.hash(new_pass, saltRounds);
-    await db_api.updateRecord('users', {uid: user_uid}, {passhash: hash});
-    return true;
-  } catch (err) {
-    return false;
-  }
+exports.changeUserPassword = async function(user_uid, new_pass) {
+  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
-exports.changeUserPermissions = async (user_uid, permission, new_value) => {
+exports.changeUserPermissions = function(user_uid, permission, new_value) {
   try {
-    await db_api.pullFromRecordsArray('users', {uid: user_uid}, 'permissions', permission);
-    await db_api.pullFromRecordsArray('users', {uid: user_uid}, 'permission_overrides', permission);
+    const user_db_obj = users_db.get('users').find({uid: user_uid});
+    user_db_obj.get('permissions').pull(permission).write();
+    user_db_obj.get('permission_overrides').pull(permission).write();
     if (new_value === 'yes') {
-      await db_api.pushToRecordsArray('users', {uid: user_uid}, 'permissions', permission);
-      await db_api.pushToRecordsArray('users', {uid: user_uid}, 'permission_overrides', permission);
+      user_db_obj.get('permissions').push(permission).write();
+      user_db_obj.get('permission_overrides').push(permission).write();
     } else if (new_value === 'no') {
-      await db_api.pushToRecordsArray('users', {uid: user_uid}, 'permission_overrides', permission);
+      user_db_obj.get('permission_overrides').push(permission).write();
     }
     return true;
   } catch (err) {
@@ -258,11 +257,12 @@ exports.changeUserPermissions = async (user_uid, permission, new_value) => {
 }
 
 // change role permissions
-exports.changeRolePermissions = async (role, permission, new_value) => {
+exports.changeRolePermissions = function(role, permission, new_value) {
   try {
-    await db_api.pullFromRecordsArray('roles', {key: role}, 'permissions', permission);
+    const role_db_obj = users_db.get('roles').get(role);
+    role_db_obj.get('permissions').pull(permission).write();
     if (new_value === 'yes') {
-      await db_api.pushToRecordsArray('roles', {key: role}, 'permissions', permission);
+      role_db_obj.get('permissions').push(permission).write();
     }
     return true;
   } catch (err) {
@@ -271,42 +271,68 @@ exports.changeRolePermissions = async (role, permission, new_value) => {
   }
 }
 
-exports.adminExists = async function() {
-  return !!(await db_api.getRecord('users', {uid: 'admin'}));
+exports.adminExists = function() {
+  return !!users_db.get('users').find({uid: 'admin'}).value();
 }
 
 // video stuff
 
-exports.getUserVideos = async function(user_uid, type) {
-    const files = await db_api.getRecords('files', {user_uid: user_uid});
-    return type ? files.filter(file => file.isAudio === (type === 'audio')) : files;
+exports.getUserVideos = function(user_uid, type) {
+    const user = users_db.get('users').find({uid: user_uid}).value();
+    return user['files'][type];
 }
 
-exports.getUserVideo = async function(user_uid, file_uid, requireSharing = false) {
-  let file = await db_api.getRecord('files', {file_uid: file_uid});
+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.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.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.removePlaylist = async function(user_uid, playlistID) {
-  await db_api.removeRecord('playlist', {playlistID: playlistID});
+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.getUserPlaylists = async function(user_uid, user_files = null) {
-  return await db_api.getRecords('playlists', {user_uid: user_uid});
+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.getUserPlaylist = async function(user_uid, playlistID, requireSharing = false) {
-  let playlist = await db_api.getRecord('playlists', {id: playlistID});
+exports.getUserPlaylists = function(user_uid, type) {
+  const user = users_db.get('users').find({uid: user_uid}).value();
+  return user['playlists'][type];
+}
+
+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;
@@ -314,23 +340,108 @@ exports.getUserPlaylist = async function(user_uid, playlistID, requireSharing =
   return playlist;
 }
 
-exports.changeSharingMode = async function(user_uid, file_uid, is_playlist, enabled) {
+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.${type}`)
+      .push(file_object)
+      .write();
+}
+
+exports.deleteUserFile = function(user_uid, file_uid, type, blacklistMode = false) {
   let success = false;
-  is_playlist ? await db_api.updateRecord(`playlists`, {id: file_uid}, {sharingEnabled: enabled}) : await db_api.updateRecord(`files`, {uid: file_uid}, {sharingEnabled: enabled});
-  success = true;
+  const file_obj = users_db.get('users').find({uid: user_uid}).get(`files.${type}`).find({uid: file_uid}).value();
+  if (file_obj) {
+    const usersFileFolder = config_api.getConfigItem('ytdl_users_base_path');
+    const ext = type === 'audio' ? '.mp3' : '.mp4';
+
+    // close descriptors
+    if (config_api.descriptors[file_obj.id]) {
+      try {
+          for (let i = 0; i < config_api.descriptors[file_obj.id].length; i++) {
+            config_api.descriptors[file_obj.id][i].destroy();
+          }
+      } catch(e) {
+
+      }
+    }
+
+    const full_path = path.join(usersFileFolder, user_uid, type, file_obj.id + ext);
+    users_db.get('users').find({uid: user_uid}).get(`files.${type}`)
+      .remove({
+          uid: file_uid
+      }).write();
+    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 (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);
+      }
+
+      fs.unlinkSync(full_path);
+
+      // do archive stuff
+
+      let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
+      if (useYoutubeDLArchive) {
+          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 (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;
+                fs.appendFileSync(blacklistPath, line);
+              }
+          } else {
+              logger.info(`Could not find archive file for ${type} files. Creating...`);
+              fs.ensureFileSync(archive_path);
+          }
+      }
+    }
+    success = true;
+  } else {
+    success = false;
+    logger.warn(`User file ${file_uid} does not exist!`);
+  }
+
   return success;
 }
 
-exports.userHasPermission = async function(user_uid, permission) {
+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.${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();
+    }
+  }
 
-  const user_obj = await db_api.getRecord('users', ({uid: user_uid}));
+  return success;
+}
+
+exports.userHasPermission = function(user_uid, permission) {
+  const user_obj = users_db.get('users').find({uid: user_uid}).value();
   const role = user_obj['role'];
   if (!role) {
     // role doesn't exist
     logger.error('Invalid role ' + role);
     return false;
   }
-  const role_permissions = (await db_api.getRecords('roles'))['permissions'];
+  const role_permissions = (users_db.get('roles').value())['permissions'];
 
   const user_has_explicit_permission = user_obj['permissions'].includes(permission);
   const permission_in_overrides = user_obj['permission_overrides'].includes(permission);
@@ -353,17 +464,16 @@ exports.userHasPermission = async function(user_uid, permission) {
   }
 }
 
-exports.userPermissions = async function(user_uid) {
+exports.userPermissions = function(user_uid) {
   let user_permissions = [];
-  const user_obj = await db_api.getRecord('users', ({uid: user_uid}));
+  const user_obj = users_db.get('users').find({uid: user_uid}).value();
   const role = user_obj['role'];
   if (!role) {
     // role doesn't exist
     logger.error('Invalid role ' + role);
     return null;
   }
-  const role_obj = await db_api.getRecord('roles', {key: role});
-  const role_permissions = role_obj['permissions'];
+  const role_permissions = users_db.get('roles').get(role).get('permissions').value()
 
   for (let i = 0; i < consts['AVAILABLE_PERMISSIONS'].length; i++) {
     let permission = consts['AVAILABLE_PERMISSIONS'][i];
@@ -409,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,149 +0,0 @@
-const config_api = require('./config');
-const utils = require('./utils');
-
-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 = await getCategories();
-    if (!categories) {
-        logger.warn('Categories could not be found.');
-        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[j];
-            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;
-}
-
-async function getCategories() {
-    const categories = await db_api.getRecords('categories');
-    return categories ? categories : null;
-}
-
-async function getCategoriesAsPlaylists(files = null) {
-    const categories_as_playlists = [];
-    const available_categories = await getCategories();
-    if (available_categories && files) {
-        for (category of available_categories) {
-            const files_that_match = utils.addUIDsToCategory(category, files);
-            if (files_that_match && files_that_match.length > 0) {
-                category['thumbnailURL'] = files_that_match[0].thumbnailURL;
-                category['thumbnailPath'] = files_that_match[0].thumbnailPath;
-                category['duration'] = files_that_match.reduce((a, b) => a + utils.durationStringToNumber(b.duration), 0);
-                category['id'] = category['uid'];
-                categories_as_playlists.push(category);
-            }
-        }
-    }
-    return categories_as_playlists;
-}
-
-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']].toLowerCase().includes(rule['value'].toLowerCase());
-                break;
-            case 'not_includes':
-                rule_applies = !(file_json[rule['property']].toLowerCase().includes(rule['value'].toLowerCase()));
-                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,
-    getCategories: getCategories,
-    getCategoriesAsPlaylists: getCategoriesAsPlaylists
-}

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/",
@@ -231,12 +225,7 @@ DEFAULT_CONFIG = {
             "searchFilter": "(uid={{username}})"
         }
       },
-      "Database": {
-        "use_local_db": false,
-        "mongodb_connection_string": "mongodb://127.0.0.1:27017/?compressors=zlib"
-      },
       "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': {
@@ -153,21 +129,7 @@ let CONFIG_ITEMS = {
         'path': 'YoutubeDLMaterial.Users.ldap_config'
     },
 
-    // Database
-    'ytdl_use_local_db': {
-        'key': 'ytdl_use_local_db',
-        'path': 'YoutubeDLMaterial.Database.use_local_db'
-    },
-    'ytdl_mongodb_connection_string': {
-        'key': 'ytdl_mongodb_connection_string',
-        'path': 'YoutubeDLMaterial.Database.mongodb_connection_string'
-    },
-
     // 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'
@@ -210,5 +172,5 @@ AVAILABLE_PERMISSIONS = [
 module.exports = {
     CONFIG_ITEMS: CONFIG_ITEMS,
     AVAILABLE_PERMISSIONS: AVAILABLE_PERMISSIONS,
-    CURRENT_VERSION: 'v4.2'
+    CURRENT_VERSION: 'v4.1'
 }

backend/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 
-CMD="forever app.js"
+CMD="node app.js"
 
 # if the first arg starts with "-" pass it to program
 if [ "${1#-}" != "$1" ]; then

backend/package.json

@@ -5,8 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "nodemon app.js",
-    "debug": "set YTDL_MODE=debug && node app.js"
+    "start": "nodemon -q app.js"
   },
   "nodemonConfig": {
     "ignore": [
@@ -15,8 +14,7 @@
       "public/*"
     ],
     "watch": [
-      "restart_update.json",
-      "restart_general.json"
+      "restart.json"
     ]
   },
   "repository": {
@@ -32,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",
@@ -45,13 +42,10 @@
     "lowdb": "^1.0.0",
     "md5": "^2.2.1",
     "merge-files": "^0.1.2",
-    "mocha": "^8.4.0",
-    "moment": "^2.29.1",
-    "mongodb": "^3.6.9",
     "multer": "^1.4.2",
     "node-fetch": "^2.6.1",
     "node-id3": "^0.1.14",
-    "nodemon": "^2.0.7",
+    "nodemon": "^2.0.2",
     "passport": "^0.4.1",
     "passport-http": "^0.3.0",
     "passport-jwt": "^4.0.0",

backend/subscriptions.js

@@ -6,21 +6,20 @@ 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';
 
 var logger = null;
 var db = null;
 var users_db = null;
-let db_api = null;
+var db_api = null;
 
-function setDB(input_db_api) { db_api = input_db_api }
+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_api, input_logger) {
-    setDB(input_db_api);
+function initialize(input_db, input_users_db, input_logger, input_db_api) {
+    setDB(input_db, input_users_db, input_db_api);
     setLogger(input_logger);
 }
 
@@ -34,7 +33,12 @@ async function subscribe(sub, user_uid = null) {
         sub.isPlaylist = sub.url.includes('playlist');
         sub.videos = [];
 
-        let url_exists = !!(await db_api.getRecord('subscriptions', {url: sub.url, user_uid: user_uid}));
+        let url_exists = false;
+
+        if (user_uid)
+            url_exists = !!users_db.get('users').find({uid: user_uid}).get('subscriptions').find({url: sub.url}).value()
+        else
+            url_exists = !!db.get('subscriptions').find({url: sub.url}).value();
 
         if (!sub.name && url_exists) {
             logger.error(`Sub with the same URL "${sub.url}" already exists -- please provide a custom name for this new subscription.`);
@@ -43,12 +47,19 @@ async function subscribe(sub, user_uid = null) {
             return;
         }
 
-        sub['user_uid'] = user_uid ? user_uid : undefined;
-        await db_api.insertRecordIntoTable('subscriptions', sub);
-
+        // add sub to db
+        let sub_db = null;
+        if (user_uid) {
+            users_db.get('users').find({uid: user_uid}).get('subscriptions').push(sub).write();
+            sub_db = users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id});
+        } else {
+            db.get('subscriptions').push(sub).write();
+            sub_db = db.get('subscriptions').find({id: sub.id});
+        }
         let success = await getSubscriptionInfo(sub, user_uid);
 
         if (success) {
+            sub = sub_db.value();
             getVideosForSub(sub, user_uid);
         } else {
             logger.error('Subscribe: Failed to get subscription info. Subscribe failed.')
@@ -68,19 +79,18 @@ 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.');
+            }
         }
-    }
-
-    return new Promise(async resolve => {
-        youtubedl.exec(sub.url, downloadConfig, {maxBuffer: Infinity}, async (err, output) => {
+        youtubedl.exec(sub.url, downloadConfig, {}, function(err, output) {
             if (debugMode) {
                 logger.info('Subscribe: got info for subscription ' + sub.id);
             }
@@ -103,14 +113,13 @@ 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) {
-                            await db_api.updateRecord('subscriptions', {id: sub.id}, {name: sub.name});
+                            if (user_uid)
+                                users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id}).assign({name: sub.name}).write();
+                            else
+                                db.get('subscriptions').find({id: sub.id}).assign({name: sub.name}).write();
                         }
                     }
 
@@ -126,8 +135,10 @@ async function getSubscriptionInfo(sub, user_uid = null) {
 
                         // updates subscription
                         sub.archive = archive_dir;
-
-                        await db_api.updateRecord('subscriptions', {id: sub.id}, {archive: archive_dir});
+                        if (user_uid)
+                            users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id}).assign({archive: archive_dir}).write();
+                        else
+                            db.get('subscriptions').find({id: sub.id}).assign({archive: archive_dir}).write();
                     }
 
                     // TODO: get even more info
@@ -141,156 +152,219 @@ 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;
-    await db_api.removeRecord('subscriptions', {id: id});
-    await db_api.removeAllRecords('files', {sub_id: id});
+        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) {
-    // TODO: combine this with deletefile
     let basePath = null;
-    basePath = user_uid ? path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions')
-                        : config_api.getConfigItem('ytdl_subscriptions_base_path');
+    let sub_db = null;
+    if (user_uid) {
+        basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions');
+        sub_db = users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id});
+    } else {
+        basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
+        sub_db = db.get('subscriptions').find({id: sub.id});
+    }
     const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
     const appendedBasePath = getAppendedBasePath(sub, basePath);
     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');
 
-    await db_api.removeRecord('files', {uid: file_uid});
+        jsonExists = fs.existsSync(jsonPath);
+        videoFileExists = fs.existsSync(videoFilePath);
+        imageFileExists = fs.existsSync(imageFilePath);
+        altImageFileExists = fs.existsSync(altImageFilePath);
 
-    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');
-
-    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)) {
-                    utils.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) {
-    const latest_sub_obj = await getSubscription(sub.id);
-    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);
-    fs.ensureDirSync(appendedBasePath);
-
-    let multiUserMode = null;
-    if (user_uid) {
-        multiUserMode = {
-            user: user_uid,
-            file_path: appendedBasePath
+    return new Promise(resolve => {
+        if (!subExists(sub.id, user_uid)) {
+            resolve(false);
+            return;
         }
-    }
 
-    const downloadConfig = await generateArgsForSubscription(sub, user_uid);
+        // 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 videos
-    logger.verbose('Subscription: getting videos for subscription ' + sub.name);
+        // 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');
 
-    return new Promise(async resolve => {
-        const preimported_file_paths = [];
-        const PREIMPORT_INTERVAL = 5000;
-        const preregister_check = setInterval(async () => {
-            if (sub.streamingOnly) return;
-            await db_api.preimportUnregisteredSubscriptionFile(sub, appendedBasePath);
-        }, PREIMPORT_INTERVAL);
-        youtubedl.exec(sub.url, downloadConfig, {maxBuffer: Infinity}, async function(err, output) {
-            // cleanup
-            updateSubscriptionProperty(sub, {downloading: false}, user_uid);
-            clearInterval(preregister_check);
+        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 {
                         const outputs = err.stdout.split(/\r\n|\r|\n/);
                         for (let i = 0; i < outputs.length; i++) {
                             const output = JSON.parse(outputs[i]);
-                            await handleOutputJSON(sub, output, i === 0, multiUserMode)
+                            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) {
@@ -303,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;
@@ -317,106 +390,21 @@ async function getVideosForSub(sub, user_uid = null) {
                     }
 
                     const reset_videos = i === 0;
-                    await handleOutputJSON(sub, output_json, multiUserMode, preimported_file_paths, reset_videos);
-                }
+                    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);
-        clearInterval(preregister_check);
     });
 }
 
-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
+function handleOutputJSON(sub, sub_db, output_json, multiUserMode = null, reset_videos = false) {
     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;
-}
-
-async function handleOutputJSON(sub, output_json, multiUserMode = null, reset_videos = false) {
-    // TODO: remove streaming only mode
-    if (false && sub.streamingOnly) {
         if (reset_videos) {
             sub_db.assign({videos: []}).write();
         }
@@ -427,109 +415,38 @@ async function handleOutputJSON(sub, output_json, multiUserMode = null, reset_vi
         // 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);
-
-        const file_exists = await db_api.getRecord('files', {path: path_string, sub_id: sub.id});
-        if (file_exists) {
-            // TODO: fix issue where files of different paths due to custom path get downloaded multiple times
-            // file already exists in DB, return early to avoid reseting the download date
-            return;
-        }
-
-        await db_api.registerFileDB2(output_json['_filename'], sub.type, sub.user_uid, null, sub.id);
-
-        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);
-        }
+        db_api.registerFileDB(path.basename(output_json['_filename']), sub.type, multiUserMode, sub);
     }
 }
 
-async function getSubscriptions(user_uid = null) {
-    return await db_api.getRecords('subscriptions', {user_uid: user_uid});
+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();
 }
 
-async function getAllSubscriptions() {
-    const all_subs = await db_api.getRecords('subscriptions');
-    const multiUserMode = config_api.getConfigItem('ytdl_multi_user_mode');
-    return all_subs.filter(sub => !!(sub.user_uid) === multiUserMode);
+function getSubscription(subID, user_uid = null) {
+    if (user_uid)
+        return users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: subID}).value();
+    else
+        return db.get('subscriptions').find({id: subID}).value();
 }
 
-async function getSubscription(subID) {
-    return await db_api.getRecord('subscriptions', {id: subID});
-}
-
-async function getSubscriptionByName(subName, user_uid = null) {
-    return await db_api.getRecord('subscriptions', {name: subName, user_uid: user_uid});
-}
-
-async function updateSubscription(sub, user_uid = null) {
-    await db_api.updateRecord('subscriptions', {id: sub.id}, sub);
+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();
+    } else {
+        db.get('subscriptions').find({id: sub.id}).assign(sub).write();
+    }
     return true;
 }
 
-async function updateSubscriptionPropertyMultiple(subs, assignment_obj) {
-    subs.forEach(async sub => {
-        await updateSubscriptionProperty(sub, assignment_obj, sub.user_uid);
-    });
-}
-
-async function updateSubscriptionProperty(sub, assignment_obj, user_uid = null) {
-    // TODO: combine with updateSubscription
-    await db_api.updateRecord('subscriptions', {id: sub.id}, assignment_obj);
-    return true;
-}
-
-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, '')) {
-            await 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, async (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, {maxBuffer: Infinity}, 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']);
+function subExists(subID, user_uid = null) {
+    if (user_uid)
+        return !!users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: subID}).value();
+    else
+        return !!db.get('subscriptions').find({id: subID}).value();
 }
 
 // helper functions
@@ -539,17 +456,57 @@ function getAppendedBasePath(sub, base_path) {
     return path.join(base_path, (sub.isPlaylist ? 'playlists/' : 'channels/'), sub.name);
 }
 
+// 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;
+    }
+
+    let dataArray = data.split('\n'); // convert file data in an array
+    const searchKeyword = id; // we are looking for a line, contains, key word id in the file
+    let lastIndex = -1; // let say, we have not found the keyword
+
+    for (let index=0; index<dataArray.length; index++) {
+        if (dataArray[index].includes(searchKeyword)) { // check if a line contains the id keyword
+            lastIndex = index; // found a line includes a id keyword
+            break;
+        }
+    }
+
+    const line = dataArray.splice(lastIndex, 1); // remove the keyword id from the data Array
+
+    // UPDATE FILE WITH NEW DATA
+    const updatedData = dataArray.join('\n');
+    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,
     unsubscribe            : unsubscribe,
     deleteSubscriptionFile : deleteSubscriptionFile,
     getVideosForSub        : getVideosForSub,
+    removeIDFromArchive    : removeIDFromArchive,
     setLogger              : setLogger,
-    initialize             : initialize,
-    updateSubscriptionPropertyMultiple : updateSubscriptionPropertyMultiple
+    initialize             : initialize
 }

backend/test/tests.js

@@ -1,290 +0,0 @@
-var assert = require('assert');
-const low = require('lowdb')
-var winston = require('winston');
-
-process.chdir('./backend')
-
-const FileSync = require('lowdb/adapters/FileSync');
-
-const adapter = new FileSync('./appdata/db.json');
-const db = low(adapter)
-
-const users_adapter = new FileSync('./appdata/users.json');
-const users_db = low(users_adapter);
-
-const defaultFormat = winston.format.printf(({ level, message, label, timestamp }) => {
-    return `${timestamp} ${level.toUpperCase()}: ${message}`;
-});
-
-let debugMode = process.env.YTDL_MODE === 'debug';
-
-const logger = winston.createLogger({
-    level: 'info',
-    format: winston.format.combine(winston.format.timestamp(), defaultFormat),
-    defaultMeta: {},
-    transports: [
-      //
-      // - Write to all logs with level `info` and below to `combined.log`
-      // - Write all logs error (and below) to `error.log`.
-      //
-      new winston.transports.File({ filename: 'appdata/logs/error.log', level: 'error' }),
-      new winston.transports.File({ filename: 'appdata/logs/combined.log' }),
-      new winston.transports.Console({level: 'debug', name: 'console'})
-    ]
-});
-
-var auth_api = require('../authentication/auth');
-var db_api = require('../db');
-const utils = require('../utils');
-const subscriptions_api = require('../subscriptions');
-const fs = require('fs-extra');
-const { uuid } = require('uuidv4');
-
-db_api.initialize(db, users_db, logger);
-
-
-describe('Database', async function() {
-    describe('Import', async function() {
-        it('Migrate', async function() {
-            await db_api.connectToDB();
-            await db_api.removeAllRecords();
-            const success = await db_api.importJSONToDB(db.value(), users_db.value());
-            assert(success);
-        });
-
-        it('Transfer to remote', async function() {
-            await db_api.removeAllRecords('test');
-            await db_api.insertRecordIntoTable('test', {test: 'test'});
-
-            await db_api.transferDB(true);
-            const success = await db_api.getRecord('test', {test: 'test'});
-            assert(success);
-        });
-
-        it('Transfer to local', async function() {
-            await db_api.connectToDB();
-            await db_api.removeAllRecords('test');
-            await db_api.insertRecordIntoTable('test', {test: 'test'});
-
-            await db_api.transferDB(false);
-            const success = await db_api.getRecord('test', {test: 'test'});
-            assert(success);
-        });
-    });
-
-    describe('Export', function() {
-
-    });
-
-
-    describe('Basic functions', async function() {
-        beforeEach(async function() {
-            await db_api.connectToDB();
-            await db_api.removeAllRecords('test');
-        });
-        it('Add and read record', async function() {
-            await db_api.insertRecordIntoTable('test', {test_add: 'test', test_undefined: undefined, test_null: undefined});
-            const added_record = await db_api.getRecord('test', {test_add: 'test', test_undefined: undefined, test_null: null});
-            assert(added_record['test_add'] === 'test');
-            await db_api.removeRecord('test', {test_add: 'test'});
-        });
-
-        it('Update record', async function() {
-            await db_api.insertRecordIntoTable('test', {test_update: 'test'});
-            await db_api.updateRecord('test', {test_update: 'test'}, {added_field: true});
-            const updated_record = await db_api.getRecord('test', {test_update: 'test'});
-            assert(updated_record['added_field']);
-            await db_api.removeRecord('test', {test_update: 'test'});
-        });
-
-        it('Remove record', async function() {
-            await db_api.insertRecordIntoTable('test', {test_remove: 'test'});
-            const delete_succeeded = await db_api.removeRecord('test', {test_remove: 'test'});
-            assert(delete_succeeded);
-            const deleted_record = await db_api.getRecord('test', {test_remove: 'test'});
-            assert(!deleted_record);
-        });
-
-        it('Push to record array', async function() {
-            await db_api.insertRecordIntoTable('test', {test: 'test', test_array: []});
-            await db_api.pushToRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
-            const record = await db_api.getRecord('test', {test: 'test'});
-            assert(record);
-            assert(record['test_array'].length === 1);
-        });
-
-        it('Pull from record array', async function() {
-            await db_api.insertRecordIntoTable('test', {test: 'test', test_array: ['test_item']});
-            await db_api.pullFromRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
-            const record = await db_api.getRecord('test', {test: 'test'});
-            assert(record);
-            assert(record['test_array'].length === 0);
-        });
-
-        it('Bulk add', async function() {
-            const NUM_RECORDS_TO_ADD = 2002; // max batch ops is 1000
-            const test_records = [];
-            for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
-                test_records.push({
-                    uid: uuid()
-                });
-            }
-            const succcess = await db_api.bulkInsertRecordsIntoTable('test', test_records);
-
-            const received_records = await db_api.getRecords('test');
-            assert(succcess && received_records && received_records.length === NUM_RECORDS_TO_ADD);
-        });
-
-        it('Bulk update', async function() {
-            // bulk add records
-            const NUM_RECORDS_TO_ADD = 100; // max batch ops is 1000
-            const test_records = [];
-            const update_obj = {};
-            for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
-                const test_uid =  uuid();
-                test_records.push({
-                    uid: test_uid
-                });
-                update_obj[test_uid] = {added_field: true};
-            }
-            let success = await db_api.bulkInsertRecordsIntoTable('test', test_records);
-            assert(success);
-
-            // makes sure they are added
-            const received_records = await db_api.getRecords('test');
-            assert(received_records && received_records.length === NUM_RECORDS_TO_ADD);
-
-            success = await db_api.bulkUpdateRecords('test', 'uid', update_obj);
-            assert(success);
-
-            const received_updated_records = await db_api.getRecords('test');
-            for (let i = 0; i < received_updated_records.length; i++) {
-                success &= received_updated_records[i]['added_field'];
-            }
-            assert(success);
-        });
-
-        it('Stats', async function() {
-            const stats = await db_api.getDBStats();
-            assert(stats);
-        });
-
-        it('Query speed', async function() {
-            this.timeout(120000); 
-            const NUM_RECORDS_TO_ADD = 300004; // max batch ops is 1000
-            const test_records = [];
-            let random_uid = '06241f83-d1b8-4465-812c-618dfa7f2943';
-            for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
-                const uid = uuid();
-                if (i === NUM_RECORDS_TO_ADD/2) random_uid = uid;
-                test_records.push({"id":"A$AP Mob - Yamborghini High (Official Music Video) ft. Juicy J","title":"A$AP Mob - Yamborghini High (Official Music Video) ft. Juicy J","thumbnailURL":"https://i.ytimg.com/vi/tt7gP_IW-1w/maxresdefault.jpg","isAudio":true,"duration":312,"url":"https://www.youtube.com/watch?v=tt7gP_IW-1w","uploader":"asapmobVEVO","size":5060157,"path":"audio\\A$AP Mob - Yamborghini High (Official Music Video) ft. Juicy J.mp3","upload_date":"2016-05-11","description":"A$AP Mob ft. Juicy J  - \"Yamborghini High\" Get it now on:\niTunes: http://smarturl.it/iYAMH?IQid=yt\nListen on Spotify: http://smarturl.it/sYAMH?IQid=yt\nGoogle Play: http://smarturl.it/gYAMH?IQid=yt\nAmazon:  http://smarturl.it/aYAMH?IQid=yt\n\nFollow A$AP Mob:\nhttps://www.facebook.com/asapmobofficial\nhttps://twitter.com/ASAPMOB\nhttp://instagram.com/asapmob \nhttp://www.asapmob.com/\n\n#AsapMob #YamborghiniHigh #Vevo #HipHop #OfficialMusicVideo #JuicyJ","view_count":118689353,"height":null,"abr":160,"uid": uid,"registered":1626672120632});
-            }
-            const insert_start = Date.now();
-            let success = await db_api.bulkInsertRecordsIntoTable('test', test_records);
-            const insert_end = Date.now();
-
-            console.log(`Insert time: ${(insert_end - insert_start)/1000}s`);
-
-            const query_start = Date.now();
-            const random_record = await db_api.getRecord('test', {uid: random_uid});
-            const query_end = Date.now();
-
-            console.log(random_record)
-
-            console.log(`Query time: ${(query_end - query_start)/1000}s`);
-
-            success = !!random_record;
-
-            assert(success);
-        });
-    });
-});
-
-describe('Multi User', async function() {
-    let user = null;
-    const user_to_test = 'admin';
-    const sub_to_test = 'dc834388-3454-41bf-a618-e11cb8c7de1c';
-    const playlist_to_test = 'ysabVZz4x';
-    beforeEach(async function() {
-        await db_api.connectToDB();
-        auth_api.initialize(db_api, logger);
-        subscriptions_api.initialize(db_api, logger);
-        user = await auth_api.login('admin', 'pass');
-    });
-    describe('Authentication', function() {
-        it('login', async function() {
-            assert(user);
-        });
-    });
-    describe('Video player - normal', function() {
-        const video_to_test = 'ebbcfffb-d6f1-4510-ad25-d1ec82e0477e';
-        it('Get video', async function() {
-            const video_obj = db_api.getVideo(video_to_test, 'admin');
-            assert(video_obj);
-        });
-
-        it('Video access - disallowed', async function() {
-            await db_api.setVideoProperty(video_to_test, {sharingEnabled: false}, user_to_test);
-            const video_obj = auth_api.getUserVideo('admin', video_to_test, true);
-            assert(!video_obj);
-        });
-
-        it('Video access - allowed', async function() {
-            await db_api.setVideoProperty(video_to_test, {sharingEnabled: true}, user_to_test);
-            const video_obj = auth_api.getUserVideo('admin', video_to_test, true);
-            assert(video_obj);
-        });
-    });
-    describe('Zip generators', function() {
-        it('Playlist zip generator', async function() {
-            const playlist = await db_api.getPlaylist(playlist_to_test, user_to_test);
-            assert(playlist);
-            const playlist_files_to_download = [];
-            for (let i = 0; i < playlist['uids'].length; i++) {
-                const uid = playlist['uids'][i];
-                const playlist_file = await db_api.getVideo(uid, user_to_test);
-                playlist_files_to_download.push(playlist_file);
-            }
-            const zip_path = await utils.createContainerZipFile(playlist, playlist_files_to_download);
-            const zip_exists = fs.pathExistsSync(zip_path);
-            assert(zip_exists);
-            if (zip_exists) fs.unlinkSync(zip_path);
-        });
-
-        it('Subscription zip generator', async function() {
-            const sub = await subscriptions_api.getSubscription(sub_to_test, user_to_test);
-            const sub_videos = await db_api.getRecords('files', {sub_id: sub.id});
-            assert(sub);
-            const sub_files_to_download = [];
-            for (let i = 0; i < sub_videos.length; i++) {
-                const sub_file = sub_videos[i];
-                sub_files_to_download.push(sub_file);
-            }
-            const zip_path = await utils.createContainerZipFile(sub, sub_files_to_download);
-            const zip_exists = fs.pathExistsSync(zip_path);
-            assert(zip_exists);
-            if (zip_exists) fs.unlinkSync(zip_path);
-        });
-    });
-    // describe('Video player - subscription', function() {
-    //     const sub_to_test = '';
-    //     const video_to_test = 'ebbcfffb-d6f1-4510-ad25-d1ec82e0477e';
-    //     it('Get video', async function() {
-    //         const video_obj = db_api.getVideo(video_to_test, 'admin', );
-    //         assert(video_obj);
-    //     });
-
-    //     it('Video access - disallowed', async function() {
-    //         await db_api.setVideoProperty(video_to_test, {sharingEnabled: false}, user_to_test, sub_to_test);
-    //         const video_obj = auth_api.getUserVideo('admin', video_to_test, true);
-    //         assert(!video_obj);
-    //     });
-
-    //     it('Video access - allowed', async function() {
-    //         await db_api.setVideoProperty(video_to_test, {sharingEnabled: true}, user_to_test, sub_to_test);
-    //         const video_obj = auth_api.getUserVideo('admin', video_to_test, true);
-    //         assert(video_obj);
-    //     });
-    // });
-    
-});

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

@@ -1,11 +1,9 @@
-const fs = require('fs-extra')
-const path = require('path')
+var fs = require('fs-extra')
+var path = require('path')
 const config_api = require('./config');
-const archiver = require('archiver');
 
 const is_windows = process.platform === 'win32';
 
-// replaces .webm with appropriate extension
 function getTrueFileName(unfixed_path, type) {
     let fixed_path = unfixed_path;
 
@@ -21,75 +19,39 @@ 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;
 }
 
-async function createContainerZipFile(container_obj, container_file_objs) {
-    const container_files_to_download = [];
-    for (let i = 0; i < container_file_objs.length; i++) {
-        const container_file_obj = container_file_objs[i];
-        container_files_to_download.push(container_file_obj.path);
-    }
-    return await createZipFile(path.join('appdata', container_obj.name + '.zip'), container_files_to_download);
-}
-
-async function createZipFile(zip_file_path, file_paths) {
-    let output = fs.createWriteStream(zip_file_path);
-
-    var archive = archiver('zip', {
-        gzip: true,
-        zlib: { level: 9 } // Sets the compression level.
-    });
-
-    archive.on('error', function(err) {
-        logger.error(err);
-        throw err;
-    });
-
-    // pipe archive data to the output file
-    archive.pipe(output);
-
-    for (let file_path of file_paths) {
-        const file_name = path.parse(file_path).base;
-        archive.file(file_path, {name: file_name})
-    }
-
-    await archive.finalize();
-
-    // wait a tiny bit for the zip to reload in fs
-    await wait(100);
-    return zip_file_path;
-}
-
 function getJSONMp4(name, customPath, openReadPerms = false) {
     var obj = null; // output
     if (!customPath) customPath = config_api.getConfigItem('ytdl_video_folder_path');
@@ -122,21 +84,6 @@ function getJSONMp3(name, customPath, openReadPerms = false) {
     return obj;
 }
 
-function getJSON(file_path, type) {
-    const ext = type === 'audio' ? '.mp3' : '.mp4';
-    let obj = null;
-    var jsonPath = removeFileExtension(file_path) + '.info.json';
-    var alternateJsonPath = removeFileExtension(file_path) + `${ext}.info.json`;
-    if (fs.existsSync(jsonPath))
-    {
-        obj = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
-    } else if (fs.existsSync(alternateJsonPath)) {
-        obj = JSON.parse(fs.readFileSync(alternateJsonPath, 'utf8'));
-    }
-    else obj = 0;
-    return obj;
-}
-
 function getJSONByType(type, name, customPath, openReadPerms = false) {
     return type === 'audio' ? getJSONMp3(name, customPath, openReadPerms) : getJSONMp4(name, customPath, openReadPerms)
 }
@@ -158,28 +105,12 @@ function getDownloadedThumbnail(name, type, customPath = null) {
         return null;
 }
 
-function getDownloadedThumbnail2(file_path, type) {
-    const file_path_no_extension = removeFileExtension(file_path);
-
-    let jpgPath = file_path_no_extension + '.jpg';
-    let webpPath = file_path_no_extension + '.webp';
-    let pngPath = file_path_no_extension + '.png';
-
-    if (fs.existsSync(jpgPath))
-        return jpgPath;
-    else if (fs.existsSync(webpPath))
-        return webpPath;
-    else if (fs.existsSync(pngPath))
-        return pngPath;
-    else
-        return null;
-}
-
 function getExpectedFileSize(input_info_jsons) {
     // treat single videos as arrays to have the file sizes checked/added to. makes the code cleaner
     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'];
@@ -206,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'),
@@ -222,28 +153,6 @@ function fixVideoMetadataPerms(name, type, customPath = null) {
     }
 }
 
-function fixVideoMetadataPerms2(file_path, type) {
-    if (is_windows) return;
-
-    const ext = type === 'audio' ? '.mp3' : '.mp4';
-
-    const file_path_no_extension = removeFileExtension(file_path);
-
-    const files_to_fix = [
-        // JSONs
-        file_path_no_extension + '.info.json',
-        file_path_no_extension + ext + '.info.json',
-        // Thumbnails
-        file_path_no_extension + '.webp',
-        file_path_no_extension + '.jpg'
-    ];
-
-    for (const file of files_to_fix) {
-        if (!fs.existsSync(file)) continue;
-        fs.chmodSync(file, 0o644);
-    }
-}
-
 function deleteJSONFile(name, type, customPath = null) {
     if (!customPath) customPath = type === 'audio' ? config_api.getConfigItem('ytdl_audio_folder_path')
                                                    : config_api.getConfigItem('ytdl_video_folder_path');
@@ -256,106 +165,34 @@ function deleteJSONFile(name, type, customPath = null) {
     if (fs.existsSync(alternate_json_path)) fs.unlinkSync(alternate_json_path);
 }
 
-function deleteJSONFile2(file_path, type) {
-    const ext = type === 'audio' ? '.mp3' : '.mp4';
 
-    const file_path_no_extension = removeFileExtension(file_path);
-    
-    let json_path = file_path_no_extension + '.info.json';
-    let alternate_json_path = file_path_no_extension + ext + '.info.json';
-
-    if (fs.existsSync(json_path)) fs.unlinkSync(json_path);
-    if (fs.existsSync(alternate_json_path)) fs.unlinkSync(alternate_json_path);
-}
-
-async function removeIDFromArchive(archive_path, id) {
-    let data = await fs.readFile(archive_path, {encoding: 'utf-8'});
-    if (!data) {
-        logger.error('Archive could not be found.');
-        return;
-    }
-
-    let dataArray = data.split('\n'); // convert file data in an array
-    const searchKeyword = id; // we are looking for a line, contains, key word id in the file
-    let lastIndex = -1; // let say, we have not found the keyword
-
-    for (let index=0; index<dataArray.length; index++) {
-        if (dataArray[index].includes(searchKeyword)) { // check if a line contains the id keyword
-            lastIndex = index; // found a line includes a id keyword
-            break;
-        }
-    }
-
-    const line = dataArray.splice(lastIndex, 1); // remove the keyword id from the data Array
-
-    // UPDATE FILE WITH NEW DATA
-    const updatedData = dataArray.join('\n');
-    await fs.writeFile(archive_path, updatedData);
-    if (line) return line;
-    if (err) throw err;
-}
-
-function durationStringToNumber(dur_str) {
-    if (typeof dur_str === 'number') return 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));
-    }
-    return num_sum;
-}
-
-function getMatchingCategoryFiles(category, files) {
-    return files && files.filter(file => file.category && file.category.uid === category.uid);
-}
-
-function addUIDsToCategory(category, files) {
-    const files_that_match = getMatchingCategoryFiles(category, files);
-    category['uids'] = files_that_match.map(file => file.uid);
-    return files_that_match;
-}
-
-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('.');
-}
-
-/**
- * setTimeout, but its a promise.
- * @param {number} ms
- */
- async function wait(ms) {
-    await new Promise(resolve => {
-        setTimeout(resolve, ms);
-    });
-}
-
 // 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;
@@ -366,32 +203,17 @@ 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 = {
     getJSONMp3: getJSONMp3,
     getJSONMp4: getJSONMp4,
-    getJSON: getJSON,
     getTrueFileName: getTrueFileName,
     getDownloadedThumbnail: getDownloadedThumbnail,
-    getDownloadedThumbnail2: getDownloadedThumbnail2,
     getExpectedFileSize: getExpectedFileSize,
     fixVideoMetadataPerms: fixVideoMetadataPerms,
-    fixVideoMetadataPerms2: fixVideoMetadataPerms2,
     deleteJSONFile: deleteJSONFile,
-    deleteJSONFile2: deleteJSONFile2,
-    removeIDFromArchive, removeIDFromArchive,
     getDownloadedFilesByType: getDownloadedFilesByType,
-    createContainerZipFile: createContainerZipFile,
-    durationStringToNumber: durationStringToNumber,
-    getMatchingCategoryFiles: getMatchingCategoryFiles,
-    addUIDsToCategory: addUIDsToCategory,
     recFindByExt: recFindByExt,
-    removeFileExtension: removeFileExtension,
-    wait: wait,
     File: File
 }

chart/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

chart/Chart.yaml

@@ -1,24 +0,0 @@
-apiVersion: v2
-name: youtubedl-material
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "4.2"

chart/templates/NOTES.txt

@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "youtubedl-material.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "youtubedl-material.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "youtubedl-material.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "youtubedl-material.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}

chart/templates/_helpers.tpl

@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "youtubedl-material.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "youtubedl-material.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "youtubedl-material.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "youtubedl-material.labels" -}}
-helm.sh/chart: {{ include "youtubedl-material.chart" . }}
-{{ include "youtubedl-material.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "youtubedl-material.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "youtubedl-material.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "youtubedl-material.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "youtubedl-material.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}

chart/templates/appdata-pvc.yaml

@@ -1,21 +0,0 @@
-{{- if and .Values.persistence.appdata.enabled (not .Values.persistence.appdata.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "youtubedl-material.fullname" . }}-appdata
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.appdata.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.appdata.size | quote }}
-  {{- if .Values.persistence.appdata.storageClass }}
-  {{- if (eq "-" .Values.persistence.appdata.storageClass) }}
-  storageClassName: ""
-  {{- else }}
-  storageClassName: "{{ .Values.persistence.appdata.storageClass }}"
-  {{- end }}
-  {{- end }}
-  {{- end -}}

chart/templates/audio-pvc.yaml

@@ -1,21 +0,0 @@
-{{- if and .Values.persistence.audio.enabled (not .Values.persistence.audio.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "youtubedl-material.fullname" . }}-audio
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.audio.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.audio.size | quote }}
-  {{- if .Values.persistence.audio.storageClass }}
-  {{- if (eq "-" .Values.persistence.audio.storageClass) }}
-  storageClassName: ""
-  {{- else }}
-  storageClassName: "{{ .Values.persistence.audio.storageClass }}"
-  {{- end }}
-  {{- end }}
-  {{- end -}}

chart/templates/deployment.yaml

@@ -1,121 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "youtubedl-material.fullname" . }}
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "youtubedl-material.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "youtubedl-material.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "youtubedl-material.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 17442
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - mountPath: /app/appdata
-              name: appdata
-              {{- if .Values.persistence.appdata.subPath }}
-              subPath: {{ .Values.persistence.appdata.subPath }}
-              {{- end }}
-            - mountPath: /app/audio
-              name: audio
-              {{- if .Values.persistence.audio.subPath }}
-              subPath: {{ .Values.persistence.audio.subPath }}
-              {{- end }}
-            - mountPath: /app/video
-              name: video
-              {{- if .Values.persistence.video.subPath }}
-              subPath: {{ .Values.persistence.video.subPath }}
-              {{- end }}
-            - mountPath: /app/subscriptions
-              name: subscriptions
-              {{- if .Values.persistence.subscriptions.subPath }}
-              subPath: {{ .Values.persistence.subscriptions.subPath }}
-              {{- end }}
-            - mountPath: /app/users
-              name: users
-              {{- if .Values.persistence.users.subPath }}
-              subPath: {{ .Values.persistence.users.subPath }}
-              {{- end }}
-      volumes:
-        - name: appdata
-          {{- if .Values.persistence.appdata.enabled}}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.appdata.existingClaim }}{{ .Values.persistence.appdata.existingClaim }}{{- else }}{{ template "youtubedl-material.fullname" . }}-appdata{{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        - name: audio
-          {{- if .Values.persistence.audio.enabled}}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.audio.existingClaim }}{{ .Values.persistence.audio.existingClaim }}{{- else }}{{ template "youtubedl-material.fullname" . }}-audio{{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        - name: subscriptions
-          {{- if .Values.persistence.subscriptions.enabled}}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.subscriptions.existingClaim }}{{ .Values.persistence.subscriptions.existingClaim }}{{- else }}{{ template "youtubedl-material.fullname" . }}-subscriptions{{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        - name: users
-          {{- if .Values.persistence.users.enabled}}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.users.existingClaim }}{{ .Values.persistence.users.existingClaim }}{{- else }}{{ template "youtubedl-material.fullname" . }}-users{{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        - name: video
-          {{- if .Values.persistence.video.enabled}}
-          persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.video.existingClaim }}{{ .Values.persistence.video.existingClaim }}{{- else }}{{ template "youtubedl-material.fullname" . }}-video{{- end }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

chart/templates/ingress.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "youtubedl-material.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-          {{- end }}
-    {{- end }}
-  {{- end }}

chart/templates/service.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "youtubedl-material.fullname" . }}
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "youtubedl-material.selectorLabels" . | nindent 4 }}

chart/templates/serviceaccount.yaml

@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "youtubedl-material.serviceAccountName" . }}
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

chart/templates/subscriptions-pvc.yaml

@@ -1,21 +0,0 @@
-{{- if and .Values.persistence.subscriptions.enabled (not .Values.persistence.subscriptions.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "youtubedl-material.fullname" . }}-subscriptions
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.subscriptions.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.subscriptions.size | quote }}
-  {{- if .Values.persistence.subscriptions.storageClass }}
-  {{- if (eq "-" .Values.persistence.subscriptions.storageClass) }}
-  storageClassName: ""
-  {{- else }}
-  storageClassName: "{{ .Values.persistence.subscriptions.storageClass }}"
-  {{- end }}
-  {{- end }}
-  {{- end -}}

chart/templates/tests/test-connection.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "youtubedl-material.fullname" . }}-test-connection"
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "youtubedl-material.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never

chart/templates/users-pvc.yaml

@@ -1,21 +0,0 @@
-{{- if and .Values.persistence.users.enabled (not .Values.persistence.users.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "youtubedl-material.fullname" . }}-users
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.users.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.users.size | quote }}
-  {{- if .Values.persistence.users.storageClass }}
-  {{- if (eq "-" .Values.persistence.users.storageClass) }}
-  storageClassName: ""
-  {{- else }}
-  storageClassName: "{{ .Values.persistence.users.storageClass }}"
-  {{- end }}
-  {{- end }}
-  {{- end -}}

chart/templates/video-pvc.yaml

@@ -1,21 +0,0 @@
-{{- if and .Values.persistence.video.enabled (not .Values.persistence.video.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "youtubedl-material.fullname" . }}-video
-  labels:
-    {{- include "youtubedl-material.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.video.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.video.size | quote }}
-  {{- if .Values.persistence.video.storageClass }}
-  {{- if (eq "-" .Values.persistence.video.storageClass) }}
-  storageClassName: ""
-  {{- else }}
-  storageClassName: "{{ .Values.persistence.video.storageClass }}"
-  {{- end }}
-  {{- end }}
-  {{- end -}}

chart/values.yaml

@@ -1,153 +0,0 @@
-# Default values for youtubedl-material.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: tzahi12345/youtubedl-material
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 17442
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths: []
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-persistence:
-  appdata:
-    enabled: true
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 1Gi
-  audio:
-    enabled: true
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 50Gi
-  video:
-    enabled: true
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 50Gi
-  subscriptions:
-    enabled: true
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 50Gi
-  users:
-    enabled: true
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 50Gi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

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);

docker-compose.yml

@@ -3,8 +3,6 @@ services:
     ytdl_material:
         environment: 
             ALLOW_CONFIG_MUTATIONS: 'true'
-            ytdl_mongodb_connection_string: 'mongodb://ytdl-mongo-db:27018'
-            ytdl_use_local_db: 'false'
         restart: always
         volumes:
             - ./appdata:/app/appdata
@@ -14,13 +12,4 @@ services:
             - ./users:/app/users
         ports:
             - "8998:17442"
-        image: tzahi12345/youtubedl-material:latest
-    ytdl-mongo-db:
-        image: mongo
-        ports:
-            - "27018:27017"
-        logging:
-            driver: "none"          
-        container_name: mongo-db
-        volumes:
-            - ./db/:/data/db
+        image: tzahi12345/youtubedl-material:latest

package.json

@@ -1,6 +1,6 @@
 {
   "name": "youtube-dl-material",
-  "version": "4.2.0",
+  "version": "4.1.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -18,57 +18,56 @@
   },
   "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",
     "fingerprintjs2": "^2.1.0",
-    "material-icons": "^0.5.4",
     "nan": "^2.14.1",
     "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,11 +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';
-import { ConcurrentStreamComponent } from './components/concurrent-stream/concurrent-stream.component';
 
 registerLocaleData(es, 'es');
 
@@ -113,7 +105,6 @@ export function isVisible({ event, element, scrollContainer, offset }: IsVisible
     VideoInfoDialogComponent,
     ArgModifierDialogComponent,
     HighlightPipe,
-    LinkifyPipe,
     UpdaterComponent,
     UpdateProgressDialogComponent,
     ShareMediaDialogComponent,
@@ -132,11 +123,7 @@ export function isVisible({ event, element, scrollContainer, offset }: IsVisible
     UnifiedFileCardComponent,
     RecentVideosComponent,
     EditSubscriptionDialogComponent,
-    CustomPlaylistsComponent,
-    EditCategoryDialogComponent,
-    TwitchChatComponent,
-    SeeMoreComponent,
-    ConcurrentStreamComponent
+    CustomPlaylistsComponent
   ],
   imports: [
     CommonModule,
@@ -194,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/concurrent-stream/concurrent-stream.component.html

@@ -1,6 +0,0 @@
-<div class="buttons-container">
-    <button (click)="startWatching()" *ngIf="!watch_together_clicked" mat-flat-button>Watch together</button>
-    <button (click)="startServer()" *ngIf="watch_together_clicked && !started && server_mode && server_already_exists === false" mat-flat-button>Start stream</button>
-    <button (click)="startClient()" *ngIf="watch_together_clicked && !started && server_already_exists === true" mat-flat-button>Join stream</button>
-    <button style="margin-left: 10px;" (click)="stop()" *ngIf="watch_together_clicked" mat-flat-button>Stop</button>
-</div>

src/app/components/concurrent-stream/concurrent-stream.component.scss

@@ -1,7 +0,0 @@
-.buttons-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: 15px;
-    margin-bottom: 15px;
-}

src/app/components/concurrent-stream/concurrent-stream.component.spec.ts

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

src/app/components/concurrent-stream/concurrent-stream.component.ts

@@ -1,140 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { PostsService } from 'app/posts.services';
-
-@Component({
-  selector: 'app-concurrent-stream',
-  templateUrl: './concurrent-stream.component.html',
-  styleUrls: ['./concurrent-stream.component.scss']
-})
-export class ConcurrentStreamComponent implements OnInit {
-
-  @Input() server_mode = false;
-  @Input() playback_timestamp;
-  @Input() playing;
-  @Input() uid;
-
-  @Output() setPlaybackTimestamp = new EventEmitter<any>();
-  @Output() togglePlayback = new EventEmitter<boolean>();
-  @Output() setPlaybackRate = new EventEmitter<number>();
-
-  started = false;
-  server_started = false;
-  watch_together_clicked = false;
-
-  server_already_exists = null;
-
-  check_timeout: any;
-  update_timeout: any;
-
-  PLAYBACK_TIMESTAMP_DIFFERENCE_THRESHOLD_PLAYBACK_MODIFICATION = 0.5;
-  PLAYBACK_TIMESTAMP_DIFFERENCE_THRESHOLD_SKIP = 2;
-
-  PLAYBACK_MODIFIER = 0.1;
-
-  playback_rate_modified = false;
-
-  constructor(private postsService: PostsService) { }
-
-  // flow: click start watching -> check for available stream to enable join button and if user, display "start stream"
-  // users who join a stream will send continuous requests for info on playback
-
-  ngOnInit(): void {
-
-  }
-
-  startServer() {
-    this.started = true;
-    this.server_started = true;
-    this.update_timeout = setInterval(() => {
-      this.updateStream();
-    }, 1000);
-  }
-
-  updateStream() {
-    this.postsService.updateConcurrentStream(this.uid, this.playback_timestamp, Date.now()/1000, this.playing).subscribe(res => {
-    });
-  }
-
-  startClient() {
-    this.started = true;
-  }
-
-  checkStream() {
-    if (this.server_started) { return; }
-    const current_playback_timestamp = this.playback_timestamp;
-    const current_unix_timestamp = Date.now()/1000;
-    this.postsService.checkConcurrentStream(this.uid).subscribe(res => {
-      const stream = res['stream'];
-
-      if (!stream) {
-        this.server_already_exists = false;
-        return;
-      }
-
-      this.server_already_exists = true;
-
-      // check whether client has joined the stream
-      if (!this.started) { return; }
-
-      if (!stream['playing'] && this.playing) {
-        // tell client to pause and set the timestamp to sync
-        this.togglePlayback.emit(false);
-        this.setPlaybackTimestamp.emit(stream['playback_timestamp']);
-      } else if (stream['playing']) {
-        // sync unpause state
-        if (!this.playing) { this.togglePlayback.emit(true); }
-
-        // sync time
-        const zeroed_local_unix_timestamp = current_unix_timestamp - current_playback_timestamp;
-        const zeroed_server_unix_timestamp = stream['unix_timestamp'] - stream['playback_timestamp'];
-
-        const seconds_behind_locally = zeroed_local_unix_timestamp - zeroed_server_unix_timestamp;
-
-        if (Math.abs(seconds_behind_locally) > this.PLAYBACK_TIMESTAMP_DIFFERENCE_THRESHOLD_SKIP) {
-          // skip to playback timestamp because the difference is too high
-          this.setPlaybackTimestamp.emit(this.playback_timestamp + seconds_behind_locally + 0.3);
-          this.playback_rate_modified = false;
-        } else if (!this.playback_rate_modified && Math.abs(seconds_behind_locally) > this.PLAYBACK_TIMESTAMP_DIFFERENCE_THRESHOLD_PLAYBACK_MODIFICATION) {
-          // increase playback speed to avoid skipping
-          let seconds_to_wait = (Math.abs(seconds_behind_locally)/this.PLAYBACK_MODIFIER);
-          seconds_to_wait += 0.3/this.PLAYBACK_MODIFIER;
-
-          this.playback_rate_modified = true;
-
-          if (seconds_behind_locally > 0) {
-            // increase speed
-            this.setPlaybackRate.emit(1 + this.PLAYBACK_MODIFIER);
-            setTimeout(() => {
-              this.setPlaybackRate.emit(1);
-              this.playback_rate_modified = false;
-            }, seconds_to_wait * 1000);
-          } else {
-            // decrease speed
-            this.setPlaybackRate.emit(1 - this.PLAYBACK_MODIFIER);
-            setTimeout(() => {
-              this.setPlaybackRate.emit(1);
-              this.playback_rate_modified = false;
-            }, seconds_to_wait * 1000);
-          }
-        }
-      }
-    });
-  }
-
-  startWatching() {
-    this.watch_together_clicked = true;
-    this.check_timeout = setInterval(() => {
-      this.checkStream();
-    }, 1000);
-  }
-
-  stop() {
-    if (this.check_timeout) { clearInterval(this.check_timeout); }
-    if (this.update_timeout) { clearInterval(this.update_timeout); }
-    this.started = false;
-    this.server_started = false;
-    this.watch_together_clicked = false;
-  }
-
-
-}

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

@@ -53,15 +53,16 @@ export class CustomPlaylistsComponent implements OnInit {
   goToPlaylist(info_obj) {
     const playlist = info_obj.file;
     const playlistID = playlist.id;
+    const type = playlist.type;
 
     if (playlist) {
       if (this.postsService.config['Extra']['download_only_mode']) {
-        this.downloadPlaylist(playlist.id, playlist.name);
+        this.downloading_content[type][playlistID] = true;
+        this.downloadPlaylist(playlist.fileNames, type, playlist.name, playlistID);
       } else {
         localStorage.setItem('player_navigator', this.router.url);
-        const routeParams = {playlist_id: playlistID};
-        if (playlist.auto) { routeParams['auto'] =  playlist.auto; }
-        this.router.navigate(['/player', routeParams]);
+        const fileNames = playlist.fileNames;
+        this.router.navigate(['/player', {fileNames: fileNames.join('|nvr|'), type: type, id: playlistID, uid: playlistID}]);
       }
     } else {
       // playlist not found
@@ -69,12 +70,11 @@ export class CustomPlaylistsComponent implements OnInit {
     }
   }
 
-  downloadPlaylist(playlist_id, playlist_name) {
-    this.downloading_content[playlist_id] = true;
-    this.postsService.downloadPlaylistFromServer(playlist_id).subscribe(res => {
-      this.downloading_content[playlist_id] = false;
-      const blob: any = res;
-      saveAs(blob, playlist_name + '.zip');
+  downloadPlaylist(fileNames, type, zipName = null, playlistID = null) {
+    this.postsService.downloadFileFromServer(fileNames, type, zipName).subscribe(res => {
+      if (playlistID) { this.downloading_content[type][playlistID] = false };
+      const blob: Blob = res;
+      saveAs(blob, zipName + '.zip');
     });
 
   }
@@ -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.', '');
@@ -97,7 +97,7 @@ export class CustomPlaylistsComponent implements OnInit {
     const index = args.index;
     const dialogRef = this.dialog.open(ModifyPlaylistComponent, {
       data: {
-        playlist_id: playlist.id,
+        playlist: playlist,
         width: '65vw'
       }
     });

src/app/components/downloads/downloads.component.html

@@ -1,21 +1,21 @@
 <div style="padding: 20px;">
-    <div *ngFor="let session_downloads of downloads">
-        <ng-container *ngIf="keys(session_downloads).length > 2">
+    <div *ngFor="let session_downloads of downloads | keyvalue">
+        <ng-container *ngIf="keys(session_downloads.value).length > 0">
             <mat-card style="padding-bottom: 30px; margin-bottom: 15px;">
-                <h4 style="text-align: center;"><ng-container i18n="Session ID">Session ID:</ng-container>&nbsp;{{session_downloads['session_id']}}
-                    <span *ngIf="session_downloads['session_id'] === postsService.session_id">&nbsp;<ng-container i18n="Current session">(current)</ng-container></span>
+                <h4 style="text-align: center;"><ng-container i18n="Session ID">Session ID:</ng-container>&nbsp;{{session_downloads.key}}
+                    <span *ngIf="session_downloads.key === postsService.session_id">&nbsp;<ng-container i18n="Current session">(current)</ng-container></span>
                 </h4>
                 <div class="container">
                     <div class="row">
-                        <div *ngFor="let download of session_downloads | keyvalue: sort_downloads; let i = index;" class="col-12 my-1">
-                            <mat-card *ngIf="download.key !== 'session_id' && download.key !== '_id' && download.value" class="mat-elevation-z3">
-                                <app-download-item [download]="download.value" [queueNumber]="i+1" (cancelDownload)="clearDownload(session_downloads['session_id'], download.value.uid)"></app-download-item>
+                        <div *ngFor="let download of session_downloads.value | keyvalue: sort_downloads; let i = index;" class="col-12 my-1">
+                            <mat-card *ngIf="download.value" class="mat-elevation-z3">
+                                <app-download-item [download]="download.value" [queueNumber]="i+1" (cancelDownload)="clearDownload(session_downloads.key, download.value.uid)"></app-download-item>
                             </mat-card>
                         </div>
                     </div>
                 </div>
                 <div>
-                    <button style="top: 15px;" (click)="clearDownloads(session_downloads['session_id'])" mat-stroked-button color="warn"><ng-container i18n="clear all downloads action button">Clear all downloads</ng-container></button>
+                    <button style="top: 15px;" (click)="clearDownloads(session_downloads.key)" mat-stroked-button color="warn"><ng-container i18n="clear all downloads action button">Clear all downloads</ng-container></button>
                 </div>
             </mat-card>
         </ng-container>

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/downloads/downloads.component.ts

@@ -35,7 +35,7 @@ import { Router } from '@angular/router';
 export class DownloadsComponent implements OnInit, OnDestroy {
 
   downloads_check_interval = 1000;
-  downloads = [];
+  downloads = {};
   interval_id = null;
 
   keys = Object.keys;
@@ -137,7 +137,6 @@ export class DownloadsComponent implements OnInit, OnDestroy {
         this.downloads[session_id] = session_downloads_by_id;
       } else {
         for (let j = 0; j < session_download_ids.length; j++) {
-          if (session_download_ids[j] === 'session_id' || session_download_ids[j] === '_id') continue;
           const download_id = session_download_ids[j];
           const download = new_downloads_by_session[session_id][download_id]
           if (!this.downloads[session_id][download_id]) {
@@ -157,10 +156,11 @@ export class DownloadsComponent implements OnInit, OnDestroy {
 
   downloadsValid() {
     let valid = false;
-    for (let i = 0; i < this.downloads.length; i++) {
-      const session_downloads = this.downloads[i];
-      if (!session_downloads) continue;
-      if (this.keys(session_downloads).length > 2) {
+    const keys = this.keys(this.downloads);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const value = this.downloads[key];
+      if (this.keys(value).length > 0) {
         valid = true;
         break;
       }

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.html

@@ -5,7 +5,7 @@
         <mat-list-item role="listitem" *ngFor="let permission of available_permissions">
             <h3 matLine>{{permissionToLabel[permission] ? permissionToLabel[permission] : permission}}</h3>
             <span matLine>
-                <mat-radio-group [disabled]="permission === 'settings' && role.key === 'admin'" (change)="changeRolePermissions($event, permission, permissions[permission])" [(ngModel)]="permissions[permission]" [attr.aria-label]="'Give role permission for ' + permission">
+                <mat-radio-group [disabled]="permission === 'settings' && role.name === 'admin'" (change)="changeRolePermissions($event, permission, permissions[permission])" [(ngModel)]="permissions[permission]" [attr.aria-label]="'Give role permission for ' + permission">
                     <mat-radio-button value="yes"><ng-container i18n="Yes">Yes</ng-container></mat-radio-button>
                     <mat-radio-button value="no"><ng-container i18n="No">No</ng-container></mat-radio-button>
                 </mat-radio-group>

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-role/manage-role.component.ts

@@ -47,7 +47,7 @@ export class ManageRoleComponent implements OnInit {
   }
 
   changeRolePermissions(change, permission) {
-    this.postsService.setRolePermission(this.role.key, permission, change.value).subscribe(res => {
+    this.postsService.setRolePermission(this.role.name, permission, change.value).subscribe(res => {
       if (res['success']) {
 
       } else {

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.html

@@ -94,7 +94,7 @@
     </div>
     <button color="primary" [matMenuTriggerFor]="edit_roles_menu" class="edit-role" mat-raised-button><ng-container i18n="Edit role">Edit Role</ng-container></button>
     <mat-menu #edit_roles_menu="matMenu">
-        <button (click)="openModifyRole(role)" mat-menu-item *ngFor="let role of roles">{{role.key}}</button>
+        <button (click)="openModifyRole(role)" mat-menu-item *ngFor="let role of roles">{{role.name}}</button>
     </mat-menu>
     </div>
     

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/modify-users/modify-users.component.ts

@@ -78,7 +78,16 @@ export class ModifyUsersComponent implements OnInit, AfterViewInit {
 
   getRoles() {
     this.postsService.getRoles().subscribe(res => {
-      this.roles = res['roles'];
+      this.roles = [];
+      const roles = res['roles'];
+      const role_names = Object.keys(roles);
+      for (let i = 0; i < role_names.length; i++) {
+        const role_name = role_names[i];
+        this.roles.push({
+          name: role_name,
+          permissions: roles[role_name]['permissions']
+        });
+      }
     });
   }
 

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);
     });
   }
 
@@ -166,14 +154,15 @@ export class RecentVideosComponent implements OnInit {
       const sub = this.postsService.getSubscriptionByID(file.sub_id);
       if (sub.streamingOnly) {
         // streaming only mode subscriptions
-        // !new_tab ? this.router.navigate(['/player', {name: file.id,
-        //                                   url: file.requested_formats ? file.requested_formats[0].url : file.url}])
-        //         : window.open(`/#/player;name=${file.id};url=${file.requested_formats ? file.requested_formats[0].url : file.url}`);
+        !new_tab ? this.router.navigate(['/player', {name: file.id,
+                                          url: file.requested_formats ? file.requested_formats[0].url : file.url}])
+                : window.open(`/#/player;name=${file.id};url=${file.requested_formats ? file.requested_formats[0].url : file.url}`);
       } else {
         // normal subscriptions
-        !new_tab ? this.router.navigate(['/player', {uid: file.uid,
-                                          type: file.isAudio ? 'audio' : 'video', sub_id: sub.id}]) 
-                 : window.open(`/#/player;uid=${file.uid};type=${file.isAudio ? 'audio' : 'video'};sub_id=${sub.id}`);
+        !new_tab ? this.router.navigate(['/player', {fileNames: file.id,
+                                          type: file.isAudio ? 'audio' : 'video', subscriptionName: sub.name,
+                                          subPlaylist: sub.isPlaylist}]) 
+                 : window.open(`/#/player;fileNames=${file.id};type=${file.isAudio ? 'audio' : 'video'};subscriptionName=${sub.name};subPlaylist=${sub.isPlaylist}`);
       }
     } else {
       // normal files
@@ -200,7 +189,8 @@ export class RecentVideosComponent implements OnInit {
     const type = file.isAudio ? 'audio' : 'video';
     const ext = type === 'audio' ? '.mp3' : '.mp4'
     const sub = this.postsService.getSubscriptionByID(file.sub_id);
-    this.postsService.downloadFileFromServer(file.uid).subscribe(res => {
+    this.postsService.downloadFileFromServer(file.id, type, null, null, sub.name, sub.isPlaylist,
+      this.postsService.user ? this.postsService.user.uid : null, null).subscribe(res => {
           const blob: Blob = res;
           saveAs(blob, file.id + ext);
         }, err => {
@@ -213,14 +203,14 @@ export class RecentVideosComponent implements OnInit {
     const ext = type === 'audio' ? '.mp3' : '.mp4'
     const name = file.id;
     this.downloading_content[type][name] = true;
-    this.postsService.downloadFileFromServer(file.uid).subscribe(res => {
+    this.postsService.downloadFileFromServer(name, type).subscribe(res => {
       this.downloading_content[type][name] = false;
       const blob: Blob = res;
       saveAs(blob, decodeURIComponent(name) + ext);
 
       if (!this.postsService.config.Extra.file_manager_enabled) {
         // tell server to delete the file once downloaded
-        this.postsService.deleteFile(file.uid).subscribe(delRes => {
+        this.postsService.deleteFile(name, false).subscribe(delRes => {
           // reload mp4s
           this.getAllFiles();
         });
@@ -236,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, 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.');
       }
@@ -255,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) {
@@ -295,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.html

@@ -19,9 +19,9 @@
                 <mat-label *ngIf="type === 'audio'"><ng-container i18n="Audio files title">Audio files</ng-container></mat-label>
                 <mat-label *ngIf="type === 'video'"><ng-container i18n="Videos title">Videos</ng-container></mat-label>
                 <mat-select [formControl]="filesSelect" multiple required aria-required>
-                    <ng-container *ngIf="filesToSelectFrom"><mat-option *ngFor="let file of filesToSelectFrom" [value]="file.uid">{{file.id}}</mat-option></ng-container>
-                    <ng-container *ngIf="audiosToSelectFrom && type === 'audio'"><mat-option *ngFor="let file of audiosToSelectFrom" [value]="file.uid">{{file.id}}</mat-option></ng-container>
-                    <ng-container *ngIf="videosToSelectFrom && type === 'video'"><mat-option *ngFor="let file of videosToSelectFrom" [value]="file.uid">{{file.id}}</mat-option></ng-container>
+                    <ng-container *ngIf="filesToSelectFrom"><mat-option *ngFor="let file of filesToSelectFrom" [value]="file.id">{{file.id}}</mat-option></ng-container>
+                    <ng-container *ngIf="audiosToSelectFrom && type === 'audio'"><mat-option *ngFor="let file of audiosToSelectFrom" [value]="file.id">{{file.id}}</mat-option></ng-container>
+                    <ng-container *ngIf="videosToSelectFrom && type === 'video'"><mat-option *ngFor="let file of videosToSelectFrom" [value]="file.id">{{file.id}}</mat-option></ng-container>
                 </mat-select>
             </mat-form-field>
             <!-- No videos available -->

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/create-playlist/create-playlist.component.ts

@@ -51,8 +51,9 @@ export class CreatePlaylistComponent implements OnInit {
 
   createPlaylist() {
     const thumbnailURL = this.getThumbnailURL();
+    const duration = this.calculateDuration();
     this.create_in_progress = true;
-    this.postsService.createPlaylist(this.name, this.filesSelect.value, this.type, thumbnailURL).subscribe(res => {
+    this.postsService.createPlaylist(this.name, this.filesSelect.value, this.type, thumbnailURL, duration).subscribe(res => {
       this.create_in_progress = false;
       if (res['success']) {
         this.dialogRef.close(true);
@@ -77,4 +78,36 @@ export class CreatePlaylistComponent implements OnInit {
     }
     return null;
   }
+
+  getDuration(file_id) {
+    let properFilesToSelectFrom = this.filesToSelectFrom;
+    if (!this.filesToSelectFrom) {
+      properFilesToSelectFrom = this.type === 'audio' ? this.audiosToSelectFrom : this.videosToSelectFrom;
+    }
+    for (let i = 0; i < properFilesToSelectFrom.length; i++) {
+      const file = properFilesToSelectFrom[i];
+      if (file.id === file_id) {
+        return file.duration;
+      }
+    }
+    return null;
+  }
+
+  calculateDuration() {
+    let sum = 0;
+    for (let i = 0; i < this.filesSelect.value.length; i++) {
+      const duration_val = this.getDuration(this.filesSelect.value[i]);
+      sum += typeof duration_val === 'string' ? this.durationStringToNumber(duration_val) : duration_val;
+    }
+    return sum;
+  }
+
+  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));
+    }
+    return num_sum;
+  }
 }

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">