Began work on allowing for more widespread usage of YT's API

.dockerignore

@@ -1,7 +0,0 @@
-.git
-db
-appdata
-audio
-video
-subscriptions
-users

.eslintrc.json

@@ -1,20 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 12,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-    }
-}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]"
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Environment**
-- YoutubeDL-Material version
-- Docker tag: <tag> (optional)
-
-Ideally you'd copy the info as presented on the "About" dialogue
-in YoutubeDL-Material.
-(for that, click on the three dots on the top right and then
-check "installation details". On later versions of YoutubeDL-
-Material you will find pretty much all the crucial information
-here that we need in most cases!)
-
-**Additional context**
-Add any other context about the problem here. For example, a YouTube link.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE]"
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/workflows/build.yml

@@ -15,31 +15,15 @@ jobs:
       - name: checkout code
         uses: actions/checkout@v2
       - name: setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '12'
-          cache: 'npm'
+        uses: actions/setup-node@v1
       - name: install dependencies
         run: |
           npm install
           cd backend
           npm install
           sudo npm install -g @angular/cli
-      - name: Set hash
-        id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
-      - name: create-json
-        id: create-json
-        uses: jsdaniell/create-json@1.1.2
-        with:
-          name: "version.json"
-          json: '{"type": "autobuild", "tag": "N/A", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
-          dir: 'backend/'
       - name: build
-        run: npm run build
+        run: ng build --prod
       - name: prepare artifact upload
         shell: pwsh
         run: |
@@ -51,7 +35,7 @@ jobs:
           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 -ItemType Directory
+          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
@@ -85,20 +69,17 @@ jobs:
         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
+        run: Compress-Archive -Path ${{runner.temp}}/youtubedl-material -DestinationPath youtubedl-material-${{ github.ref }}.zip
+      - name: upload build 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_path: ./youtubedl-material-${{ github.ref }}.zip
+          asset_name: youtubedl-material-${{ github.ref }}.zip
           asset_content_type: application/zip
       - name: upload docker-compose asset
         uses: actions/upload-release-asset@v1

.github/workflows/docker-release.yml

@@ -1,45 +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: Set hash
-        id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
-      - name: create-json
-        id: create-json
-        uses: jsdaniell/create-json@1.1.2
-        with:
-          name: "version.json"
-          json: '{"type": "docker", "tag": "latest", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
-          dir: 'backend/'
-      - 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

@@ -10,19 +10,6 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v2
-      - name: Set hash
-        id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
-      - name: create-json
-        id: create-json
-        uses: jsdaniell/create-json@1.1.2
-        with:
-          name: "version.json"
-          json: '{"type": "docker", "tag": "nightly", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
-          dir: 'backend/'
       - name: setup platform emulator
         uses: docker/setup-qemu-action@v1
       - name: setup multi-arch docker build

.gitignore

@@ -25,7 +25,6 @@
 !.vscode/extensions.json
 
 # misc
-/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
@@ -66,13 +65,4 @@ backend/appdata/logs/error.log
 backend/appdata/users.json
 backend/users/*
 backend/appdata/cookies.txt
-backend/public
-src/assets/i18n/*.json
-
-# User Files
-db/
-appdata/
-audio/
-video/
-subscriptions/
-users/
+backend/public

.vscode/tasks.json

@@ -1,25 +0,0 @@
-{
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"type": "npm",
-			"script": "start",
-			"problemMatcher": [],
-			"label": "Dev: start frontend",
-			"detail": "ng serve"
-		},
-		{
-			"label": "Dev: start backend",
-			"type": "shell",
-			"command": "set YTDL_MODE=debug && node app.js",
-			"options": {
-				"cwd": "./backend"
-			},
-			"presentation": {
-				"reveal": "always",
-				"panel": "new"
-			},
-			"problemMatcher": []
-		}
-	]
-}

Dockerfile

@@ -1,16 +1,7 @@
-FROM ubuntu:20.04 AS ffmpeg
+FROM alpine:3.12 as frontend
 
-RUN apt-get update && apt-get -y install curl xz-utils 
-COPY docker-build.sh .
-RUN sh ./docker-build.sh
-
-FROM ubuntu:20.04 as frontend
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update
-RUN apt-get -y install curl gnupg
-RUN curl -sL https://deb.nodesource.com/setup_12.x  | bash -
-RUN apt-get -y install nodejs
+RUN apk add --no-cache \
+  npm
 
 RUN npm install -g @angular/cli
 
@@ -20,39 +11,33 @@ RUN npm install
 
 COPY [ "angular.json", "tsconfig.json", "/build/" ]
 COPY [ "src/", "/build/src/" ]
-RUN npm run build
+RUN ng build --prod
 
 #--------------#
 
-FROM ubuntu:20.04
+FROM alpine:3.12
 
 ENV UID=1000 \
   GID=1000 \
-  USER=youtube \
-  NO_UPDATE_NOTIFIER=true
+  USER=youtube
 
-RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER
+RUN addgroup -S $USER -g $GID && adduser -D -S $USER -G $USER -u $UID
 
-RUN apt-get update && apt-get -y install curl
-
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get update && apt-get -y install \
-  nodejs \
+RUN apk add --no-cache \
+  ffmpeg \
+  npm \
   python2 \
-  python3 \
-  atomicparsley
+  su-exec \
+  && apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
+    atomicparsley
 
 WORKDIR /app
-COPY --from=ffmpeg /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
-COPY --from=ffmpeg /usr/local/bin/ffprobe /usr/local/bin/ffprobe 
 COPY --chown=$UID:$GID [ "backend/package.json", "backend/package-lock.json", "/app/" ]
-ENV PM2_HOME=/app/pm2
-RUN npm install pm2 -g && \
-  npm install && chown -R $UID:$GID ./
+RUN npm install && chown -R $UID:$GID ./
 
 COPY --chown=$UID:$GID --from=frontend [ "/build/backend/public/", "/app/public/" ]
 COPY --chown=$UID:$GID [ "/backend/", "/app/" ]
 
 EXPOSE 17442
-# ENTRYPOINT [ "/app/entrypoint.sh" ]
-CMD [ "pm2-runtime", "pm2.config.js" ]
+ENTRYPOINT [ "/app/entrypoint.sh" ]
+CMD [ "node", "app.js" ]

README.md

@@ -6,33 +6,25 @@
 [![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!
 
-<hr>
-
-### USAGE OF THE NIGHTLY BUILDS IS HIGHLY RECOMMENDED.
-
-For much better scaling with large datasets please run your YTDL-M instance with a MongoDB backend rather than the json file-based default.
-It will fix a lot of performance problems (especially with datasets in the tens of thousands videos/audios)!
-The (closed) issues as well as the project's Wiki will give you good starting points for your journey!
-
-For MongoDB specifically there is [this little guide](https://github.com/Tzahi12345/YoutubeDL-Material/wiki/Setting-a-MongoDB-backend-to-use-as-database-provider-for-YTDL-M).
-
-<hr>
-
 ## Getting Started
 
 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
 
@@ -41,7 +33,7 @@ NOTE: If you would like to use Docker, you can skip down to the [Docker](#Docker
 Debian/Ubuntu:
 
 ```bash
-sudo apt-get install nodejs youtube-dl ffmpeg unzip python npm
+sudo apt-get install nodejs youtube-dl ffmpeg
 ```
 
 CentOS 7:
@@ -79,7 +71,7 @@ If you'd like to install YoutubeDL-Material, go to the Installation section. If
 
 To deploy, simply clone the repository, and go into the `youtubedl-material` directory. Type `npm install` and all the dependencies will install. Then type `cd backend` and again type `npm install` to install the dependencies for the backend.
 
-Once you do that, you're almost up and running. All you need to do is edit the configuration in `youtubedl-material/appdata`, go back into the `youtubedl-material` directory, and type `npm build`. This will build the app, and put the output files in the `youtubedl-material/backend/public` folder.
+Once you do that, you're almost up and running. All you need to do is edit the configuration in `youtubedl-material/appdata`, go back into the `youtubedl-material` directory, and type `ng build --prod`. This will build the app, and put the output files in the `youtubedl-material/backend/public` folder.
 
 The frontend is now complete. The backend is much easier. Just go into the `backend` folder, and type `npm start`.
 
@@ -89,10 +81,6 @@ Alternatively, you can port forward the port specified in the config (defaults t
 
 ## Docker
 
-### Host-specific instructions
-
-If you're on a Synology NAS, unRAID or any other possible special case you can check if there's known issues or instructions both in the issue tracker and in the [Wiki!](https://github.com/Tzahi12345/YoutubeDL-Material/wiki#environment-specific-guideshelp)
-
 ### Setup
 
 If you are looking to setup YoutubeDL-Material with Docker, this section is for you. And you're in luck! Docker setup is quite simple.
@@ -122,12 +110,6 @@ To get started, go to the settings menu and enable the public API from the *Extr
 
 Once you have enabled the API and have the key, you can start sending requests by adding the query param `apiKey=API_KEY`. Replace `API_KEY` with your actual API key, and you should be good to go! Nearly all of the backend should be at your disposal. View available endpoints in the link above.
 
-## iOS Shortcut 
-
-If you are using iOS, try YoutubeDL-Material more conveniently with a Shortcut. With this Shorcut, you can easily start downloading YouTube video with just two taps! (Or maybe three?)
-
-You can download Shortcut [here.](https://routinehub.co/shortcut/10283/)
-
 ## Contributing
 
 If you're interested in contributing, first: awesome! Second, please refer to the guidelines/setup information located in the [Contributing](https://github.com/Tzahi12345/YoutubeDL-Material/wiki/Contributing) wiki page, it's a helpful way to get you on your feet and coding away.
@@ -146,16 +128,12 @@ Official translators:
 * German - UnlimitedCookies
 * Chinese - TyRoyal
 
-See also the list of [contributors](https://github.com/Tzahi12345/YoutubeDL-Material/graphs/contributors) who participated in this project.
+See also the list of [contributors](https://github.com/your/project/contributors) who participated in this project.
 
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
 
-## Legal Disclaimer
-
-This project is in no way affiliated with Google LLC, Alphabet Inc. or YouTube (or their subsidiaries) nor endorsed by them.
-
 ## Acknowledgments
 
 * youtube-dl

SECURITY.md

@@ -1,21 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Currently all work on this project goes into the nightly builds.
-4.2's RELEASE build is now quite old and should be considered legacy.
-We urge users to use the nightly releases, because the project
-constantly sees fixes.
-
-| Version       | Supported          |
-| ------------- | ------------------ |
-| 4.2 Nightlies | :white_check_mark: |
-| 4.2 Release   | :x:                |
-| < 4.2         | :x:                |
-
-## Reporting a Vulnerability
-
-Please file an issue in our GitHub's repo, because this app
-isn't meant to be safe to run as public instance yet, but rather as a LAN facing app.
-
-We welcome PRs and help in general in making YTDL-M more secure, but it's not a priority as of now.

angular.json

@@ -17,6 +17,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "outputPath": "backend/public",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -32,17 +33,7 @@
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": [],
-            "vendorChunk": true,
-            "extractLicenses": false,
-            "buildOptimizer": false,
-            "sourceMap": true,
-            "optimization": false,
-            "namedChunks": true,
-            "allowedCommonJsDependencies": [
-              "rxjs",
-              "crypto-js"
-            ]
+            "scripts": []
           },
           "configurations": {
             "production": {
@@ -54,7 +45,10 @@
               ],
               "optimization": true,
               "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
               "namedChunks": false,
+              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -68,8 +62,7 @@
             "es": {
               "localize": ["es"]
             }
-          },
-          "defaultConfiguration": ""
+          }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -161,6 +154,16 @@
               "src/backend"
             ]
           }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": []
+          }
         }
       }
     },
@@ -175,6 +178,15 @@
             "protractorConfig": "./protractor.conf.js",
             "devServerTarget": "youtube-dl-material:serve"
           }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": []
+          }
         }
       }
     }

backend/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-    "env": {
-        "node": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended"
-    ],
-    "parser": "esprima",
-    "parserOptions": {
-        "ecmaVersion": 12,
-        "sourceType": "module"
-    },
-    "plugins": [],
-    "rules": {
-    },
-    "root": true
-}

backend/appdata/default.json

@@ -12,29 +12,21 @@
       "custom_args": "",
       "safe_download_override": false,
       "include_thumbnail": true,
-      "include_metadata": true,
-      "max_concurrent_downloads": 5,
-      "download_rate_limit": ""
+      "include_metadata": true
     },
     "Extra": {
       "title_top": "YoutubeDL-Material",
       "file_manager_enabled": true,
       "allow_quality_select": true,
       "download_only_mode": false,
-      "allow_autoplay": true,
-      "enable_downloads_manager": true,
-      "allow_playlist_categorization": true
+      "allow_multi_download_mode": 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,
-      "use_sponsorblock_API": false,
-      "generate_NFO_files": false
+      "youtube_API_key": ""
     },
     "Themes": {
       "default_theme": "default",
@@ -43,8 +35,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/",
@@ -58,10 +49,6 @@
         "searchFilter": "(uid={{username}})"
       }
     },
-    "Database": {
-      "use_local_db": true,
-      "mongodb_connection_string": "mongodb://127.0.0.1:27017/?compressors=zlib"
-    },
     "Advanced": {
       "default_downloader": "youtube-dl",
       "use_default_downloading_agent": true,
@@ -69,8 +56,8 @@
       "multi_user_mode": false,
       "allow_advanced_download": false,
       "use_cookies": false,
-      "jwt_expiration": 86400,
+      "jwt_expiration": 86400, 
       "logger_level": "info"
     }
   }
-}
+}

backend/authentication/auth.js

@@ -1,11 +1,12 @@
+const path = require('path');
 const config_api = require('../config');
 const consts = require('../consts');
-const logger = require('../logger');
-const db_api = require('../db');
-
-const jwt = require('jsonwebtoken');
+var subscriptions_api = require('../subscriptions')
+const fs = require('fs-extra');
+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,42 +14,40 @@ var JwtStrategy = require('passport-jwt').Strategy,
     ExtractJwt = require('passport-jwt').ExtractJwt;
 
 // other required vars
+let logger = null;
+var users_db = null;
 let SERVER_SECRET = null;
 let JWT_EXPIRATION = null;
 let opts = null;
 let saltRounds = null;
 
-exports.initialize = function () {
+exports.initialize = function(input_users_db, input_logger) {
+  setLogger(input_logger)
+  setDB(input_users_db);
+
   /*************************
    * Authentication module
    ************************/
-
-  if (db_api.database_initialized) {
-    setupRoles();
-  } else {
-      db_api.database_initialized_bs.subscribe(init => {
-          if (init) setupRoles();
-      });
-  }
-
   saltRounds = 10;
 
   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 {
@@ -58,39 +57,12 @@ exports.initialize = function () {
   }));
 }
 
-const setupRoles = async () => {
-  const required_roles = {
-    admin: {
-        permissions: [
-            'filemanager',
-            'settings',
-            'subscriptions',
-            'sharing',
-            'advanced_download',
-            'downloads_manager'
-        ]
-    },
-    user: {
-        permissions: [
-            'filemanager',
-            'subscriptions',
-            'sharing'
-        ]
-    }
-  }
+function setLogger(input_logger) {
+  logger = input_logger;
+}
 
-  const role_keys = Object.keys(required_roles);
-  for (let i = 0; i < role_keys.length; i++) {
-    const role_key = role_keys[i];
-    const role_in_db = await db_api.getRecord('roles', {key: role_key});
-    if (!role_in_db) {
-      // insert task metadata into table if missing
-      await db_api.insertRecordIntoTable('roles', {
-          key: role_key,
-          permissions: required_roles[role_key]['permissions']
-      });
-    }
-  }
+function setDB(input_users_db) {
+  users_db = input_users_db;
 }
 
 exports.passport = require('passport');
@@ -106,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;
@@ -117,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
@@ -170,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`); return 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));
+        const user = users_db.get('users').find({name: username}).value();
+        if (!user) { logger.error(`User ${username} not found`); return done(null, false); }
+        if (user.auth_method && user.auth_method !== 'internal') { return done(null, false); }
+        if (user) {
+            return done(null, (await bcrypt.compare(password, user.passhash)) ? user : false);
+        }
     }
 ));
 
@@ -192,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`);
     }
