Fixed a bug and increased compatibility

Tzahi12345 · Jan 21, 2018 · 43399be · 43399be
1 parent 2a80ea9
commit 43399be
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/backend/app.js b/backend/app.js
@@ -211,6 +211,7 @@ app.post('/mp4fileexists', function(req, res) {
 });
 
 app.get('/video/:id', function(req , res){
+    var head;
     const path = "video/" + req.params.id + ".mp4";
   const stat = fs.statSync(path)
   const fileSize = stat.size
@@ -223,7 +224,7 @@ app.get('/video/:id', function(req , res){
       : fileSize-1
     const chunksize = (end-start)+1
     const file = fs.createReadStream(path, {start, end})
-    const head = {
+    head = {
       'Content-Range': `bytes ${start}-${end}/${fileSize}`,
       'Accept-Ranges': 'bytes',
       'Content-Length': chunksize,
@@ -232,7 +233,7 @@ app.get('/video/:id', function(req , res){
     res.writeHead(206, head);
     file.pipe(res);
   } else {
-    const head = {
+    head = {
       'Content-Length': fileSize,
       'Content-Type': 'video/mp4',
     }
@@ -242,6 +243,7 @@ app.get('/video/:id', function(req , res){
 });
 
 app.get('/audio/:id', function(req , res){
+    var head;
     const path = "audio/" + req.params.id + ".mp3";
   const stat = fs.statSync(path)
   const fileSize = stat.size
@@ -254,7 +256,7 @@ app.get('/audio/:id', function(req , res){
       : fileSize-1
     const chunksize = (end-start)+1
     const file = fs.createReadStream(path, {start, end})
-    const head = {
+    head = {
       'Content-Range': `bytes ${start}-${end}/${fileSize}`,
       'Accept-Ranges': 'bytes',
       'Content-Length': chunksize,
@@ -263,7 +265,7 @@ app.get('/audio/:id', function(req , res){
     res.writeHead(206, head);
     file.pipe(res);
   } else {
-    const head = {
+    head = {
       'Content-Length': fileSize,
       'Content-Type': 'audio/mp3',
     }

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -35,6 +35,9 @@ export class AppComponent {
       this.postsService.path = backendUrl;
       this.postsService.startPath = backendUrl;
       this.postsService.startPathSSL = backendUrl;
+    },
+    error => {
+      console.log(error);
     });
   }
 

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -9,6 +9,7 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import { HttpModule } from '@angular/http';
 import { HttpClientModule } from '@angular/common/http';
 import { PostsService } from 'app/posts.services';
+import {APP_BASE_HREF} from '@angular/common';
 
 @NgModule({
   declarations: [

diff --git a/src/app/posts.services.ts b/src/app/posts.services.ts
@@ -66,11 +66,9 @@ export class PostsService {
     }
 
     loadNavItems() {
-        return this.http.get("../../backend/config/default.json")
+        console.log("Config location: " + window.location.href + "backend/config/default.json");
+        return this.http.get(window.location.href + "backend/config/default.json")
                         .map(res => res.json());
-                        //This is optional, you can remove the last line 
-                        // if you don't want to log loaded json in 
-                        // console.
     }
 }
 

diff --git a/src/index.html b/src/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>YoutubeDLMaterial</title>
-  <base href="/">
+  <base href="./">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -12,7 +12,6 @@
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
   <link href="https://unpkg.com/@angular/material/prebuilt-themes/indigo-pink.css" rel="stylesheet">    <script src="systemjs.config.js"></script>
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-
 </head>
 <body>
   <app-root></app-root>