From 1ffe61f01f33fff6e72b324e3c92e933dcb4df9a Mon Sep 17 00:00:00 2001
From: Isaac Grynsztein <IsaacMGrynsztein@gmail.com>
Date: Fri, 28 Feb 2020 00:20:08 -0500
Subject: [PATCH] removed path-base and updated docker-compose.yml & README

---
 README.md                          | 1 -
 backend/config/default.json        | 1 -
 backend/config/encrypted.json      | 1 -
 backend/consts.js                  | 4 ----
 docker-compose.yml                 | 5 ++---
 src/app/player/player.component.ts | 2 +-
 src/assets/default.json            | 1 -
 7 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 4cd2106..2e2aa20 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,6 @@ Here is an explanation for the configuration entries. Check out the [default con
 | use-encryption | true if you intend to use SSL encryption (https) | false |
 | cert-file-path | Cert file path - required if using encryption | "/etc/letsencrypt/live/example.com/fullchain.pem" |
 | key-file-path | Private key file path - required if using encryption |  "/etc/letsencrypt/live/example.com/privkey.pem" |
-| path-base | Audio/video stream URL. Usually the same as backendurl | "http://example.com:17442/" |
 | path-audio | Path to audio folder for saved mp3s | "audio/" |
 | path-video | Path to video folder for saved mp4s | "video/" |
 | title_top | Title shown on the top toolbar | "Youtube Downloader" |
diff --git a/backend/config/default.json b/backend/config/default.json
index 49a55a4..051c68c 100644
--- a/backend/config/default.json
+++ b/backend/config/default.json
@@ -10,7 +10,6 @@
         "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem"
       },
       "Downloader": {
-        "path-base": "http://example.com:17442/api/",
         "path-audio": "audio/",
         "path-video": "video/"
       },
diff --git a/backend/config/encrypted.json b/backend/config/encrypted.json
index 0bdf5a2..0b1ce37 100644
--- a/backend/config/encrypted.json
+++ b/backend/config/encrypted.json
@@ -10,7 +10,6 @@
         "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem"
       },
       "Downloader": {
-        "path-base": "https://example.com:17442/api/",
         "path-audio": "audio/",
         "path-video": "video/"
       },
diff --git a/backend/consts.js b/backend/consts.js
index 0d1e63c..19590e6 100644
--- a/backend/consts.js
+++ b/backend/consts.js
@@ -26,10 +26,6 @@ let CONFIG_ITEMS = {
     },
 
     // Downloader
-    'ytdl_base_path': {
-        'key': 'ytdl_base_path',
-        'path': 'YoutubeDLMaterial.Downloader.path-base'
-    },
     'ytdl_audio_folder_path': {
         'key': 'ytdl_audio_folder_path',
         'path': 'YoutubeDLMaterial.Downloader.path-audio'
diff --git a/docker-compose.yml b/docker-compose.yml
index 1253b8f..2b9c6e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,12 +5,11 @@ services:
         build: .
         environment: 
             # config items
-            ytdl_frontend_url: http://localhost:8998
-            ytdl_backend_url: http://localhost:17442/
+            ytdl_url: http://localhost:8998
+            ytdl_port: '17442'
             ytdl_use_encryption: 'false'
             ytdl_cert_file_path: /etc/letsencrypt/live/example.com/fullchain.pem
             ytdl_key_file_path: /etc/letsencrypt/live/example.com/privkey.pem
-            ytdl_base_path: http://localhost:17442/
             ytdl_audio_folder_path: audio/
             ytdl_video_folder_path: video/
             ytdl_title_top: Youtube Downloader
diff --git a/src/app/player/player.component.ts b/src/app/player/player.component.ts
index 5c003fe..394d454 100644
--- a/src/app/player/player.component.ts
+++ b/src/app/player/player.component.ts
@@ -55,7 +55,7 @@ export class PlayerComponent implements OnInit {
     // loading config
     this.postsService.loadNavItems().subscribe(res => { // loads settings
       const result = !this.postsService.debugMode ? res['config_file'] : res;
-      this.baseStreamPath = result['YoutubeDLMaterial']['Downloader']['path-base'];
+      this.baseStreamPath = this.postsService.path;
       this.audioFolderPath = result['YoutubeDLMaterial']['Downloader']['path-audio'];
       this.videoFolderPath = result['YoutubeDLMaterial']['Downloader']['path-video'];
 
diff --git a/src/assets/default.json b/src/assets/default.json
index f5c1cbf..6d9ab14 100644
--- a/src/assets/default.json
+++ b/src/assets/default.json
@@ -10,7 +10,6 @@
         "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem"
       },
       "Downloader": {
-        "path-base": "http://localhost:17442/api/",
         "path-audio": "audio/",
         "path-video": "video/"
       },