@@ -226,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']
   });
 }
@@ -243,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 {
@@ -261,10 +225,10 @@ exports.ensureAuthenticatedElseError = (req, res, next) => {
 }
 
 // change password
-exports.changeUserPassword = async (user_uid, new_pass) => {
+exports.changeUserPassword = async function(user_uid, new_pass) {
   try {
     const hash = await bcrypt.hash(new_pass, saltRounds);
-    await db_api.updateRecord('users', {uid: user_uid}, {passhash: hash});
+    users_db.get('users').find({uid: user_uid}).assign({passhash: hash}).write();
     return true;
   } catch (err) {
     return false;
@@ -272,15 +236,16 @@ exports.changeUserPassword = async (user_uid, new_pass) => {
 }
 
 // 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) {
@@ -290,11 +255,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) {
@@ -303,19 +269,30 @@ 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) {
+  let file = null;
+  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;
@@ -323,17 +300,38 @@ exports.getUserVideo = async function(user_uid, file_uid, requireSharing = false
   return file;
 }
 
-exports.removePlaylist = async function(user_uid, playlistID) {
-  await db_api.removeRecord('playlist', {playlistID: playlistID});
+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.getUserPlaylists = async function(user_uid) {
-  return await db_api.getRecords('playlists', {user_uid: user_uid});
+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.getUserPlaylist = async function(user_uid, playlistID, requireSharing = false) {
-  let playlist = await db_api.getRecord('playlists', {id: playlistID});
+exports.removePlaylist = function(user_uid, playlistID, type) {
+  users_db.get('users').find({uid: user_uid}).get(`playlists.${type}`).remove({id: playlistID}).write();
+  return true;
+}
+
+exports.getUserPlaylists = function(user_uid, 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;
@@ -341,23 +339,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 = async 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 (await fs.pathExists(full_path)) {
+      // remove json and file
+      const json_path = path.join(usersFileFolder, user_uid, type, file_obj.id + '.info.json');
+      const alternate_json_path = path.join(usersFileFolder, user_uid, type, file_obj.id + ext + '.info.json');
+      let youtube_id = null;
+      if (await fs.pathExists(json_path)) {
+        youtube_id = await fs.readJSON(json_path).id;
+        await fs.unlink(json_path);
+      } else if (await fs.pathExists(alternate_json_path)) {
+        youtube_id = await fs.readJSON(alternate_json_path).id;
+        await fs.unlink(alternate_json_path);
+      }
+
+      await fs.unlink(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 (await fs.pathExists(archive_path)) {
+              const line = youtube_id ? await subscriptions_api.removeIDFromArchive(archive_path, youtube_id) : null;
+              if (blacklistMode && line) {
+                let blacklistPath = path.join(usersFileFolder, user_uid, 'archives', `blacklist_${type}.txt`);
+                // adds newline to the beginning of the line
+                line = '\n' + line;
+                await fs.appendFile(blacklistPath, line);
+              }
+          } else {
+              logger.info(`Could not find archive file for ${type} files. Creating...`);
+              await fs.ensureFile(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);
@@ -380,17 +463,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];
@@ -436,8 +518,14 @@ 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',

backend/categories.js

@@ -1,6 +1,18 @@
-const utils = require('./utils');
-const logger = require('./logger');
-const db_api = require('./db');
+const config_api = require('./config');
+
+var logger = null;
+var db = null;
+var users_db = null;
+var db_api = null;
+
+function setDB(input_db, input_users_db, input_db_api) { db = input_db; users_db = input_users_db; db_api = input_db_api }
+function setLogger(input_logger) { logger = input_logger; }
+
+function initialize(input_db, input_users_db, input_logger, input_db_api) {
+    setDB(input_db, input_users_db, input_db_api);
+    setLogger(input_logger);
+}
+
 /*
 
 Categories:
@@ -21,58 +33,35 @@ Rules:
 
 */
 
-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];
-
+async function categorize(file_json) {
     let selected_category = null;
-    const categories = await getCategories();
+    const categories = getCategories();
     if (!categories) {
-        logger.warn('Categories could not be found.');
+        logger.warn('Categories could not be found. Initializing categories...');
+        db.assign({categories: []}).write();
         return null;
+        return;
     }
 
-    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;
-            }
+    for (let i = 0; i < categories.length; i++) {
+        const category = categories[i];
+        const rules = category['rules'];
+
+        // if rules for current category apply, then that is the selected category
+        if (applyCategoryRules(file_json, rules, category['name'])) {
+            selected_category = category;
+            logger.verbose(`Selected category ${category['name']} for ${file_json['webpage_url']}`);
+            return selected_category;
         }
     }
-    
     return selected_category;
 }
 
-async function getCategories() {
-    const categories = await db_api.getRecords('categories');
+function getCategories() {
+    const categories = db.get('categories').value();
     return categories ? categories : null;
 }
 
-async function getCategoriesAsPlaylists(files = null) {
-    const categories_as_playlists = [];
-    const available_categories = await getCategories();
-    if (available_categories && files) {
-        for (let 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++) {
@@ -83,10 +72,10 @@ function applyCategoryRules(file_json, rules, category_name) {
 
         switch (rule['comparator']) {
             case 'includes':
-                rule_applies = file_json[rule['property']].toLowerCase().includes(rule['value'].toLowerCase());
+                rule_applies = file_json[rule['property']].includes(rule['value']);
                 break;
             case 'not_includes':
-                rule_applies = !(file_json[rule['property']].toLowerCase().includes(rule['value'].toLowerCase()));
+                rule_applies = !(file_json[rule['property']].includes(rule['value']));
                 break;
             case 'equals':
                 rule_applies = file_json[rule['property']] === rule['value'];
@@ -112,24 +101,23 @@ function applyCategoryRules(file_json, rules, category_name) {
     return rules_apply;
 }
 
-// async function addTagToVideo(tag, video, user_uid) {
-//     // TODO: Implement
-// }
+async function addTagToVideo(tag, video, user_uid) {
+    // TODO: Implement
+}
 
-// async function removeTagFromVideo(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();
-//     }
-// }
+// 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

@@ -1,5 +1,3 @@
-const logger = require('./logger');
-
 const fs = require('fs');
 
 let CONFIG_ITEMS = require('./consts.js')['CONFIG_ITEMS'];
@@ -7,7 +5,11 @@ const debugMode = process.env.YTDL_MODE === 'debug';
 
 let configPath = debugMode ? '../src/assets/default.json' : 'appdata/default.json';
 
-function initialize() {
+var logger = null;
+function setLogger(input_logger) { logger = input_logger; }
+
+function initialize(input_logger) {
+    setLogger(input_logger);
     ensureConfigFileExists();
     ensureConfigItemsExist();
 }
@@ -95,13 +97,13 @@ function getConfigItem(key) {
     }
     let path = CONFIG_ITEMS[key]['path'];
     const val = Object.byString(config_json, path);
-    if (val === undefined && Object.byString(DEFAULT_CONFIG, path) !== undefined) {
+    if (val === undefined && Object.byString(DEFAULT_CONFIG, path)) {
         logger.warn(`Cannot find config with key '${key}'. Creating one with the default value...`);
         setConfigItem(key, Object.byString(DEFAULT_CONFIG, path));
         return Object.byString(DEFAULT_CONFIG, path);
     }
     return Object.byString(config_json, path);
-}
+};
 
 function setConfigItem(key, value) {
     let success = false;
@@ -173,7 +175,7 @@ module.exports = {
     globalArgsRequiresSafeDownload: globalArgsRequiresSafeDownload
 }
 
-const DEFAULT_CONFIG = {
+DEFAULT_CONFIG = {
     "YoutubeDLMaterial": {
       "Host": {
         "url": "http://example.com",
@@ -187,29 +189,21 @@ const DEFAULT_CONFIG = {
         "custom_args": "",
         "safe_download_override": false,
         "include_thumbnail": true,
-        "include_metadata": true,
-        "max_concurrent_downloads": 5,
-        "download_rate_limit": ""
+        "include_metadata": true
       },
       "Extra": {
         "title_top": "YoutubeDL-Material",
         "file_manager_enabled": true,
         "allow_quality_select": true,
         "download_only_mode": false,
-        "allow_autoplay": true,
-        "enable_downloads_manager": true,
-        "allow_playlist_categorization": true
+        "allow_multi_download_mode": 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,
-        "use_sponsorblock_API": false,
-        "generate_NFO_files": false
+        "youtube_API_key": ""
       },
       "Themes": {
         "default_theme": "default",
@@ -218,8 +212,7 @@ const DEFAULT_CONFIG = {
       "Subscriptions": {
         "allow_subscriptions": true,
         "subscriptions_base_path": "subscriptions/",
-        "subscriptions_check_interval": "86400",
-        "redownload_fresh_uploads": false
+        "subscriptions_check_interval": "300"
       },
       "Users": {
         "base_path": "users/",
@@ -233,10 +226,6 @@ const DEFAULT_CONFIG = {
             "searchFilter": "(uid={{username}})"
         }
       },
-      "Database": {
-        "use_local_db": true,
-        "mongodb_connection_string": "mongodb://127.0.0.1:27017/?compressors=zlib"
-      },
       "Advanced": {
         "default_downloader": "youtube-dl",
         "use_default_downloading_agent": true,

backend/consts.js

@@ -1,4 +1,4 @@
-exports.CONFIG_ITEMS = {
+let CONFIG_ITEMS = {
     // Host
     'ytdl_url': {
         'key': 'ytdl_url',
@@ -42,14 +42,6 @@ exports.CONFIG_ITEMS = {
         'key': 'ytdl_include_metadata',
         'path': 'YoutubeDLMaterial.Downloader.include_metadata'
     },
-    'ytdl_max_concurrent_downloads': {
-        'key': 'ytdl_max_concurrent_downloads',
-        'path': 'YoutubeDLMaterial.Downloader.max_concurrent_downloads'
-    },
-    'ytdl_download_rate_limit': {
-        'key': 'ytdl_download_rate_limit',
-        'path': 'YoutubeDLMaterial.Downloader.download_rate_limit'
-    },
 
     // Extra
     'ytdl_title_top': {
@@ -68,18 +60,14 @@ exports.CONFIG_ITEMS = {
         'key': 'ytdl_download_only_mode',
         'path': 'YoutubeDLMaterial.Extra.download_only_mode'
     },
-    'ytdl_allow_autoplay': {
-        'key': 'ytdl_allow_autoplay',
-        'path': 'YoutubeDLMaterial.Extra.allow_autoplay'
+    'ytdl_allow_multi_download_mode': {
+        'key': 'ytdl_allow_multi_download_mode',
+        'path': 'YoutubeDLMaterial.Extra.allow_multi_download_mode'
     },
     'ytdl_enable_downloads_manager': {
         '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': {
@@ -98,27 +86,6 @@ exports.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'
-    },
-    'ytdl_use_sponsorblock_api': {
-        'key': 'ytdl_use_sponsorblock_api',
-        'path': 'YoutubeDLMaterial.API.use_sponsorblock_API'
-    },
-    'ytdl_generate_nfo_files': {
-        'key': 'ytdl_generate_nfo_files',
-        'path': 'YoutubeDLMaterial.API.generate_NFO_files'
-    },
-
 
     // Themes
     'ytdl_default_theme': {
@@ -143,9 +110,9 @@ exports.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'
+    'ytdl_subscriptions_check_interval': {
+        'key': 'ytdl_subscriptions_check_interval',
+        'path': 'YoutubeDLMaterial.Subscriptions.subscriptions_check_interval'
     },
 
     // Users
@@ -166,16 +133,6 @@ exports.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',
@@ -211,7 +168,7 @@ exports.CONFIG_ITEMS = {
     }
 };
 
-exports.AVAILABLE_PERMISSIONS = [
+AVAILABLE_PERMISSIONS = [
     'filemanager',
     'settings',
     'subscriptions',
@@ -220,6 +177,8 @@ exports.AVAILABLE_PERMISSIONS = [
     'downloads_manager'
 ];
 
-exports.DETAILS_BIN_PATH = 'node_modules/youtube-dl/bin/details'
-
-exports.CURRENT_VERSION = 'v4.2';
+module.exports = {
+    CONFIG_ITEMS: CONFIG_ITEMS,
+    AVAILABLE_PERMISSIONS: AVAILABLE_PERMISSIONS,
+    CURRENT_VERSION: 'v4.1'
+}

backend/downloader.js

@@ -1,630 +0,0 @@
-const fs = require('fs-extra');
-const { uuid } = require('uuidv4');
-const path = require('path');
-const mergeFiles = require('merge-files');
-const NodeID3 = require('node-id3')
-const Mutex = require('async-mutex').Mutex;
-
-const youtubedl = require('youtube-dl');
-
-const logger = require('./logger');
-const config_api = require('./config');
-const twitch_api = require('./twitch');
-const { create } = require('xmlbuilder2');
-const categories_api = require('./categories');
-const utils = require('./utils');
-const db_api = require('./db');
-
-const mutex = new Mutex();
-let should_check_downloads = true;
-
-const archivePath = path.join(__dirname, 'appdata', 'archives');
-
-if (db_api.database_initialized) {
-    setupDownloads();
-} else {
-    db_api.database_initialized_bs.subscribe(init => {
-        if (init) setupDownloads();
-    });
-}
-
-exports.createDownload = async (url, type, options, user_uid = null, sub_id = null, sub_name = null) => {
-    return await mutex.runExclusive(async () => {
-        const download = {
-            url: url,
-            type: type,
-            title: '',
-            user_uid: user_uid,
-            sub_id: sub_id,
-            sub_name: sub_name,
-            options: options,
-            uid: uuid(),
-            step_index: 0,
-            paused: false,
-            running: false,
-            finished_step: true,
-            error: null,
-            percent_complete: null,
-            finished: false,
-            timestamp_start: Date.now()
-        };
-        await db_api.insertRecordIntoTable('download_queue', download);
-    
-        should_check_downloads = true;
-        return download;
-    });
-}
-
-exports.pauseDownload = async (download_uid) => {
-    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-    if (download['paused']) {
-        logger.warn(`Download ${download_uid} is already paused!`);
-        return false;
-    } else if (download['finished']) {
-        logger.info(`Download ${download_uid} could not be paused before completing.`);
-        return false;
-    }
-
-    return await db_api.updateRecord('download_queue', {uid: download_uid}, {paused: true, running: false});
-}
-
-exports.resumeDownload = async (download_uid) => {
-    return await mutex.runExclusive(async () => {
-        const download = await db_api.getRecord('download_queue', {uid: download_uid});
-        if (!download['paused']) {
-            logger.warn(`Download ${download_uid} is not paused!`);
-            return false;
-        }
-
-        const success = db_api.updateRecord('download_queue', {uid: download_uid}, {paused: false});
-        should_check_downloads = true;
-        return success;
-    })
-}
-
-exports.restartDownload = async (download_uid) => {
-    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-    await exports.clearDownload(download_uid);
-    const success = !!(await exports.createDownload(download['url'], download['type'], download['options'], download['user_uid']));
-    
-    should_check_downloads = true;
-    return success;
-}
-
-exports.cancelDownload = async (download_uid) => {
-    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-    if (download['cancelled']) {
-        logger.warn(`Download ${download_uid} is already cancelled!`);
-        return false;
-    } else if (download['finished']) {
-        logger.info(`Download ${download_uid} could not be cancelled before completing.`);
-        return false;
-    }
-    return await db_api.updateRecord('download_queue', {uid: download_uid}, {cancelled: true, running: false});
-}
-
-exports.clearDownload = async (download_uid) => {
-    return await db_api.removeRecord('download_queue', {uid: download_uid});
-}
-
-async function handleDownloadError(download_uid, error_message) {
-    await db_api.updateRecord('download_queue', {uid: download_uid}, {error: error_message, finished: true, running: false});
-}
-
-async function setupDownloads() {
-    await fixDownloadState();
-    setInterval(checkDownloads, 1000);
-}
-
-async function fixDownloadState() {
-    const downloads = await db_api.getRecords('download_queue');
-    downloads.sort((download1, download2) => download1.timestamp_start - download2.timestamp_start);
-    const running_downloads = downloads.filter(download => !download['finished'] && !download['error']);
-    for (let i = 0; i < running_downloads.length; i++) {
-        const running_download = running_downloads[i];
-        const update_obj = {finished_step: true, paused: true, running: false};
-        if (running_download['step_index'] > 0) {
-            update_obj['step_index'] = running_download['step_index'] - 1;
-        }
-        await db_api.updateRecord('download_queue', {uid: running_download['uid']}, update_obj);
-    }
-}
-
-async function checkDownloads() {
-    if (!should_check_downloads) return;
-
-    const downloads = await db_api.getRecords('download_queue');
-    downloads.sort((download1, download2) => download1.timestamp_start - download2.timestamp_start);
-
-    await mutex.runExclusive(async () => {
-        // avoid checking downloads unnecessarily, but double check that should_check_downloads is still true
-        const running_downloads = downloads.filter(download => !download['paused'] && !download['finished']);
-        if (running_downloads.length === 0) {
-            should_check_downloads = false;
-            logger.verbose('Disabling checking downloads as none are available.');
-        }
-        return;
-    });
-
-    let running_downloads_count = downloads.filter(download => download['running']).length;
-    const waiting_downloads = downloads.filter(download => !download['paused'] && download['finished_step'] && !download['finished']);
-    for (let i = 0; i < waiting_downloads.length; i++) {
-        const waiting_download = waiting_downloads[i];
-        const max_concurrent_downloads = config_api.getConfigItem('ytdl_max_concurrent_downloads');
-        if (max_concurrent_downloads < 0 || running_downloads_count >= max_concurrent_downloads) break;
-
-        if (waiting_download['finished_step'] && !waiting_download['finished']) {
-            // move to next step
-            running_downloads_count++;
-            if (waiting_download['step_index'] === 0) {
-                collectInfo(waiting_download['uid']);
-            } else if (waiting_download['step_index'] === 1) {
-                downloadQueuedFile(waiting_download['uid']);
-            }
-        }
-    }
-}
-
-async function collectInfo(download_uid) {
-    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-    if (download['paused']) {
-        return;
-    }
-    logger.verbose(`Collecting info for download ${download_uid}`);
-    await db_api.updateRecord('download_queue', {uid: download_uid}, {step_index: 1, finished_step: false, running: true});
-
-    const url = download['url'];
-    const type = download['type'];
-    const options = download['options'];
-
-    if (download['user_uid'] && !options.customFileFolderPath) {
-        let usersFileFolder = config_api.getConfigItem('ytdl_users_base_path');
-        const user_path = path.join(usersFileFolder, download['user_uid'], type);
-        options.customFileFolderPath = user_path + path.sep;
-    }
-
-    let args = await exports.generateArgs(url, type, options, download['user_uid']);
-
-    // get video info prior to download
-    let info = await getVideoInfoByURL(url, args, download_uid);
-
-    if (!info) {
-        // info failed, error presumably already recorded
-        return;
-    }
-
-    let category = null;
-
-    // check if it fits into a category. If so, then get info again using new args
-    if (!Array.isArray(info) || config_api.getConfigItem('ytdl_allow_playlist_categorization')) category = await categories_api.categorize(info);
-
-    // set custom output if the category has one and re-retrieve info so the download manager has the right file name
-    if (category && category['custom_output']) {
-        options.customOutput = category['custom_output'];
-        options.noRelativePath = true;
-        args = await exports.generateArgs(url, type, options, download['user_uid']);
-        info = await getVideoInfoByURL(url, args, download_uid);
-    }
-
-    // setup info required to calculate download progress
-
-    const expected_file_size = utils.getExpectedFileSize(info);
-
-    const files_to_check_for_progress = [];
-
-    // store info in download for future use
-    if (Array.isArray(info)) {
-        for (let info_obj of info) files_to_check_for_progress.push(utils.removeFileExtension(info_obj['_filename']));
-    } else {
-        files_to_check_for_progress.push(utils.removeFileExtension(info['_filename']));
-    }
-
-    const playlist_title = Array.isArray(info) ? info[0]['playlist_title'] || info[0]['playlist'] : null;
-    await db_api.updateRecord('download_queue', {uid: download_uid}, {args: args,
-                                                                    finished_step: true,
-                                                                    running: false,
-                                                                    options: options,
-                                                                    files_to_check_for_progress: files_to_check_for_progress,
-                                                                    expected_file_size: expected_file_size,
-                                                                    title: playlist_title ? playlist_title : info['title']
-                                                                });
-}
-
-async function downloadQueuedFile(download_uid) {
-    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-    if (download['paused']) {
-        return;
-    }
-    logger.verbose(`Downloading ${download_uid}`);
-    return new Promise(async resolve => {
-        const audioFolderPath = config_api.getConfigItem('ytdl_audio_folder_path');
-        const videoFolderPath = config_api.getConfigItem('ytdl_video_folder_path');
-        await db_api.updateRecord('download_queue', {uid: download_uid}, {step_index: 2, finished_step: false, running: true});
-
-        const url = download['url'];
-        const type = download['type'];
-        const options = download['options'];
-        const args = download['args'];
-        const category = download['category'];
-        let fileFolderPath = type === 'audio' ? audioFolderPath : videoFolderPath; // TODO: fix
-        if (options.customFileFolderPath) {
-            fileFolderPath = options.customFileFolderPath;
-        }
-        fs.ensureDirSync(fileFolderPath);
-
-        const start_time = Date.now();
-
-        const download_checker = setInterval(() => checkDownloadPercent(download['uid']), 1000);
-
-        // download file
-        youtubedl.exec(url, args, {maxBuffer: Infinity}, async function(err, output) {
-            const file_objs = [];
-            let end_time = Date.now();
-            let difference = (end_time - start_time)/1000;
-            logger.debug(`${type === 'audio' ? 'Audio' : 'Video'} download delay: ${difference} seconds.`);
-            clearInterval(download_checker);
-            if (err) {
-                logger.error(err.stderr);
-                await handleDownloadError(download_uid, err.stderr);
-                resolve(false);
-                return;
-            } else if (output) {
-                if (output.length === 0 || output[0].length === 0) {
-                    // ERROR!
-                    const error_message = `No output received for video download, check if it exists in your archive.`;
-                    await handleDownloadError(download_uid, error_message);
-                    logger.warn(error_message);
-                    resolve(false);
-                    return;
-                }
-
-                for (let i = 0; i < output.length; i++) {
-                    let output_json = null;
-                    try {
-                        output_json = JSON.parse(output[i]);
-                    } catch(e) {
-                        output_json = null;
-                    }
-
-                    if (!output_json) {
-                        continue;
-                    }
-
-                    // get filepath with no extension
-                    const filepath_no_extension = utils.removeFileExtension(output_json['_filename']);
-
-                    const ext = type === 'audio' ? '.mp3' : '.mp4';
-                    var full_file_path = filepath_no_extension + ext;
-                    var file_name = filepath_no_extension.substring(fileFolderPath.length, filepath_no_extension.length);
-
-                    if (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')) {
-                            let vodId = url.split('twitch.tv/videos/')[1];
-                            vodId = vodId.split('?')[0];
-                            twitch_api.downloadTwitchChatByVODID(vodId, file_name, type, download['user_uid']);
-                    }
-
-                    // renames file if necessary due to bug
-                    if (!fs.existsSync(output_json['_filename']) && fs.existsSync(output_json['_filename'] + '.webm')) {
-                        try {
-                            fs.renameSync(output_json['_filename'] + '.webm', output_json['_filename']);
-                            logger.info('Renamed ' + file_name + '.webm to ' + file_name);
-                        } catch(e) {
-                            logger.error(`Failed to rename file ${output_json['_filename']} to its appropriate extension.`);
-                        }
-                    }
-
-                    if (type === 'audio') {
-                        let tags = {
-                            title: output_json['title'],
-                            artist: output_json['artist'] ? output_json['artist'] : output_json['uploader']
-                        }
-                        let success = NodeID3.write(tags, utils.removeFileExtension(output_json['_filename']) + '.mp3');
-                        if (!success) logger.error('Failed to apply ID3 tag to audio file ' + output_json['_filename']);
-                    }
-
-                    if (config_api.getConfigItem('ytdl_generate_nfo_files')) {
-                        exports.generateNFOFile(output_json, `${filepath_no_extension}.nfo`);
-                    }
-
-                    if (options.cropFileSettings) {
-                        await utils.cropFile(full_file_path, options.cropFileSettings.cropFileStart, options.cropFileSettings.cropFileEnd, ext);
-                    }
-
-                    // registers file in DB
-                    const file_obj = await db_api.registerFileDB(full_file_path, type, download['user_uid'], category, download['sub_id'] ? download['sub_id'] : null, options.cropFileSettings);
-
-                    file_objs.push(file_obj);
-                }
-
-                if (options.merged_string !== null && options.merged_string !== undefined) {
-                    const archive_folder = getArchiveFolder(fileFolderPath, options, download['user_uid']);
-                    const current_merged_archive = fs.readFileSync(path.join(archive_folder, `merged_${type}.txt`), 'utf8');
-                    const diff = current_merged_archive.replace(options.merged_string, '');
-                    const archive_path = path.join(archive_folder, `archive_${type}.txt`);
-                    fs.appendFileSync(archive_path, diff);
-                }
-
-                let container = null;
-
-                if (file_objs.length > 1) {
-                    // create playlist
-                    const playlist_name = file_objs.map(file_obj => file_obj.title).join(', ');
-                    container = await db_api.createPlaylist(playlist_name, file_objs.map(file_obj => file_obj.uid), type, download['user_uid']);
-                } else if (file_objs.length === 1) {
-                    container = file_objs[0];
-                } else {
-                    const error_message = 'Downloaded file failed to result in metadata object.';
-                    logger.error(error_message);
-                    await handleDownloadError(download_uid, error_message);
-                }
-
-                const file_uids = file_objs.map(file_obj => file_obj.uid);
-                await db_api.updateRecord('download_queue', {uid: download_uid}, {finished_step: true, finished: true, running: false, step_index: 3, percent_complete: 100, file_uids: file_uids, container: container});
-                resolve();
-            }
-        });
-    });
-}
-
-// helper functions
-
-exports.generateArgs = async (url, type, options, user_uid = null, simulated = false) => {
-    const audioFolderPath = config_api.getConfigItem('ytdl_audio_folder_path');
-    const videoFolderPath = config_api.getConfigItem('ytdl_video_folder_path');
-
-    const videopath = config_api.getConfigItem('ytdl_default_file_output') ? config_api.getConfigItem('ytdl_default_file_output') : '%(title)s';
-    const globalArgs = config_api.getConfigItem('ytdl_custom_args');
-    const useCookies = config_api.getConfigItem('ytdl_use_cookies');
-    const is_audio = type === 'audio';
-
-    let fileFolderPath = is_audio ? audioFolderPath : videoFolderPath;
-
-    if (options.customFileFolderPath) fileFolderPath = options.customFileFolderPath;
-
-    const customArgs = options.customArgs;
-    let customOutput = options.customOutput;
-    const customQualityConfiguration = options.customQualityConfiguration;
-
-    // video-specific args
-    const selectedHeight = options.selectedHeight;
-
-    // audio-specific args
-    const maxBitrate = options.maxBitrate;
-
-    const youtubeUsername = options.youtubeUsername;
-    const youtubePassword = options.youtubePassword;
-
-    let downloadConfig = null;
-    let qualityPath = (is_audio && !options.skip_audio_args) ? ['-f', 'bestaudio'] : ['-f', 'bestvideo+bestaudio', '--merge-output-format', 'mp4'];
-    const is_youtube = url.includes('youtu');
-    if (!is_audio && !is_youtube) {
-        // tiktok videos fail when using the default format
-        qualityPath = null;
-    } else if (!is_audio && !is_youtube && (url.includes('reddit') || url.includes('pornhub'))) {
-        qualityPath = ['-f', 'bestvideo+bestaudio']
-    }
-
-    if (customArgs) {
-        downloadConfig = customArgs.split(',,');
-    } else {
-        if (customQualityConfiguration) {
-            qualityPath = ['-f', customQualityConfiguration, '--merge-output-format', 'mp4'];
-        } else if (selectedHeight && selectedHeight !== '' && !is_audio) {
-            qualityPath = ['-f', `'(mp4)[height=${selectedHeight}'`];
-        } else if (is_audio) {
-            qualityPath = ['--audio-quality', maxBitrate ? maxBitrate : '0']
-        }
-
-        if (customOutput) {
-            customOutput = options.noRelativePath ? customOutput : path.join(fileFolderPath, customOutput);
-            downloadConfig = ['-o', `${customOutput}.%(ext)s`, '--write-info-json', '--print-json'];
-        } else {
-            downloadConfig = ['-o', path.join(fileFolderPath, videopath + (is_audio ? '.%(ext)s' : '.mp4')), '--write-info-json', '--print-json'];
-        }
-
-        if (qualityPath) downloadConfig.push(...qualityPath);
-
-        if (is_audio && !options.skip_audio_args) {
-            downloadConfig.push('-x');
-            downloadConfig.push('--audio-format', 'mp3');
-        }
-
-        if (youtubeUsername && youtubePassword) {
-            downloadConfig.push('--username', youtubeUsername, '--password', youtubePassword);
-        }
-
-        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.');
-            }
-        }
-
-        const useDefaultDownloadingAgent = config_api.getConfigItem('ytdl_use_default_downloading_agent');
-        const customDownloadingAgent = config_api.getConfigItem('ytdl_custom_downloading_agent');
-        if (!useDefaultDownloadingAgent && customDownloadingAgent) {
-            downloadConfig.splice(0, 0, '--external-downloader', customDownloadingAgent);
-        }
-
-        let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
-        if (useYoutubeDLArchive) {
-            const archive_folder = getArchiveFolder(fileFolderPath, options, user_uid);
-            const archive_path = path.join(archive_folder, `archive_${type}.txt`);
-
-            await fs.ensureDir(archive_folder);
-            await fs.ensureFile(archive_path);
-
-            const blacklist_path = path.join(archive_folder, `blacklist_${type}.txt`);
-            await fs.ensureFile(blacklist_path);
-
-            const merged_path = path.join(archive_folder, `merged_${type}.txt`);
-            await fs.ensureFile(merged_path);
-            // merges blacklist and regular archive
-            let inputPathList = [archive_path, blacklist_path];
-            await mergeFiles(inputPathList, merged_path);
-
-            options.merged_string = await fs.readFile(merged_path, "utf8");
-
-            downloadConfig.push('--download-archive', merged_path);
-        }
-
-        if (config_api.getConfigItem('ytdl_include_thumbnail')) {
-            downloadConfig.push('--write-thumbnail');
-        }
-
-        if (globalArgs && globalArgs !== '') {
-            // adds global args
-            if (downloadConfig.indexOf('-o') !== -1 && globalArgs.split(',,').indexOf('-o') !== -1) {
-                // if global args has an output, replce the original output with that of global args
-                const original_output_index = downloadConfig.indexOf('-o');
-                downloadConfig.splice(original_output_index, 2);
-            }
-            downloadConfig = downloadConfig.concat(globalArgs.split(',,'));
-        }
-
-        if (options.additionalArgs && options.additionalArgs !== '') {
-            downloadConfig = downloadConfig.concat(options.additionalArgs.split(',,'));
-        }
-
-        const rate_limit = config_api.getConfigItem('ytdl_download_rate_limit');
-        if (rate_limit && downloadConfig.indexOf('-r') === -1 && downloadConfig.indexOf('--limit-rate') === -1) {
-            downloadConfig.push('-r', rate_limit);
-        }
-        
-        const default_downloader = utils.getCurrentDownloader() || config_api.getConfigItem('ytdl_default_downloader');
-        if (default_downloader === 'yt-dlp') {
-            downloadConfig.push('--no-clean-infojson');
-        }
-
-    }
-
-    // filter out incompatible args
-    downloadConfig = filterArgs(downloadConfig, is_audio);
-
-    if (!simulated) logger.verbose(`youtube-dl args being used: ${downloadConfig.join(',')}`);
-    return downloadConfig;
-}
-
-async function getVideoInfoByURL(url, args = [], download_uid = null) {
-    return new Promise(resolve => {
-        // remove bad args
-        const new_args = [...args];
-
-        const archiveArgIndex = new_args.indexOf('--download-archive');
-        if (archiveArgIndex !== -1) {
-            new_args.splice(archiveArgIndex, 2);
-        }
-
-        new_args.push('--dump-json');
-
-        youtubedl.exec(url, new_args, {maxBuffer: Infinity}, async (err, output) => {
-            if (output) {
-                let outputs = [];
-                try {
-                    for (let i = 0; i < output.length; i++) {
-                        let output_json = null;
-                        try {
-                            output_json = JSON.parse(output[i]);
-                        } catch(e) {
-                            output_json = null;
-                        }
-    
-                        if (!output_json) {
-                            continue;
-                        }
-
-                        outputs.push(output_json);
-                    }
-                    resolve(outputs.length === 1 ? outputs[0] : outputs);
-                } catch(e) {
-                    const error = `Error while retrieving info on video with URL ${url} with the following message: output JSON could not be parsed. Output JSON: ${output}`;
-                    logger.error(error);
-                    if (download_uid) {
-                        await handleDownloadError(download_uid, error);
-                    }
-                    resolve(null);
-                }
-            } else {
-                let error_message = `Error while retrieving info on video with URL ${url} with the following message: ${err}`;
-                if (err.stderr) error_message += `\n\n${err.stderr}`;
-                logger.error(error_message);
-                if (download_uid) {
-                    await handleDownloadError(download_uid, error_message);
-                }
-                resolve(null);
-            }
-        });
-    });
-}
-
-function filterArgs(args, isAudio) {
-    const video_only_args = ['--add-metadata', '--embed-subs', '--xattrs'];
-    const audio_only_args = ['-x', '--extract-audio', '--embed-thumbnail'];
-    const args_to_remove = isAudio ? video_only_args : audio_only_args;
-    return args.filter(x => !args_to_remove.includes(x));
-}
-
-async function checkDownloadPercent(download_uid) {
-    /*
-    This is more of an art than a science, we're just selecting files that start with the file name,
-    thus capturing the parts being downloaded in files named like so: '<video title>.<format>.<ext>.part'.
-
-    Any file that starts with <video title> will be counted as part of the "bytes downloaded", which will
-    be divided by the "total expected bytes."
-    */
-
-    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-    const files_to_check_for_progress = download['files_to_check_for_progress'];
-    const resulting_file_size = download['expected_file_size'];
-
-    if (!resulting_file_size) return;
-
-    let sum_size = 0;
-    for (let i = 0; i < files_to_check_for_progress.length; i++) {
-        const file_to_check_for_progress = files_to_check_for_progress[i];
-        const dir = path.dirname(file_to_check_for_progress);
-        if (!fs.existsSync(dir)) continue;
-        fs.readdir(dir, async (err, files) => {
-            for (let j = 0; j < files.length; j++) {
-                const file = files[j];
-                if (!file.includes(path.basename(file_to_check_for_progress))) continue;
-                try {
-                    const file_stats = fs.statSync(path.join(dir, file));
-                    if (file_stats && file_stats.size) {
-                        sum_size += file_stats.size;
-                    }
-                } catch (e) {}
-            }
-            
-            const percent_complete = (sum_size/resulting_file_size * 100).toFixed(2);
-            await db_api.updateRecord('download_queue', {uid: download_uid}, {percent_complete: percent_complete});
-        });
-    }
-}
-
-exports.generateNFOFile = (info, output_path) => {
-    const nfo_obj = {
-        episodedetails: {
-            title: info['fulltitle'],
-            episode: info['playlist_index'] ? info['playlist_index'] : undefined,
-            premiered: utils.formatDateString(info['upload_date']),
-            plot: `${info['uploader_url']}\n${info['description']}\n${info['playlist_title'] ? info['playlist_title'] : ''}`,
-            director: info['artist'] ? info['artist'] : info['uploader']
-        }
-    };
-    const doc = create(nfo_obj);
-    const xml = doc.end({ prettyPrint: true });
-    fs.writeFileSync(output_path, xml);
-}
-
-function getArchiveFolder(fileFolderPath, options, user_uid) {
-    if (options.customArchivePath) {
-        return path.join(options.customArchivePath);
-    } else if (user_uid) {
-        return path.join(fileFolderPath, 'archives');
-    } else {
-        return path.join(archivePath);
-    }
-}

backend/ecosystem.config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  apps : [{
-    name   : "YoutubeDL-Material",
-    script : "./app.js",
-    watch  : "placeholder",
-    watch_delay: 5000
-  }]
-}

backend/entrypoint.sh

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

backend/logger.js

@@ -1,23 +0,0 @@
-const winston = require('winston');
-
-let debugMode = process.env.YTDL_MODE === 'debug';
-
-const defaultFormat = winston.format.printf(({ level, message, label, timestamp }) => {
-    return `${timestamp} ${level.toUpperCase()}: ${message}`;
-});
-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: !debugMode ? 'info' : 'debug', name: 'console'})
-    ]
-});
-
-module.exports = logger;

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": {
@@ -30,42 +28,36 @@
   },
   "homepage": "",
   "dependencies": {
-    "archiver": "^5.3.1",
-    "async": "^3.2.3",
-    "async-mutex": "^0.3.1",
-    "axios": "^0.21.2",
+    "archiver": "^3.1.1",
+    "async": "^3.1.0",
     "bcryptjs": "^2.4.0",
     "compression": "^1.7.4",
     "config": "^3.2.3",
-    "express": "^4.17.3",
+    "exe": "^1.0.2",
+    "express": "^4.17.1",
     "fluent-ffmpeg": "^2.1.2",
     "fs-extra": "^9.0.0",
+    "glob": "^7.1.6",
     "jsonwebtoken": "^8.5.1",
     "lowdb": "^1.0.0",
     "md5": "^2.2.1",
     "merge-files": "^0.1.2",
-    "mocha": "^9.2.2",
-    "moment": "^2.29.2",
-    "mongodb": "^3.6.9",
     "multer": "^1.4.2",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^2.6.1",
     "node-id3": "^0.1.14",
-    "node-schedule": "^2.1.0",
-    "nodemon": "^2.0.7",
+    "nodemon": "^2.0.2",
     "passport": "^0.4.1",
     "passport-http": "^0.3.0",
     "passport-jwt": "^4.0.0",
-    "passport-ldapauth": "^3.0.1",
+    "passport-ldapauth": "^2.1.4",
     "passport-local": "^1.0.0",
     "progress": "^2.0.3",
     "ps-node": "^0.1.6",
     "read-last-lines": "^1.7.2",
-    "rxjs": "^7.3.0",
     "shortid": "^2.2.15",
     "unzipper": "^0.10.10",
     "uuidv4": "^6.0.6",
-    "winston": "^3.7.2",
-    "xmlbuilder2": "^3.0.2",
+    "winston": "^3.2.1",
     "youtube-dl": "^3.0.2"
   }
 }

backend/pm2.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-    apps : [{
-      name   : "YoutubeDL-Material",
-      script : "./app.js",
-      watch  : "placeholder",
-      out_file: "/dev/null",
-      error_file: "/dev/null"
-    }]
-}

backend/subscriptions.js

@@ -1,15 +1,27 @@
-const fs = require('fs-extra');
-const path = require('path');
-const youtubedl = require('youtube-dl');
+const FileSync = require('lowdb/adapters/FileSync')
 
+var fs = require('fs-extra');
+const { uuid } = require('uuidv4');
+var path = require('path');
+
+var youtubedl = require('youtube-dl');
 const config_api = require('./config');
-const utils = require('./utils');
-const logger = require('./logger');
+var utils = require('./utils')
 
 const debugMode = process.env.YTDL_MODE === 'debug';
 
-const db_api = require('./db');
-const downloader_api = require('./downloader');
+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);
+}
 
 async function subscribe(sub, user_uid = null) {
     const result_obj = {
@@ -21,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.`);
@@ -30,16 +47,23 @@ async function subscribe(sub, user_uid = null) {
             return;
         }
 
-        sub['user_uid'] = user_uid ? user_uid : undefined;
-        await db_api.insertRecordIntoTable('subscriptions', sub);
-
-        let success = await getSubscriptionInfo(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.')
-        }
+        };
 
         result_obj.success = success;
         result_obj.sub = sub;
@@ -48,7 +72,13 @@ async function subscribe(sub, user_uid = null) {
 
 }
 
-async function getSubscriptionInfo(sub) {
+async function getSubscriptionInfo(sub, 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');
+
     // get videos
     let downloadConfig = ['--dump-json', '--playlist-end', '1'];
     let useCookies = config_api.getConfigItem('ytdl_use_cookies');
@@ -60,8 +90,8 @@ async function getSubscriptionInfo(sub) {
         }
     }
 
-    return new Promise(async resolve => {
-        youtubedl.exec(sub.url, downloadConfig, {maxBuffer: Infinity}, async (err, output) => {
+    return new Promise(resolve => {
+        youtubedl.exec(sub.url, downloadConfig, {}, function(err, output) {
             if (debugMode) {
                 logger.info('Subscribe: got info for subscription ' + sub.id);
             }
@@ -91,10 +121,31 @@ async function getSubscriptionInfo(sub) {
                         }
                         // 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();
                         }
                     }
 
+                    const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
+                    if (useArchive && !sub.archive) {
+                        // must create the archive
+                        const archive_dir = path.join(__dirname, basePath, 'archives', sub.name);
+                        const archive_path = path.join(archive_dir, 'archive.txt');
+
+                        // creates archive directory and text file if it doesn't exist
+                        fs.ensureDirSync(archive_dir);
+                        fs.ensureFileSync(archive_path);
+
+                        // updates subscription
+                        sub.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
 
                     resolve(true);
@@ -111,25 +162,13 @@ async function unsubscribe(sub, deleteMode, user_uid = null) {
         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;
-
-    const sub_files = await db_api.getRecords('files', {sub_id: id});
-    for (let i = 0; i < sub_files.length; i++) {
-        const sub_file = sub_files[i];
-        if (config_api.descriptors[sub_file['uid']]) {
-            try {
-                for (let i = 0; i < config_api.descriptors[sub_file['uid']].length; i++) {
-                    config_api.descriptors[sub_file['uid']][i].destroy();
-                }
-            } catch(e) {
-                continue;
-            }
-        }
-    }
-
-    await db_api.removeRecord('subscriptions', {id: id});
-    await db_api.removeAllRecords('files', {sub_id: 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) {
@@ -151,23 +190,27 @@ async function unsubscribe(sub, deleteMode, user_uid = null) {
 }
 
 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;
-
-    await db_api.removeRecord('files', {uid: file_uid});
+    sub_db.get('videos').remove({uid: file_uid}).write();
 
     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');
+    var altImageFilePath = path.join(__dirname,filePath,name+'.jpg');
 
     const [jsonExists, videoFileExists, imageFileExists, altImageFileExists] = await Promise.all([
         fs.pathExists(jsonPath),
@@ -199,7 +242,7 @@ async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null,
                 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);
+                    await removeIDFromArchive(archive_path, retrievedID);
                 }
             }
             return true;
@@ -211,124 +254,17 @@ async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null,
 }
 
 async function getVideosForSub(sub, user_uid = null) {
-    const latest_sub_obj = await getSubscription(sub.id);
-    if (!latest_sub_obj || latest_sub_obj['downloading']) {
+    if (!subExists(sub.id, user_uid)) {
         return false;
     }
 
-    updateSubscriptionProperty(sub, {downloading: true}, user_uid);
-
-    // get basePath
-    let basePath = null;
+    // get sub_db
+    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});
 
-    let appendedBasePath = getAppendedBasePath(sub, basePath);
-    fs.ensureDirSync(appendedBasePath);
-
-    const downloadConfig = await generateArgsForSubscription(sub, user_uid);
-
-    // get videos
-    logger.verbose(`Subscription: getting videos for subscription ${sub.name} with args: ${downloadConfig.join(',')}`);
-
-    return new Promise(async resolve => {
-        youtubedl.exec(sub.url, downloadConfig, {maxBuffer: Infinity}, async function(err, output) {
-            // cleanup
-            updateSubscriptionProperty(sub, {downloading: false}, user_uid);
-
-            logger.verbose('Subscription: finished check for ' + sub.name);
-            if (err && !output) {
-                logger.error(err.stderr ? err.stderr : err.message);
-                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 {
-                        // TODO: reimplement
-
-                        // 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)
-                        //     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']);
-                        //         }
-                        //     }
-                        // }
-                    } catch(e) {
-                        logger.error('Backup method failed. See error below:');
-                        logger.error(e);
-                    }
-                }
-                resolve(false);
-            } else if (output) {
-                if (config_api.getConfigItem('ytdl_subscriptions_redownload_fresh_uploads')) {
-                    await setFreshUploads(sub, user_uid);
-                    checkVideosForFreshUploads(sub, user_uid);
-                }
-
-                if (output.length === 0 || (output.length === 1 && output[0] === '')) {
-                    logger.verbose('No additional videos to download for ' + sub.name);
-                    resolve(true);
-                    return;
-                }
-
-                const output_jsons = [];
-                for (let i = 0; i < output.length; i++) {
-                    let output_json = null;
-                    try {
-                        output_json = JSON.parse(output[i]);
-                        output_jsons.push(output_json);
-                    } catch(e) {
-                        output_json = null;
-                    }
-                    if (!output_json) {
-                        continue;
-                    }
-                }
-
-                const files_to_download = await getFilesToDownload(sub, output_jsons);
-                const base_download_options = generateOptionsForSubscriptionDownload(sub, user_uid);
-
-                for (let j = 0; j < files_to_download.length; j++) {
-                    const file_to_download = files_to_download[j];
-                    await downloader_api.createDownload(file_to_download['webpage_url'], sub.type || 'video', base_download_options, user_uid, sub.id, sub.name);
-                }
-
-                resolve(files_to_download);
-           }
-        });
-    }, err => {
-        logger.error(err);
-        updateSubscriptionProperty(sub, {downloading: false}, user_uid);
-    });
-}
-
-function generateOptionsForSubscriptionDownload(sub, user_uid) {
-    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 default_output = config_api.getConfigItem('ytdl_default_file_output') ? config_api.getConfigItem('ytdl_default_file_output') : '%(title)s';
-
-    const base_download_options = {
-        selectedHeight: sub.maxQuality && sub.maxQuality !== 'best' ? sub.maxQuality : null,
-        customFileFolderPath: getAppendedBasePath(sub, basePath),
-        customOutput: sub.custom_output ? `${sub.custom_output}` : `${default_output}`,
-        customArchivePath: path.join(__dirname, basePath, 'archives', sub.name),
-        additionalArgs: sub.custom_args
-    }
-
-    return base_download_options;
-}
-
-async function generateArgsForSubscription(sub, user_uid, redownload = false, desired_path = null) {
     // get basePath
     let basePath = null;
     if (user_uid)
@@ -338,18 +274,25 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
 
     const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
 
-    let appendedBasePath = getAppendedBasePath(sub, basePath);
+    let appendedBasePath = null
+    appendedBasePath = getAppendedBasePath(sub, basePath);
 
-    const file_output = config_api.getConfigItem('ytdl_default_file_output') ? config_api.getConfigItem('ytdl_default_file_output') : '%(title)s';
-
-    let fullOutput = `"${appendedBasePath}/${file_output}.%(ext)s"`;
-    if (desired_path) {
-        fullOutput = `"${desired_path}.%(ext)s"`;
-    } else if (sub.custom_output) {
-        fullOutput = `"${appendedBasePath}/${sub.custom_output}.%(ext)s"`;
+    let multiUserMode = null;
+    if (user_uid) {
+        multiUserMode = {
+            user: user_uid,
+            file_path: appendedBasePath
+        }
     }
 
-    let downloadConfig = ['--dump-json', '-o', fullOutput, !redownload ? '-ciw' : '-ci', '--write-info-json', '--print-json'];
+    const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4'
+
+    let fullOutput = `${appendedBasePath}/%(title)s.%(ext)s`;
+    if (sub.custom_output) {
+        fullOutput = `${appendedBasePath}/${sub.custom_output}.%(ext)s`;
+    }
+
+    let downloadConfig = ['-o', fullOutput, '-ciw', '--write-info-json', '--print-json'];
 
     let qualityPath = null;
     if (sub.type && sub.type === 'audio') {
@@ -364,7 +307,7 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
     downloadConfig.push(...qualityPath)
 
     if (sub.custom_args) {
-        const customArgsArray = sub.custom_args.split(',,');
+        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');
@@ -376,7 +319,7 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
     let archive_dir = null;
     let archive_path = null;
 
-    if (useArchive && !redownload) {
+    if (useArchive) {
         if (sub.archive) {
             archive_dir = sub.archive;
             archive_path = path.join(archive_dir, 'archive.txt')
@@ -389,7 +332,7 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
         downloadConfig = ['-f', 'best', '--dump-json'];
     }
 
-    if (sub.timerange && !redownload) {
+    if (sub.timerange) {
         downloadConfig.push('--dateafter', sub.timerange);
     }
 
@@ -406,136 +349,159 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
         downloadConfig.push('--write-thumbnail');
     }
 
-    const rate_limit = config_api.getConfigItem('ytdl_download_rate_limit');
-    if (rate_limit && downloadConfig.indexOf('-r') === -1 && downloadConfig.indexOf('--limit-rate') === -1) {
-        downloadConfig.push('-r', rate_limit);
-    }
+    // get videos
+    logger.verbose('Subscription: getting videos for subscription ' + sub.name);
 
-    const default_downloader = utils.getCurrentDownloader() || config_api.getConfigItem('ytdl_default_downloader');
-    if (default_downloader === 'yt-dlp') {
-        downloadConfig.push('--no-clean-infojson');
-    }
-
-    return downloadConfig;
-}
-
-async function getFilesToDownload(sub, output_jsons) {
-    const files_to_download = [];
-    for (let i = 0; i < output_jsons.length; i++) {
-        const output_json = output_jsons[i];
-        const file_missing = !(await db_api.getRecord('files', {sub_id: sub.id, url: output_json['webpage_url']})) && !(await db_api.getRecord('download_queue', {sub_id: sub.id, url: output_json['webpage_url'], error: null, finished: false}));
-        if (file_missing) {
-            const file_with_path_exists = await db_api.getRecord('files', {sub_id: sub.id, path: output_json['_filename']});
-            if (file_with_path_exists) {
-                // or maybe just overwrite???
-                logger.info(`Skipping adding file ${output_json['_filename']} for subscription ${sub.name} as a file with that path already exists.`)
-            }
-            files_to_download.push(output_json);
-        }
-    }
-    return files_to_download;
-}
-
-
-async function getSubscriptions(user_uid = null) {
-    return await db_api.getRecords('subscriptions', {user_uid: user_uid});
-}
-
-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);
-}
-
-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) {
-    await db_api.updateRecord('subscriptions', {id: sub.id}, sub);
-    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) {
-    // TODO: combine with updateSubscription
-    await db_api.updateRecord('subscriptions', {id: sub.id}, assignment_obj);
-    return true;
-}
-
-async function setFreshUploads(sub) {
-    const sub_files = await db_api.getRecords('files', {sub_id: sub.id});
-    const current_date = new Date().toISOString().split('T')[0].replace(/-/g, '');
-    sub_files.forEach(async file => {
-        if (current_date === file['upload_date'].replace(/-/g, '')) {
-            // set upload as fresh
-            const file_uid = file['uid'];
-            await db_api.setVideoProperty(file_uid, {'fresh_upload': true});
-        }
-    });
-}
-
-async function checkVideosForFreshUploads(sub, user_uid) {
-    const sub_files = await db_api.getRecords('files', {sub_id: sub.id});
-    const current_date = new Date().toISOString().split('T')[0].replace(/-/g, '');
-    sub_files.forEach(async file => {
-        if (file['fresh_upload'] && current_date > file['upload_date'].replace(/-/g, '')) {
-            await checkVideoIfBetterExists(file, 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]});
+    return new Promise(resolve => {
+        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);
+                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]);
+                            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
+                                fs.appendFileSync(archive_path, output['id']);
+                            }
+                        }
+                    } catch(e) {
+                        logger.error('Backup method failed. See error below:');
+                        logger.error(e);
                     }
-                });
-            } 
-        }
+                }
+                resolve(false);
+            } else if (output) {
+                if (output.length === 0 || (output.length === 1 && output[0] === '')) {
+                    logger.verbose('No additional videos to download for ' + sub.name);
+                    resolve(true);
+                }
+                for (let i = 0; i < output.length; i++) {
+                    let output_json = null;
+                    try {
+                        output_json = JSON.parse(output[i]);
+                    } catch(e) {
+                        output_json = null;
+                    }
+                    if (!output_json) {
+                        continue;
+                    }
+
+                    const reset_videos = i === 0;
+                    handleOutputJSON(sub, sub_db, output_json, multiUserMode, reset_videos);
+
+                    // TODO: Potentially store downloaded files in db?
+
+                }
+                resolve(true);
+            }
+        });
+    }, err => {
+        logger.error(err);
     });
-    await db_api.setVideoProperty(file_obj['uid'], {'fresh_upload': false});
+}
+
+function handleOutputJSON(sub, sub_db, output_json, multiUserMode = null, reset_videos = false) {
+    if (sub.streamingOnly) {
+        if (reset_videos) {
+            sub_db.assign({videos: []}).write();
+        }
+
+        // remove unnecessary info
+        output_json.formats = null;
+
+        // add to db
+        sub_db.get('videos').push(output_json).write();
+    } else {
+        db_api.registerFileDB(path.basename(output_json['_filename']), sub.type, multiUserMode, sub);
+    }
+}
+
+function getAllSubscriptions(user_uid = null) {
+    if (user_uid)
+        return users_db.get('users').find({uid: user_uid}).get('subscriptions').value();
+    else
+        return db.get('subscriptions').value();
+}
+
+function 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();
+}
+
+function getSubscriptionByName(subName, user_uid = null) {
+    if (user_uid)
+        return users_db.get('users').find({uid: user_uid}).get('subscriptions').find({name: subName}).value();
+    else
+        return db.get('subscriptions').find({name: subName}).value();
+}
+
+function updateSubscription(sub, user_uid = null) {
+    if (user_uid) {
+        users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id}).assign(sub).write();
+    } else {
+        db.get('subscriptions').find({id: sub.id}).assign(sub).write();
+    }
+    return true;
+}
+
+function subExists(subID, user_uid = null) {
+    if (user_uid)
+        return !!users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: subID}).value();
+    else
+        return !!db.get('subscriptions').find({id: subID}).value();
 }
 
 // helper functions
 
 function getAppendedBasePath(sub, base_path) {
+
     return path.join(base_path, (sub.isPlaylist ? 'playlists/' : 'channels/'), sub.name);
 }
 
+async function removeIDFromArchive(archive_path, id) {
+    let data = await fs.readFile(archive_path, {encoding: 'utf-8'});
+    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;
+}
+
 module.exports = {
     getSubscription        : getSubscription,
     getSubscriptionByName  : getSubscriptionByName,
-    getSubscriptions       : getSubscriptions,
     getAllSubscriptions    : getAllSubscriptions,
     updateSubscription     : updateSubscription,
     subscribe              : subscribe,
     unsubscribe            : unsubscribe,
     deleteSubscriptionFile : deleteSubscriptionFile,
     getVideosForSub        : getVideosForSub,
-    updateSubscriptionPropertyMultiple : updateSubscriptionPropertyMultiple,
-    generateOptionsForSubscriptionDownload: generateOptionsForSubscriptionDownload
+    removeIDFromArchive    : removeIDFromArchive,
+    setLogger              : setLogger,
+    initialize             : initialize
 }

backend/tasks.js

@@ -1,195 +0,0 @@
-const db_api = require('./db');
-const youtubedl_api = require('./youtube-dl');
-
-const fs = require('fs-extra');
-const logger = require('./logger');
-const scheduler = require('node-schedule');
-
-const TASKS = {
-    backup_local_db: {
-        run: db_api.backupDB,
-        title: 'Backup DB',
-        job: null
-    },
-    missing_files_check: {
-        run: checkForMissingFiles,
-        confirm: deleteMissingFiles,
-        title: 'Missing files check',
-        job: null
-    },
-    missing_db_records: {
-        run: db_api.importUnregisteredFiles,
-        title: 'Import missing DB records',
-        job: null
-    },
-    duplicate_files_check: {
-        run: checkForDuplicateFiles,
-        confirm: removeDuplicates,
-        title: 'Find duplicate files in DB',
-        job: null
-    },
-    youtubedl_update_check: {
-        run: youtubedl_api.checkForYoutubeDLUpdate,
-        confirm: youtubedl_api.updateYoutubeDL,
-        title: 'Update youtube-dl',
-        job: null
-    }
-}
-
-function scheduleJob(task_key, schedule) {
-    // schedule has to be converted from our format to one node-schedule can consume
-    let converted_schedule = null;
-    if (schedule['type'] === 'timestamp') {
-        converted_schedule = new Date(schedule['data']['timestamp']);
-    } else if (schedule['type'] === 'recurring') {
-        const dayOfWeek = schedule['data']['dayOfWeek'] != null       ? schedule['data']['dayOfWeek'] : null;
-        const hour = schedule['data']['hour']           != null       ? schedule['data']['hour']      : null;
-        const minute = schedule['data']['minute']       != null       ? schedule['data']['minute']    : null;
-        converted_schedule = new scheduler.RecurrenceRule(null, null, null, dayOfWeek, hour, minute);
-    } else {
-        logger.error(`Failed to schedule job '${task_key}' as the type '${schedule['type']}' is invalid.`)
-        return null;
-    }
-
-    return scheduler.scheduleJob(converted_schedule, async () => {
-        const task_state = await db_api.getRecord('tasks', {key: task_key});
-        if (task_state['running'] || task_state['confirming']) {
-            logger.verbose(`Skipping running task ${task_state['key']} as it is already in progress.`);
-            return;
-        }
-        
-        // remove schedule if it's a one-time task
-        if (task_state['schedule']['type'] !== 'recurring') await db_api.updateRecord('tasks', {key: task_key}, {schedule: null});
-        // we're just "running" the task, any confirmation should be user-initiated
-        exports.executeRun(task_key);
-    });
-}
-
-if (db_api.database_initialized) {
-    exports.setupTasks();
-} else {
-    db_api.database_initialized_bs.subscribe(init => {
-        if (init) exports.setupTasks();
-    });
-}
-
-exports.setupTasks = async () => {
-    const tasks_keys = Object.keys(TASKS);
-    for (let i = 0; i < tasks_keys.length; i++) {
-        const task_key = tasks_keys[i];
-        const task_in_db = await db_api.getRecord('tasks', {key: task_key});
-        if (!task_in_db) {
-            // insert task metadata into table if missing
-            await db_api.insertRecordIntoTable('tasks', {
-                key: task_key,
-                title: TASKS[task_key]['title'],
-                last_ran: null,
-                last_confirmed: null,
-                running: false,
-                confirming: false,
-                data: null,
-                error: null,
-                schedule: null,
-                options: {}
-            });
-        } else {
-            // reset task if necessary
-            await db_api.updateRecord('tasks', {key: task_key}, {running: false, confirming: false});
-
-            // schedule task and save job
-            if (task_in_db['schedule']) {
-                // prevent timestamp schedules from being set to the past
-                if (task_in_db['schedule']['type'] === 'timestamp' && task_in_db['schedule']['data']['timestamp'] < Date.now()) {
-                    await db_api.updateRecord('tasks', {key: task_key}, {schedule: null});
-                    continue;
-                }
-                TASKS[task_key]['job'] = scheduleJob(task_key, task_in_db['schedule']);
-            }
-        }
-    }
-}
-
-exports.executeTask = async (task_key) => {
-    if (!TASKS[task_key]) {
-        logger.error(`Task ${task_key} does not exist!`);
-        return;
-    }
-    logger.verbose(`Executing task ${task_key}`);
-    await exports.executeRun(task_key);
-    if (!TASKS[task_key]['confirm']) return;
-    await exports.executeConfirm(task_key);
-    logger.verbose(`Finished executing ${task_key}`);
-}
-
-exports.executeRun = async (task_key) => {
-    logger.verbose(`Running task ${task_key}`);
-    // don't set running to true when backup up DB as it will be stick "running" if restored
-    if (task_key !== 'backup_local_db') await db_api.updateRecord('tasks', {key: task_key}, {running: true});
-    const data = await TASKS[task_key].run();
-    await db_api.updateRecord('tasks', {key: task_key}, {data: TASKS[task_key]['confirm'] ? data : null, last_ran: Date.now()/1000, running: false});
-    logger.verbose(`Finished running task ${task_key}`);
-}
-
-exports.executeConfirm = async (task_key) => {
-    logger.verbose(`Confirming task ${task_key}`);
-    if (!TASKS[task_key]['confirm']) {
-        return null;
-    }
-    await db_api.updateRecord('tasks', {key: task_key}, {confirming: true});
-    const task_obj = await db_api.getRecord('tasks', {key: task_key});
-    const data = task_obj['data'];
-    await TASKS[task_key].confirm(data);
-    await db_api.updateRecord('tasks', {key: task_key}, {confirming: false, last_confirmed: Date.now()/1000, data: null});
-    logger.verbose(`Finished confirming task ${task_key}`);
-}
-
-exports.updateTaskSchedule = async (task_key, schedule) => {
-    logger.verbose(`Updating schedule for task ${task_key}`);
-    await db_api.updateRecord('tasks', {key: task_key}, {schedule: schedule});
-    if (TASKS[task_key]['job']) {
-        TASKS[task_key]['job'].cancel();
-    }
-    if (schedule) {
-        TASKS[task_key]['job'] = scheduleJob(task_key, schedule);
-    }
-}
-
-// missing files check
-
-async function checkForMissingFiles() {
-    const missing_files = [];
-    const all_files = await db_api.getRecords('files');
-    for (let i = 0; i < all_files.length; i++) {
-        const file_to_check = all_files[i];
-        const file_exists = fs.existsSync(file_to_check['path']);
-        if (!file_exists) missing_files.push(file_to_check['uid']);
-    }
-    return {uids: missing_files};
-}
-
-async function deleteMissingFiles(data) {
-    const uids = data['uids'];
-    for (let i = 0; i < uids.length; i++) {
-        const uid = uids[i];
-        await db_api.removeRecord('files', {uid: uid});
-    }
-}
-
-// duplicate files check
-
-async function checkForDuplicateFiles() {
-    const duplicate_files = await db_api.findDuplicatesByKey('files', 'path');
-    const duplicate_uids = duplicate_files.map(duplicate_file => duplicate_file['uid']);
-    if (duplicate_uids && duplicate_uids.length > 0) {
-        return {uids: duplicate_uids};
-    }
-    return {uids: []};
-}
-
-async function removeDuplicates(data) {
-    for (let i = 0; i < data['uids'].length; i++) {
-        await db_api.removeRecord('files', {uid: data['uids'][i]});
-    }
-}
-
-exports.TASKS = TASKS;

backend/test/tests.js

@@ -1,481 +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);
-
-
-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);
-        });
-
-        it('Restore db', async function() {
-            const db_stats = await db_api.getDBStats();
-            
-            const file_name = await db_api.backupDB();
-            await db_api.restoreDB(file_name);
-
-            const new_db_stats = await db_api.getDBStats();
-
-            assert(JSON.stringify(db_stats), JSON.stringify(new_db_stats));
-        });
-    });
-
-    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() {
-            this.timeout(120000);
-            await db_api.insertRecordIntoTable('test', {test_add: 'test', test_undefined: undefined, test_null: undefined});
-            const added_record = await db_api.getRecord('test', {test_add: 'test', test_undefined: undefined, test_null: null});
-            assert(added_record['test_add'] === 'test');
-            await db_api.removeRecord('test', {test_add: 'test'});
-        });
-
-        it('Find duplicates by key', async function() {
-            const test_duplicates = [
-                {
-                    test: 'testing',
-                    key: '1'
-                },
-                {
-                    test: 'testing',
-                    key: '2'
-                },
-                {
-                    test: 'testing_missing',
-                    key: '3'
-                },
-                {
-                    test: 'testing',
-                    key: '4'
-                }
-            ];
-            await db_api.insertRecordsIntoTable('test', test_duplicates);
-            const duplicates = await db_api.findDuplicatesByKey('test', 'test');
-            console.log(duplicates);
-        });
-
-        it('Update record', async function() {
-            await db_api.insertRecordIntoTable('test', {test_update: 'test'});
-            await db_api.updateRecord('test', {test_update: 'test'}, {added_field: true});
-            const updated_record = await db_api.getRecord('test', {test_update: 'test'});
-            assert(updated_record['added_field']);
-            await db_api.removeRecord('test', {test_update: 'test'});
-        });
-
-        it('Remove record', async function() {
-            await db_api.insertRecordIntoTable('test', {test_remove: 'test'});
-            const delete_succeeded = await db_api.removeRecord('test', {test_remove: 'test'});
-            assert(delete_succeeded);
-            const deleted_record = await db_api.getRecord('test', {test_remove: 'test'});
-            assert(!deleted_record);
-        });
-
-        it('Push to record array', async function() {
-            await db_api.insertRecordIntoTable('test', {test: 'test', test_array: []});
-            await db_api.pushToRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
-            const record = await db_api.getRecord('test', {test: 'test'});
-            assert(record);
-            assert(record['test_array'].length === 1);
-        });
-
-        it('Pull from record array', async function() {
-            await db_api.insertRecordIntoTable('test', {test: 'test', test_array: ['test_item']});
-            await db_api.pullFromRecordsArray('test', {test: 'test'}, 'test_array', 'test_item');
-            const record = await db_api.getRecord('test', {test: 'test'});
-            assert(record);
-            assert(record['test_array'].length === 0);
-        });
-
-        it('Bulk add', async function() {
-            this.timeout(120000);
-            const NUM_RECORDS_TO_ADD = 2002; // max batch ops is 1000
-            const test_records = [];
-            for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
-                test_records.push({
-                    uid: uuid()
-                });
-            }
-            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);
-    //     });
-    // });
-
-});
-    
-describe('Downloader', function() {
-    const downloader_api = require('../downloader');
-    const url = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ';
-    const sub_id = 'dc834388-3454-41bf-a618-e11cb8c7de1c';
-    const options = {
-        ui_uid: uuid(),
-        user: 'admin'
-    }
-
-    beforeEach(async function() {
-        await db_api.connectToDB();
-        await db_api.removeAllRecords('download_queue');
-    });
-
-    it('Get file info', async function() {
-
-    });
-
-    it('Download file', async function() {
-        this.timeout(300000); 
-        const returned_download = await downloader_api.createDownload(url, 'video', options);
-        console.log(returned_download);
-        await utils.wait(20000);
-
-    });
-
-    it('Queue file', async function() {
-        this.timeout(300000); 
-        const returned_download = await downloader_api.createDownload(url, 'video', options);
-        console.log(returned_download);
-        await utils.wait(20000);
-    });
-
-    it('Pause file', async function() {
-
-    });
-
-    it('Generate args', async function() {
-        const args = await downloader_api.generateArgs(url, 'video', options);
-        console.log(args);
-    });
-
-    it('Generate args - subscription', async function() {
-        subscriptions_api.initialize(db_api, logger);
-        const sub = await subscriptions_api.getSubscription(sub_id);
-        const sub_options = subscriptions_api.generateOptionsForSubscriptionDownload(sub, 'admin');
-        const args = await downloader_api.generateArgs(url, 'video', sub_options, 'admin');
-        console.log(args);
-    });
-
-    it('Generate kodi NFO file', async function() {
-        const nfo_file_path = './test/sample.nfo';
-        if (fs.existsSync(nfo_file_path)) {
-            fs.unlinkSync(nfo_file_path);
-        }
-        const sample_json = fs.readJSONSync('./test/sample.info.json');
-        downloader_api.generateNFOFile(sample_json, nfo_file_path);
-        assert(fs.existsSync(nfo_file_path), true);
-        fs.unlinkSync(nfo_file_path);
-    });
-});
-
-describe('Tasks', function() {
-    const tasks_api = require('../tasks');
-    beforeEach(async function() {
-        await db_api.connectToDB();
-        await db_api.removeAllRecords('tasks');
-
-        const dummy_task = {
-            run: async () => { await utils.wait(500); return true; },
-            confirm: async () => { await utils.wait(500); return true; },
-            title: 'Dummy task',
-            job: null
-        };
-        tasks_api.TASKS['dummy_task'] = dummy_task;
-
-        await tasks_api.initialize();
-    });
-    it('Backup db', async function() {
-        const backups_original = await utils.recFindByExt('appdata', 'bak');
-        const original_length = backups_original.length;
-        await tasks_api.executeTask('backup_local_db');
-        const backups_new = await utils.recFindByExt('appdata', 'bak');
-        const new_length = backups_new.length;
-        assert(original_length, new_length-1);
-    });
-
-    it('Check for missing files', async function() {
-        await db_api.removeAllRecords('files', {uid: 'test'});
-        const test_missing_file = {uid: 'test', path: 'test/missing_file.mp4'};
-        await db_api.insertRecordIntoTable('files', test_missing_file);
-        await tasks_api.executeTask('missing_files_check');
-        const task_obj = await db_api.getRecord('tasks', {key: 'missing_files_check'});
-        assert(task_obj['data'] && task_obj['data']['uids'] && task_obj['data']['uids'].length >= 1, true);
-    });
-
-    it('Check for duplicate files', async function() {
-        this.timeout(300000);
-        await db_api.removeAllRecords('files', {uid: 'test1'});
-        await db_api.removeAllRecords('files', {uid: 'test2'});
-        const test_duplicate_file1 = {uid: 'test1', path: 'test/missing_file.mp4'};
-        const test_duplicate_file2 = {uid: 'test2', path: 'test/missing_file.mp4'};
-        const test_duplicate_file3 = {uid: 'test3', path: 'test/missing_file.mp4'};
-        await db_api.insertRecordIntoTable('files', test_duplicate_file1);
-        await db_api.insertRecordIntoTable('files', test_duplicate_file2);
-        await db_api.insertRecordIntoTable('files', test_duplicate_file3);
-        await tasks_api.executeTask('duplicate_files_check');
-        const task_obj = await db_api.getRecord('tasks', {key: 'duplicate_files_check'});
-        const duplicated_record_count = await db_api.getRecords('files', {path: 'test/missing_file.mp4'}, true);
-        assert(task_obj['data'] && task_obj['data']['uids'] && task_obj['data']['uids'].length >= 1, true);
-        assert(duplicated_record_count == 1, true);
-    });
-
-    it('Import unregistered files', async function() {
-        this.timeout(300000);
-
-        // pre-test cleanup
-        await db_api.removeAllRecords('files', {title: 'Sample File'});
-        if (fs.existsSync('video/sample.info.json')) fs.unlinkSync('video/sample.info.json');
-        if (fs.existsSync('video/sample.mp4'))       fs.unlinkSync('video/sample.mp4');
-
-        // copies in files
-        fs.copyFileSync('test/sample.info.json', 'video/sample.info.json');
-        fs.copyFileSync('test/sample.mp4', 'video/sample.mp4');
-        await tasks_api.executeTask('missing_db_records');
-        const imported_file = await db_api.getRecord('files', {title: 'Sample File'});
-        assert(!!imported_file, true);
-        
-        // post-test cleanup
-        if (fs.existsSync('video/sample.info.json')) fs.unlinkSync('video/sample.info.json');
-        if (fs.existsSync('video/sample.mp4'))       fs.unlinkSync('video/sample.mp4');
-    });
-
-    it('Schedule and cancel task', async function() {
-        const today_4_hours = new Date();
-        today_4_hours.setHours(today_4_hours.getHours() + 4);
-        await tasks_api.updateTaskSchedule('dummy_task', today_4_hours);
-        assert(!!tasks_api.TASKS['dummy_task']['job'], true);
-        await tasks_api.updateTaskSchedule('dummy_task', null);
-        assert(!!tasks_api.TASKS['dummy_task']['job'], false);
-    });
-
-    it('Schedule and run task', async function() {
-        this.timeout(5000);
-        const today_1_second = new Date();
-        today_1_second.setSeconds(today_1_second.getSeconds() + 1);
-        await tasks_api.updateTaskSchedule('dummy_task', today_1_second);
-        assert(!!tasks_api.TASKS['dummy_task']['job'], true);
-        await utils.wait(2000);
-        const dummy_task_obj = await db_api.getRecord('tasks', {key: 'dummy_task'});
-        assert(dummy_task_obj['data'], true);
-    });
-});

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,13 +1,6 @@
-const fs = require('fs-extra');
-const path = require('path');
-const ffmpeg = require('fluent-ffmpeg');
-const archiver = require('archiver');
-const fetch = require('node-fetch');
-const ProgressBar = require('progress');
-
+var fs = require('fs-extra')
+var path = require('path')
 const config_api = require('./config');
-const logger = require('./logger');
-const CONSTS = require('./consts');
 
 const is_windows = process.platform === 'win32';
 
@@ -27,7 +20,7 @@ function getTrueFileName(unfixed_path, type) {
     return fixed_path;
 }
 
-async function getDownloadedFilesByType(basePath, type, full_metadata = false) {
+async function getDownloadedFilesByType(basePath, type) {
     // return empty array if the path doesn't exist
     if (!(await fs.pathExists(basePath))) return [];
 
@@ -43,58 +36,23 @@ async function getDownloadedFilesByType(basePath, type, full_metadata = false) {
         var id = file_path.substring(0, file_path.length-4);
         var jsonobj = await getJSONByType(type, id, basePath);
         if (!jsonobj) continue;
-        if (full_metadata) {
-            jsonobj['id'] = id;
-            files.push(jsonobj);
-            continue;
-        }
-        var upload_date = formatDateString(jsonobj.upload_date);
+        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(file_name, 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', file_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');
@@ -127,31 +85,16 @@ 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)
 }
 
-function getDownloadedThumbnail(file_path) {
-    const file_path_no_extension = removeFileExtension(file_path);
+function getDownloadedThumbnail(name, type, customPath = null) {
+    if (!customPath) customPath = type === 'audio' ? config_api.getConfigItem('ytdl_audio_folder_path') : config_api.getConfigItem('ytdl_video_folder_path');
 
-    let jpgPath = file_path_no_extension + '.jpg';
-    let webpPath = file_path_no_extension + '.webp';
-    let pngPath = file_path_no_extension + '.png';
+    let jpgPath = path.join(customPath, name + '.jpg');
+    let webpPath = path.join(customPath, name + '.webp');
+    let pngPath = path.join(customPath, name + '.png');
 
     if (fs.existsSync(jpgPath))
         return jpgPath;
@@ -163,41 +106,39 @@ function getDownloadedThumbnail(file_path) {
         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];
+function getExpectedFileSize(info_json) {
+    if (info_json['filesize']) {
+        return info_json['filesize'];
+    }
 
+    const formats = info_json['format_id'].split('+');
     let expected_filesize = 0;
-    info_jsons.forEach(info_json => {
-        const formats = info_json['format_id'].split('+');
-        let individual_expected_filesize = 0;
-        formats.forEach(format_id => {
-            info_json.formats.forEach(available_format => {
-                if (available_format.format_id === format_id && available_format.filesize) {
-                    individual_expected_filesize += available_format.filesize;
-                }
-            });
+    formats.forEach(format_id => {
+        if (!info_json.formats) return expected_filesize;
+        info_json.formats.forEach(available_format => {
+            if (available_format.format_id === format_id && available_format.filesize) {
+                expected_filesize += available_format.filesize;
+            }
         });
-        expected_filesize += individual_expected_filesize;
     });
 
     return expected_filesize;
 }
 
-function fixVideoMetadataPerms(file_path, type) {
+function fixVideoMetadataPerms(name, type, customPath = null) {
     if (is_windows) return;
+    if (!customPath) customPath = type === 'audio' ? config_api.getConfigItem('ytdl_audio_folder_path')
+                                                   : config_api.getConfigItem('ytdl_video_folder_path');
 
     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',
+        path.join(customPath, name + '.info.json'),
+        path.join(customPath, name + ext + '.info.json'),
         // Thumbnails
-        file_path_no_extension + '.webp',
-        file_path_no_extension + '.jpg'
+        path.join(customPath, name + '.webp'),
+        path.join(customPath, name + '.jpg')
     ];
 
     for (const file of files_to_fix) {
@@ -206,70 +147,20 @@ function fixVideoMetadataPerms(file_path, type) {
     }
 }
 
-function deleteJSONFile(file_path, type) {
-    const ext = type === 'audio' ? '.mp3' : '.mp4';
+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');
 
-    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';
+    const ext = type === 'audio' ? '.mp3' : '.mp4';
+    let json_path = path.join(customPath, name + '.info.json');
+    let alternate_json_path = path.join(customPath, name + 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;
-}
-
-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;
-}
-
-function getCurrentDownloader() {
-    const details_json = fs.readJSONSync(CONSTS.DETAILS_BIN_PATH);
-    return details_json['downloader'];
-}
-
-async function recFindByExt(base, ext, files, result, recursive = true)
+async function recFindByExt(base,ext,files,result)
 {
     files = files || (await fs.readdir(base))
     result = result || []
@@ -278,7 +169,6 @@ async function recFindByExt(base, ext, files, result, recursive = true)
         var newbase = path.join(base,file)
         if ( (await fs.stat(newbase)).isDirectory() )
         {
-            if (!recursive) continue;
             result = await recFindByExt(newbase,ext,await fs.readdir(newbase),result)
         }
         else
@@ -292,132 +182,9 @@ async function recFindByExt(base, ext, files, result, recursive = true)
     return result
 }
 
-function removeFileExtension(filename) {
-    const filename_parts = filename.split('.');
-    filename_parts.splice(filename_parts.length - 1);
-    return filename_parts.join('.');
-}
-
-function formatDateString(date_string) {
-    return date_string ? `${date_string.substring(0, 4)}-${date_string.substring(4, 6)}-${date_string.substring(6, 8)}` : 'N/A';
-}
-
-function createEdgeNGrams(str) {
-    if (str && str.length > 3) {
-        const minGram = 3
-        const maxGram = str.length
-        
-        return str.split(" ").reduce((ngrams, token) => {
-            if (token.length > minGram) {   
-                for (let i = minGram; i <= maxGram && i <= token.length; ++i) {
-                    ngrams = [...ngrams, token.substr(0, i)]
-                }
-            } else {
-                ngrams = [...ngrams, token]
-            }
-            return ngrams
-        }, []).join(" ")
-    }
-    
-    return str
-}
-
-// ffmpeg helper functions
-
-async function cropFile(file_path, start, end, ext) {
-    return new Promise(resolve => {
-        const temp_file_path = `${file_path}.cropped${ext}`;
-        let base_ffmpeg_call = ffmpeg(file_path);
-        if (start) {
-            base_ffmpeg_call = base_ffmpeg_call.seekOutput(start);
-        }
-        if (end) {
-            base_ffmpeg_call = base_ffmpeg_call.duration(end - start);
-        }
-        base_ffmpeg_call
-            .on('end', () => {
-                logger.verbose(`Cropping for '${file_path}' complete.`);
-                fs.unlinkSync(file_path);
-                fs.moveSync(temp_file_path, file_path);
-                resolve(true);
-            })
-            .on('error', (err) => {
-                logger.error(`Failed to crop ${file_path}.`);
-                logger.error(err);
-                resolve(false);
-            }).save(temp_file_path);
-    });
-}
-
-/**
- * setTimeout, but its a promise.
- * @param {number} ms
- */
- async function wait(ms) {
-    await new Promise(resolve => {
-        setTimeout(resolve, ms);
-    });
-}
-
-async function checkExistsWithTimeout(filePath, timeout) {
-    return new Promise(function (resolve, reject) {
-
-        var timer = setTimeout(function () {
-            if (watcher) watcher.close();
-            reject(new Error('File did not exists and was not created during the timeout.'));
-        }, timeout);
-
-        fs.access(filePath, fs.constants.R_OK, function (err) {
-            if (!err) {
-                clearTimeout(timer);
-                if (watcher) watcher.close();
-                resolve();
-            }
-        });
-
-        var dir = path.dirname(filePath);
-        var basename = path.basename(filePath);
-        var watcher = fs.watch(dir, function (eventType, filename) {
-            if (eventType === 'rename' && filename === basename) {
-                clearTimeout(timer);
-                if (watcher) watcher.close();
-                resolve();
-            }
-        });
-    });
-}
-
-// helper function to download file using fetch
-async function fetchFile(url, path, file_label) {
-    var len = null;
-    const res = await fetch(url);
-
-    len = parseInt(res.headers.get("Content-Length"), 10);
-
-    var bar = new ProgressBar(`  Downloading ${file_label} [:bar] :percent :etas`, {
-        complete: '=',
-        incomplete: ' ',
-        width: 20,
-        total: len
-    });
-    const fileStream = fs.createWriteStream(path);
-    await new Promise((resolve, reject) => {
-        res.body.pipe(fileStream);
-        res.body.on("error", (err) => {
-          reject(err);
-        });
-        res.body.on('data', function (chunk) {
-            bar.tick(chunk.length);
-        });
-        fileStream.on("finish", function() {
-          resolve();
-        });
-    });
-}
-
 // 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;
@@ -428,35 +195,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,
     getExpectedFileSize: getExpectedFileSize,
     fixVideoMetadataPerms: fixVideoMetadataPerms,
     deleteJSONFile: deleteJSONFile,
-    removeIDFromArchive: removeIDFromArchive,
     getDownloadedFilesByType: getDownloadedFilesByType,
-    createContainerZipFile: createContainerZipFile,
-    durationStringToNumber: durationStringToNumber,
-    getMatchingCategoryFiles: getMatchingCategoryFiles,
-    addUIDsToCategory: addUIDsToCategory,
-    getCurrentDownloader: getCurrentDownloader,
     recFindByExt: recFindByExt,
-    removeFileExtension: removeFileExtension,
-    formatDateString: formatDateString,
-    cropFile: cropFile,
-    createEdgeNGrams: createEdgeNGrams,
-    wait: wait,
-    checkExistsWithTimeout: checkExistsWithTimeout,
-    fetchFile: fetchFile,
     File: File
 }

backend/youtube-dl.js

@@ -1,127 +0,0 @@
-const fs = require('fs-extra');
-const fetch = require('node-fetch');
-
-const logger = require('./logger');
-const utils = require('./utils');
-const CONSTS = require('./consts');
-const config_api = require('./config.js');
-
-const is_windows = process.platform === 'win32';
-
-const download_sources = {
-    'youtube-dl': {
-        'tags_url': 'https://api.github.com/repos/ytdl-org/youtube-dl/tags',
-        'func': downloadLatestYoutubeDLBinary
-    },
-    'youtube-dlc': {
-        'tags_url': 'https://api.github.com/repos/blackjack4494/yt-dlc/tags',
-        'func': downloadLatestYoutubeDLCBinary
-    },
-    'yt-dlp': {
-        'tags_url': 'https://api.github.com/repos/yt-dlp/yt-dlp/tags',
-        'func': downloadLatestYoutubeDLPBinary
-    }
-}
-
-exports.checkForYoutubeDLUpdate = async () => {
-    return new Promise(async resolve => {
-        const default_downloader = config_api.getConfigItem('ytdl_default_downloader');
-        const tags_url = download_sources[default_downloader]['tags_url'];
-        // get current version
-        let current_app_details_exists = fs.existsSync(CONSTS.DETAILS_BIN_PATH);
-        if (!current_app_details_exists) {
-            logger.warn(`Failed to get youtube-dl binary details at location '${CONSTS.DETAILS_BIN_PATH}'. Generating file...`);
-            fs.writeJSONSync(CONSTS.DETAILS_BIN_PATH, {"version":"2020.00.00", "downloader": default_downloader});
-        }
-        let current_app_details = JSON.parse(fs.readFileSync(CONSTS.DETAILS_BIN_PATH));
-        let current_version = current_app_details['version'];
-        let current_downloader = current_app_details['downloader'];
-        let stored_binary_path = current_app_details['path'];
-        if (!stored_binary_path || typeof stored_binary_path !== 'string') {
-            // logger.info(`INFO: Failed to get youtube-dl binary path at location: ${CONSTS.DETAILS_BIN_PATH}, attempting to guess actual path...`);
-            const guessed_base_path = 'node_modules/youtube-dl/bin/';
-            const guessed_file_path = guessed_base_path + 'youtube-dl' + (is_windows ? '.exe' : '');
-            if (fs.existsSync(guessed_file_path)) {
-                stored_binary_path = guessed_file_path;
-                // logger.info('INFO: Guess successful! Update process continuing...')
-            } else {
-                logger.error(`Guess '${guessed_file_path}' is not correct. Cancelling update check. Verify that your youtube-dl binaries exist by running npm install.`);
-                resolve(null);
-                return;
-            }
-        }
-
-        // got version, now let's check the latest version from the youtube-dl API
-
-
-        fetch(tags_url, {method: 'Get'})
-        .then(async res => res.json())
-        .then(async (json) => {
-            // check if the versions are different
-            if (!json || !json[0]) {
-                logger.error(`Failed to check ${default_downloader} version for an update.`)
-                resolve(null);
-                return;
-            }
-            const latest_update_version = json[0]['name'];
-            if (current_version !== latest_update_version || default_downloader !== current_downloader) {
-                // versions different or different downloader is being used, download new update
-                resolve(latest_update_version);
-            } else {
-                resolve(null);
-            }
-            return;
-        })
-        .catch(err => {
-            logger.error(`Failed to check ${default_downloader} version for an update.`)
-            logger.error(err);
-            resolve(null);
-            return;
-        });
-    });
-}
-
-exports.updateYoutubeDL = async (latest_update_version) => {
-    const default_downloader = config_api.getConfigItem('ytdl_default_downloader');
-    await download_sources[default_downloader]['func'](latest_update_version);
-}
-
-async function downloadLatestYoutubeDLBinary(new_version) {
-    const file_ext = is_windows ? '.exe' : '';
-
-    const download_url = `https://github.com/ytdl-org/youtube-dl/releases/latest/download/youtube-dl${file_ext}`;
-    const output_path = `node_modules/youtube-dl/bin/youtube-dl${file_ext}`;
-
-    await utils.fetchFile(download_url, output_path, `youtube-dl ${new_version}`);
-
-    updateDetailsJSON(new_version, 'youtube-dl');
-}
-
-async function downloadLatestYoutubeDLCBinary(new_version) {
-    const file_ext = is_windows ? '.exe' : '';
-
-    const download_url = `https://github.com/blackjack4494/yt-dlc/releases/latest/download/youtube-dlc${file_ext}`;
-    const output_path = `node_modules/youtube-dl/bin/youtube-dl${file_ext}`;
-
-    await utils.fetchFile(download_url, output_path, `youtube-dlc ${new_version}`);
-
-    updateDetailsJSON(new_version, 'youtube-dlc');
-}
-
-async function downloadLatestYoutubeDLPBinary(new_version) {
-    const file_ext = is_windows ? '.exe' : '';
-
-    const download_url = `https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp${file_ext}`;
-    const output_path = `node_modules/youtube-dl/bin/youtube-dl${file_ext}`;
-
-    await utils.fetchFile(download_url, output_path, `yt-dlp ${new_version}`);
-
-    updateDetailsJSON(new_version, 'yt-dlp');
-}
-
-function updateDetailsJSON(new_version, downloader) {
-    const details_json = fs.readJSONSync(CONSTS.DETAILS_BIN_PATH);
-    if (new_version) details_json['version'] = new_version;
-    details_json['downloader'] = downloader;
-    fs.writeJSONSync(CONSTS.DETAILS_BIN_PATH, details_json);
-}

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-build.sh

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# THANK YOU TALULAH (https://github.com/nottalulah) for your help in figuring this out
-# and also optimizing some code with this commit.
-# xoxo :D
-
-# set -xeuo pipefail
-
-case $(uname -m) in
-  x86_64)
-    ARCH=amd64;;
-  aarch64)
-    ARCH=arm64;;
-  armhf)
-    ARCH=armhf;;
-  armv7)
-    ARCH=armel;;
-  armv7l)
-    ARCH=armel;;
-  *)
-    echo "Unsupported architecture: $(uname -m)"
-    exit 1
-esac
-
-echo "Architecture: $ARCH"
-curl --connect-timeout 5 \
-    --max-time 10 \
-    --retry 5 \
-    --retry-delay 0 \
-    --retry-max-time 40 \
-    "https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-${ARCH}-static.tar.xz" -o ffmpeg.txz
-mkdir /tmp/ffmpeg
-tar xf ffmpeg.txz -C /tmp/ffmpeg
-cp /tmp/ffmpeg/*/ffmpeg /usr/local/bin/ffmpeg
-cp /tmp/ffmpeg/*/ffprobe /usr/local/bin/ffprobe
-rm -rf /tmp/ffmpeg ffmpeg.txz

docker-compose.yml

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

package.json

@@ -1,18 +1,16 @@
 {
   "name": "youtube-dl-material",
-  "version": "4.2.0",
+  "version": "4.1.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build --configuration production",
-    "prebuild": "node src/postbuild.mjs",
+    "build": "ng build",
     "heroku-postbuild": "npm install --prefix backend",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "electron": "ng build --base-href ./ && electron .",
-    "generate": "openapi --input ./\"Public API v1.yaml\" --output ./src/api-types --exportCore false --exportServices false --exportModels true"
+    "electron": "ng build --base-href ./ && electron ."
   },
   "engines": {
     "node": "12.3.1",
@@ -20,64 +18,56 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/core": "^13.3.3",
-    "@angular/animations": "^13.3.4",
-    "@angular/cdk": "^13.3.4",
-    "@angular/common": "^13.3.4",
-    "@angular/compiler": "^13.3.4",
-    "@angular/core": "^13.3.4",
-    "@angular/forms": "^13.3.4",
-    "@angular/localize": "^13.3.4",
-    "@angular/material": "^13.3.4",
-    "@angular/platform-browser": "^13.3.4",
-    "@angular/platform-browser-dynamic": "^13.3.4",
-    "@angular/router": "^13.3.4",
-    "@fontsource/material-icons": "^4.5.4",
+    "@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": "^5.0.1",
     "core-js": "^2.4.1",
-    "crypto-js": "^4.1.1",
     "file-saver": "^2.0.2",
     "filesize": "^6.1.0",
     "fingerprintjs2": "^2.1.0",
-    "fs-extra": "^10.0.0",
-    "material-icons": "^1.10.8",
     "nan": "^2.14.1",
     "ng-lazyload-image": "^7.0.1",
-    "ngx-avatars": "^1.3.1",
-    "ngx-file-drop": "^13.0.0",
-    "rxjs": "^6.6.3",
+    "ngx-avatar": "^4.0.0",
+    "ngx-file-drop": "^9.0.1",
+    "ngx-videogular": "^9.0.1",
+    "rxjs": "^6.5.3",
     "rxjs-compat": "^6.0.0-rc.0",
-    "tslib": "^2.0.0",
-    "typescript": "~4.6.3",
-    "xliff-to-json": "^1.0.4",
-    "zone.js": "~0.11.4"
+    "tslib": "^1.10.0",
+    "typescript": "~3.7.5",
+    "web-animations-js": "^2.3.2",
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^13.3.3",
-    "@angular/cli": "^13.3.3",
-    "@angular/compiler-cli": "^13.3.4",
-    "@angular/language-service": "^13.3.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",
-    "@typescript-eslint/eslint-plugin": "^4.29.0",
-    "@typescript-eslint/parser": "^4.29.0",
-    "codelyzer": "^6.0.0",
-    "electron": "^13.6.6",
-    "eslint": "^7.32.0",
-    "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.3.16",
-    "karma-chrome-launcher": "~3.1.0",
+    "codelyzer": "^5.1.2",
+    "electron": "^8.0.1",
+    "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",
-    "openapi-typescript-codegen": "^0.21.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/_palette.scss

@@ -1,11 +1,11 @@
 /* Coolors Exported Palette - coolors.co/e8aeb7-b8e1ff-a9fff7-94fbab-82aba1 */
 
 /* HSL */
-$color1: hsla(351, 56%, 80%, 1);
-$softblue: hsla(205, 100%, 86%, 1);
-$color3: hsla(174, 100%, 83%, 1);
-$color4: hsla(133, 93%, 78%, 1);
-$color5: hsla(165, 20%, 59%, 1);
+$color1: hsla(351%, 56%, 80%, 1);
+$softblue: hsla(205%, 100%, 86%, 1);
+$color3: hsla(174%, 100%, 83%, 1);
+$color4: hsla(133%, 93%, 78%, 1);
+$color5: hsla(165%, 20%, 59%, 1);
 
 /* RGB */
 $color1: rgba(232, 174, 183, 1);

src/api-types/index.ts

@@ -1,111 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type { AddFileToPlaylistRequest } from './models/AddFileToPlaylistRequest';
-export type { BaseChangePermissionsRequest } from './models/BaseChangePermissionsRequest';
-export type { body_19 } from './models/body_19';
-export type { body_20 } from './models/body_20';
-export type { Category } from './models/Category';
-export { CategoryRule } from './models/CategoryRule';
-export type { ChangeRolePermissionsRequest } from './models/ChangeRolePermissionsRequest';
-export type { ChangeUserPermissionsRequest } from './models/ChangeUserPermissionsRequest';
-export type { CheckConcurrentStreamRequest } from './models/CheckConcurrentStreamRequest';
-export type { CheckConcurrentStreamResponse } from './models/CheckConcurrentStreamResponse';
-export type { ConcurrentStream } from './models/ConcurrentStream';
-export type { Config } from './models/Config';
-export type { ConfigResponse } from './models/ConfigResponse';
-export type { CreateCategoryRequest } from './models/CreateCategoryRequest';
-export type { CreateCategoryResponse } from './models/CreateCategoryResponse';
-export type { CreatePlaylistRequest } from './models/CreatePlaylistRequest';
-export type { CreatePlaylistResponse } from './models/CreatePlaylistResponse';
-export type { CropFileSettings } from './models/CropFileSettings';
-export type { DatabaseFile } from './models/DatabaseFile';
-export { DBBackup } from './models/DBBackup';
-export type { DBInfoResponse } from './models/DBInfoResponse';
-export type { DeleteCategoryRequest } from './models/DeleteCategoryRequest';
-export type { DeleteMp3Mp4Request } from './models/DeleteMp3Mp4Request';
-export type { DeletePlaylistRequest } from './models/DeletePlaylistRequest';
-export type { DeleteSubscriptionFileRequest } from './models/DeleteSubscriptionFileRequest';
-export type { DeleteUserRequest } from './models/DeleteUserRequest';
-export type { Download } from './models/Download';
-export type { DownloadArchiveRequest } from './models/DownloadArchiveRequest';
-export type { DownloadFileRequest } from './models/DownloadFileRequest';
-export type { DownloadRequest } from './models/DownloadRequest';
-export type { DownloadResponse } from './models/DownloadResponse';
-export type { DownloadTwitchChatByVODIDRequest } from './models/DownloadTwitchChatByVODIDRequest';
-export type { DownloadTwitchChatByVODIDResponse } from './models/DownloadTwitchChatByVODIDResponse';
-export type { DownloadVideosForSubscriptionRequest } from './models/DownloadVideosForSubscriptionRequest';
-export type { File } from './models/File';
-export { FileType } from './models/FileType';
-export type { GenerateArgsResponse } from './models/GenerateArgsResponse';
-export type { GenerateNewApiKeyResponse } from './models/GenerateNewApiKeyResponse';
-export type { GetAllCategoriesResponse } from './models/GetAllCategoriesResponse';
-export type { GetAllDownloadsRequest } from './models/GetAllDownloadsRequest';
-export type { GetAllDownloadsResponse } from './models/GetAllDownloadsResponse';
-export type { GetAllFilesResponse } from './models/GetAllFilesResponse';
-export type { GetAllSubscriptionsResponse } from './models/GetAllSubscriptionsResponse';
-export type { GetAllTasksResponse } from './models/GetAllTasksResponse';
-export type { GetDBBackupsResponse } from './models/GetDBBackupsResponse';
-export type { GetDownloadRequest } from './models/GetDownloadRequest';
-export type { GetDownloadResponse } from './models/GetDownloadResponse';
-export type { GetFileFormatsRequest } from './models/GetFileFormatsRequest';
-export type { GetFileFormatsResponse } from './models/GetFileFormatsResponse';
-export type { GetFileRequest } from './models/GetFileRequest';
-export type { GetFileResponse } from './models/GetFileResponse';
-export type { GetFullTwitchChatRequest } from './models/GetFullTwitchChatRequest';
-export type { GetFullTwitchChatResponse } from './models/GetFullTwitchChatResponse';
-export type { GetLogsRequest } from './models/GetLogsRequest';
-export type { GetLogsResponse } from './models/GetLogsResponse';
-export type { GetMp3sResponse } from './models/GetMp3sResponse';
-export type { GetMp4sResponse } from './models/GetMp4sResponse';
-export type { GetPlaylistRequest } from './models/GetPlaylistRequest';
-export type { GetPlaylistResponse } from './models/GetPlaylistResponse';
-export type { GetPlaylistsRequest } from './models/GetPlaylistsRequest';
-export type { GetPlaylistsResponse } from './models/GetPlaylistsResponse';
-export type { GetRolesResponse } from './models/GetRolesResponse';
-export type { GetSubscriptionRequest } from './models/GetSubscriptionRequest';
-export type { GetSubscriptionResponse } from './models/GetSubscriptionResponse';
-export type { GetTaskRequest } from './models/GetTaskRequest';
-export type { GetTaskResponse } from './models/GetTaskResponse';
-export type { GetUsersResponse } from './models/GetUsersResponse';
-export type { IncrementViewCountRequest } from './models/IncrementViewCountRequest';
-export type { inline_response_200_15 } from './models/inline_response_200_15';
-export type { LoginRequest } from './models/LoginRequest';
-export type { LoginResponse } from './models/LoginResponse';
-export type { Playlist } from './models/Playlist';
-export type { RegisterRequest } from './models/RegisterRequest';
-export type { RegisterResponse } from './models/RegisterResponse';
-export type { RestoreDBBackupRequest } from './models/RestoreDBBackupRequest';
-export { Schedule } from './models/Schedule';
-export type { SetConfigRequest } from './models/SetConfigRequest';
-export type { SharingToggle } from './models/SharingToggle';
-export type { SubscribeRequest } from './models/SubscribeRequest';
-export type { SubscribeResponse } from './models/SubscribeResponse';
-export type { Subscription } from './models/Subscription';
-export type { SubscriptionRequestData } from './models/SubscriptionRequestData';
-export type { SuccessObject } from './models/SuccessObject';
-export type { TableInfo } from './models/TableInfo';
-export type { Task } from './models/Task';
-export type { TestConnectionStringRequest } from './models/TestConnectionStringRequest';
-export type { TestConnectionStringResponse } from './models/TestConnectionStringResponse';
-export type { TransferDBRequest } from './models/TransferDBRequest';
-export type { TransferDBResponse } from './models/TransferDBResponse';
-export type { TwitchChatMessage } from './models/TwitchChatMessage';
-export type { UnsubscribeRequest } from './models/UnsubscribeRequest';
-export type { UnsubscribeResponse } from './models/UnsubscribeResponse';
-export type { UpdateCategoriesRequest } from './models/UpdateCategoriesRequest';
-export type { UpdateCategoryRequest } from './models/UpdateCategoryRequest';
-export type { UpdateConcurrentStreamRequest } from './models/UpdateConcurrentStreamRequest';
-export type { UpdateConcurrentStreamResponse } from './models/UpdateConcurrentStreamResponse';
-export type { UpdatePlaylistRequest } from './models/UpdatePlaylistRequest';
-export type { UpdaterStatus } from './models/UpdaterStatus';
-export type { UpdateServerRequest } from './models/UpdateServerRequest';
-export type { UpdateTaskDataRequest } from './models/UpdateTaskDataRequest';
-export type { UpdateTaskScheduleRequest } from './models/UpdateTaskScheduleRequest';
-export type { UpdateUserRequest } from './models/UpdateUserRequest';
-export type { User } from './models/User';
-export { UserPermission } from './models/UserPermission';
-export type { Version } from './models/Version';
-export type { VersionInfoResponse } from './models/VersionInfoResponse';
-export { YesNo } from './models/YesNo';

src/api-types/models/AddFileToPlaylistRequest.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface AddFileToPlaylistRequest {
-    file_uid: string;
-    playlist_id: string;
-}

src/api-types/models/BaseChangePermissionsRequest.ts

@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { UserPermission } from './UserPermission';
-import { YesNo } from './YesNo';
-
-export interface BaseChangePermissionsRequest {
-    permission: UserPermission;
-    new_value: YesNo;
-}

src/api-types/models/Category.ts

@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { CategoryRule } from './CategoryRule';
-
-export interface Category {
-    name?: string;
-    uid?: string;
-    rules?: Array<CategoryRule>;
-    /**
-     * Overrides file output for downloaded files in category
-     */
-    custom_output?: string;
-}

src/api-types/models/CategoryRule.ts

@@ -1,26 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface CategoryRule {
-    preceding_operator?: CategoryRule.preceding_operator;
-    comparator?: CategoryRule.comparator;
-}
-
-export namespace CategoryRule {
-
-    export enum preceding_operator {
-        OR = 'or',
-        AND = 'and',
-    }
-
-    export enum comparator {
-        INCLUDES = 'includes',
-        NOT_INCLUDES = 'not_includes',
-        EQUALS = 'equals',
-        NOT_EQUALS = 'not_equals',
-    }
-
-
-}

src/api-types/models/ChangeRolePermissionsRequest.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { BaseChangePermissionsRequest } from './BaseChangePermissionsRequest';
-
-export interface ChangeRolePermissionsRequest extends BaseChangePermissionsRequest {
-    role: string;
-}

src/api-types/models/ChangeUserPermissionsRequest.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { BaseChangePermissionsRequest } from './BaseChangePermissionsRequest';
-
-export interface ChangeUserPermissionsRequest extends BaseChangePermissionsRequest {
-    user_uid: string;
-}

src/api-types/models/CheckConcurrentStreamRequest.ts

@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface CheckConcurrentStreamRequest {
-    /**
-     * UID of the concurrent stream
-     */
-    uid: string;
-}

src/api-types/models/CheckConcurrentStreamResponse.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { ConcurrentStream } from './ConcurrentStream';
-
-export interface CheckConcurrentStreamResponse {
-    stream: ConcurrentStream;
-}

src/api-types/models/ConcurrentStream.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface ConcurrentStream {
-    playback_timestamp?: number;
-    unix_timestamp?: number;
-    playing?: boolean;
-}

src/api-types/models/Config.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface Config {
-    YoutubeDLMaterial: any;
-}

src/api-types/models/ConfigResponse.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Config } from './Config';
-
-export interface ConfigResponse {
-    config_file: Config;
-    success: boolean;
-}

src/api-types/models/CreateCategoryRequest.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface CreateCategoryRequest {
-    name: string;
-}

src/api-types/models/CreateCategoryResponse.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Category } from './Category';
-
-export interface CreateCategoryResponse {
-    new_category?: Category;
-    success?: boolean;
-}

src/api-types/models/CreatePlaylistRequest.ts

@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { FileType } from './FileType';
-
-export interface CreatePlaylistRequest {
-    playlistName: string;
-    uids: Array<string>;
-    type: FileType;
-    thumbnailURL: string;
-}

src/api-types/models/CreatePlaylistResponse.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Playlist } from './Playlist';
-
-export interface CreatePlaylistResponse {
-    new_playlist: Playlist;
-    success: boolean;
-}

src/api-types/models/CropFileSettings.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface CropFileSettings {
-    cropFileStart: number;
-    cropFileEnd: number;
-}

src/api-types/models/DBBackup.ts

@@ -1,21 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface DBBackup {
-    name: string;
-    timestamp: number;
-    size: number;
-    source: DBBackup.source;
-}
-
-export namespace DBBackup {
-
-    export enum source {
-        LOCAL = 'local',
-        REMOTE = 'remote',
-    }
-
-
-}

src/api-types/models/DBInfoResponse.ts

@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { TableInfo } from './TableInfo';
-
-export interface DBInfoResponse {
-    using_local_db?: boolean;
-    stats_by_table?: {
-files?: TableInfo,
-playlists?: TableInfo,
-categories?: TableInfo,
-subscriptions?: TableInfo,
-users?: TableInfo,
-roles?: TableInfo,
-download_queue?: TableInfo,
-};
-}

src/api-types/models/DatabaseFile.ts

@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface DatabaseFile {
-    id: string;
-    title: string;
-    thumbnailURL: string;
-    isAudio: boolean;
-    /**
-     * In seconds
-     */
-    duration: number;
-    url: string;
-    uploader: string;
-    size: number;
-    path: string;
-    upload_date: string;
-    uid: string;
-    sharingEnabled?: boolean;
-}

src/api-types/models/DeleteCategoryRequest.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface DeleteCategoryRequest {
-    category_uid: string;
-}

src/api-types/models/DeleteMp3Mp4Request.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface DeleteMp3Mp4Request {
-    uid: string;
-    blacklistMode?: boolean;
-}

src/api-types/models/DeletePlaylistRequest.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { FileType } from './FileType';
-
-export interface DeletePlaylistRequest {
-    playlist_id: string;
-    type: FileType;
-}

src/api-types/models/DeleteSubscriptionFileRequest.ts

@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { SubscriptionRequestData } from './SubscriptionRequestData';
-
-export interface DeleteSubscriptionFileRequest {
-    file: string;
-    file_uid?: string;
-    sub: SubscriptionRequestData;
-    /**
-     * If true, does not remove id from archive. Only valid if youtube-dl archive is enabled in settings.
-     */
-    deleteForever?: boolean;
-}

src/api-types/models/DeleteUserRequest.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface DeleteUserRequest {
-    uid: string;
-}

src/api-types/models/Dictionary.ts

@@ -1,7 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type Dictionary<T> = {
-    [key: string]: T;
-}

src/api-types/models/Download.ts

@@ -1,26 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface Download {
-    uid: string;
-    ui_uid?: string;
-    running: boolean;
-    finished: boolean;
-    paused: boolean;
-    finished_step: boolean;
-    url: string;
-    type: string;
-    title: string;
-    step_index: number;
-    percent_complete: number;
-    timestamp_start: number;
-    /**
-     * Error text, set if download fails.
-     */
-    error?: string | null;
-    user_uid?: string;
-    sub_id?: string;
-    sub_name?: string;
-}

src/api-types/models/DownloadArchiveRequest.ts

@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface DownloadArchiveRequest {
-    sub: {
-archive_dir: string,
-};
-}

src/api-types/models/DownloadFileRequest.ts

@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { FileType } from './FileType';
-
-export interface DownloadFileRequest {
-    uid?: string;
-    uuid?: string;
-    sub_id?: string;
-    playlist_id?: string;
-    url?: string;
-    type?: FileType;
-}

src/api-types/models/DownloadRequest.ts

@@ -1,44 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { CropFileSettings } from './CropFileSettings';
-import { FileType } from './FileType';
-
-export interface DownloadRequest {
-    url: string;
-    /**
-     * Video format code. Overrides other quality options.
-     */
-    customQualityConfiguration?: string;
-    /**
-     * Custom command-line arguments for youtube-dl. Overrides all other options, except url.
-     */
-    customArgs?: string;
-    /**
-     * Additional command-line arguments for youtube-dl. Added to whatever args would normally be used.
-     */
-    additionalArgs?: string;
-    /**
-     * Custom output filename template.
-     */
-    customOutput?: string;
-    /**
-     * Login with this account ID
-     */
-    youtubeUsername?: string;
-    /**
-     * Account password
-     */
-    youtubePassword?: string;
-    /**
-     * Height of the video, if known
-     */
-    selectedHeight?: string;
-    /**
-     * Specify ffmpeg/avconv audio quality
-     */
-    maxBitrate?: string;
-    type?: FileType;
-    cropFileSettings?: CropFileSettings;
-}

src/api-types/models/DownloadResponse.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Download } from './Download';
-
-export interface DownloadResponse {
-    download?: Download;
-}

src/api-types/models/DownloadTwitchChatByVODIDRequest.ts

@@ -1,23 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { FileType } from './FileType';
-import { Subscription } from './Subscription';
-
-export interface DownloadTwitchChatByVODIDRequest {
-    /**
-     * File ID
-     */
-    id: string;
-    /**
-     * ID of the VOD
-     */
-    vodId: string;
-    type: FileType;
-    /**
-     * User UID
-     */
-    uuid?: string;
-    sub?: Subscription;
-}

src/api-types/models/DownloadTwitchChatByVODIDResponse.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import { TwitchChatMessage } from './TwitchChatMessage';
-
-export interface DownloadTwitchChatByVODIDResponse {
-    chat: Array<TwitchChatMessage>;
-}

src/api-types/models/DownloadVideosForSubscriptionRequest.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface DownloadVideosForSubscriptionRequest {
-    subID: string;
-}

src/api-types/models/File.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface File {
-    id?: string;
-}

src/api-types/models/FileType.ts

@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export enum FileType {
-    AUDIO = 'audio',
-    VIDEO = 'video',
-}

src/api-types/models/GenerateArgsResponse.ts

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-
-export interface GenerateArgsResponse {
-    args?: Array<string>;
-}