TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-12 12:41:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Getting current download refactored to work and display less errors

Browse Source 
Player component now sends jwt token if logged in
This commit is contained in:
Isaac Grynsztein
2020-04-26 17:34:38 -04:00
parent a7c810136b
commit 912a419bd4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/main/main.component.ts
View File

@@ -1137,18 +1137,15 @@ export class MainComponent implements OnInit {
} }
getCurrentDownload() { getCurrentDownload() {
this.postsService.getCurrentDownload(this.postsService.session_id, const ui_uid = this.current_download['ui_uid'] ? this.current_download['ui_uid'] : this.current_download['uid'];
this.current_download['ui_uid'] ? this.current_download['ui_uid'] : this.current_download['uid']).subscribe(res => { this.postsService.getCurrentDownload(this.postsService.session_id, ui_uid).subscribe(res => {
const ui_uid = this.current_download['ui_uid'] ? this.current_download['ui_uid'] : this.current_download['uid'];
if (res['download']) { if (res['download']) {
console.log('got new download');
if (ui_uid === res['download']['ui_uid']) { if (ui_uid === res['download']['ui_uid']) {
this.current_download = res['download']; this.current_download = res['download'];
this.percentDownloaded = this.current_download.percent_complete; this.percentDownloaded = this.current_download.percent_complete;
console.log(this.percentDownloaded);
} }
} else { } else {
console.log('failed to get new download'); // console.log('failed to get new download');
} }
}); });
} }

5
src/app/player/player.component.ts
View File

@@ -183,6 +183,11 @@ export class PlayerComponent implements OnInit {
fullLocation = this.baseStreamPath + baseLocation + encodeURIComponent(fileName) + '?subName=' + this.subscriptionName + fullLocation = this.baseStreamPath + baseLocation + encodeURIComponent(fileName) + '?subName=' + this.subscriptionName +
'&subPlaylist=' + this.subPlaylist; '&subPlaylist=' + this.subPlaylist;
} }
// adds user token if in multi-user-mode
if (this.postsService.isLoggedIn) {
fullLocation += '?jwt=' + this.postsService.token;
}
// if it has a slash (meaning it's in a directory), only get the file name for the label // if it has a slash (meaning it's in a directory), only get the file name for the label
let label = null; let label = null;
const decodedName = decodeURIComponent(fileName); const decodedName = decodeURIComponent(fileName);