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

Fixed an issue where if file manager and download only mode were enabled, files would download twice

Browse Source
This commit is contained in:
Isaac Abadi
2022-06-21 21:07:34 -04:00
parent 636f7b16a8
commit bec158f65d
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,6 @@ export class MainComponent implements OnInit {
allowQualitySelect = false; allowQualitySelect = false;
downloadOnlyMode = false; downloadOnlyMode = false;
allowAutoplay = false; allowAutoplay = false;
audioFolderPath;
videoFolderPath;
use_youtubedl_archive = false; use_youtubedl_archive = false;
globalCustomArgs = null; globalCustomArgs = null;
allowAdvancedDownload = false; allowAdvancedDownload = false;
@@ -69,8 +67,6 @@ export class MainComponent implements OnInit {
results_showing = true; results_showing = true;
results = []; results = [];
mp3s: any[] = [];
mp4s: any[] = [];
playlists = {'audio': [], 'video': []}; playlists = {'audio': [], 'video': []};
playlist_thumbnails = {}; playlist_thumbnails = {};
downloads: Download[] = []; downloads: Download[] = [];
@@ -200,8 +196,6 @@ export class MainComponent implements OnInit {
&& this.postsService.hasPermission('filemanager'); && this.postsService.hasPermission('filemanager');
this.downloadOnlyMode = this.postsService.config['Extra']['download_only_mode']; this.downloadOnlyMode = this.postsService.config['Extra']['download_only_mode'];
this.allowAutoplay = this.postsService.config['Extra']['allow_autoplay']; this.allowAutoplay = this.postsService.config['Extra']['allow_autoplay'];
this.audioFolderPath = this.postsService.config['Downloader']['path-audio'];
this.videoFolderPath = this.postsService.config['Downloader']['path-video'];
this.use_youtubedl_archive = this.postsService.config['Downloader']['use_youtubedl_archive']; this.use_youtubedl_archive = this.postsService.config['Downloader']['use_youtubedl_archive'];
this.globalCustomArgs = this.postsService.config['Downloader']['custom_args']; this.globalCustomArgs = this.postsService.config['Downloader']['custom_args'];
this.youtubeSearchEnabled = this.postsService.config['API'] && this.postsService.config['API']['use_youtube_API'] && this.youtubeSearchEnabled = this.postsService.config['API'] && this.postsService.config['API']['use_youtube_API'] &&
@@ -308,7 +302,7 @@ export class MainComponent implements OnInit {
} }
// download helpers // download helpers
downloadHelper(container, type: string, is_playlist = false, force_view = false, navigate_mode = false): void { downloadHelper(container: DatabaseFile | Playlist, type: string, is_playlist = false, force_view = false, navigate_mode = false): void {
this.downloadingfile = false; this.downloadingfile = false;
if (!this.autoplay && !this.downloadOnlyMode && !navigate_mode) { if (!this.autoplay && !this.downloadOnlyMode && !navigate_mode) {
// do nothing // do nothing
@@ -319,7 +313,7 @@ export class MainComponent implements OnInit {
if (is_playlist) { if (is_playlist) {
this.downloadPlaylist(container['uid']); this.downloadPlaylist(container['uid']);
} else { } else {
this.downloadFileFromServer(container, type); this.downloadFileFromServer(container as DatabaseFile, type);
} }
this.reloadRecentVideos(); this.reloadRecentVideos();
} else { } else {
@@ -438,7 +432,7 @@ export class MainComponent implements OnInit {
return null; return null;
} }
getDownloadByUID(uid: string) { getDownloadByUID(uid: string): Download {
const index = this.downloads.findIndex(download => download.uid === uid); const index = this.downloads.findIndex(download => download.uid === uid);
if (index !== -1) { if (index !== -1) {
return this.downloads[index]; return this.downloads[index];
@@ -447,7 +441,7 @@ export class MainComponent implements OnInit {
} }
} }
removeDownloadFromCurrentDownloads(download_to_remove): boolean { removeDownloadFromCurrentDownloads(download_to_remove: Download): boolean {
if (this.current_download === download_to_remove) { if (this.current_download === download_to_remove) {
this.current_download = null; this.current_download = null;
} }
@@ -770,9 +764,10 @@ export class MainComponent implements OnInit {
if (this.current_download['finished'] && !this.current_download['error']) { if (this.current_download['finished'] && !this.current_download['error']) {
const container = this.current_download['container']; const container = this.current_download['container'];
const is_playlist = this.current_download['file_uids'].length > 1; const is_playlist = this.current_download['file_uids'].length > 1;
this.downloadHelper(container, this.current_download['type'], is_playlist, false); const type = this.current_download['type'];
this.current_download = null; this.current_download = null;
this.downloadHelper(container, type, is_playlist, false);
} else if (this.current_download['finished'] && this.current_download['error']) { } else if (this.current_download['finished'] && this.current_download['error']) {
this.downloadingfile = false; this.downloadingfile = false;
this.current_download = null; this.current_download = null;