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

updated mobile view for file cards to be more responsive

Browse Source 
streamed audio/video now include the extension in the download

cleaned up unused code in app component
This commit is contained in:
Isaac Grynsztein
2020-02-14 00:17:51 -05:00
parent af595d3df8
commit 31394fa98c
2 changed files with 47 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app.component.html
View File

@@ -82,10 +82,10 @@
</mat-panel-description>
</mat-expansion-panel-header>
<div *ngIf="mp3s.length > 0;else nomp3s">
<mat-grid-list cols="4" rowHeight="150px">
<mat-grid-list (window:resize)="onResize($event)" [cols]="files_cols" rowHeight="150px">
<mat-grid-tile *ngFor="let file of mp3s; index as i;">
<app-file-card (removeFile)="removeFromMp3($event)" [title]="file.title" [name]="file.id" [thumbnailURL]="file.thumbnailURL"
[length]="file.duration" [isAudio]="true"></app-file-card>
[length]="file.duration" [isAudio]="true"></app-file-card>
</mat-grid-tile>
</mat-grid-list>
</div>
@@ -101,7 +101,7 @@
</mat-panel-description>
</mat-expansion-panel-header>
<div *ngIf="mp4s.length > 0;else nomp4s">
<mat-grid-list cols="4" rowHeight="150px">
<mat-grid-list (window:resize)="onResize($event)" [cols]="files_cols" rowHeight="150px">
<mat-grid-tile *ngFor="let file of mp4s; index as i;">
<app-file-card (removeFile)="removeFromMp4($event)" [title]="file.title" [name]="file.id" [thumbnailURL]="file.thumbnailURL"
[length]="file.duration" [isAudio]="false"></app-file-card>

118
src/app/app.component.ts
View File

@@ -48,6 +48,7 @@ export class AppComponent implements OnInit {
mp3s: any[] = [];
mp4s: any[] = [];
files_cols = (window.innerWidth <= 450) ? 2 : 4;
urlForm = new FormControl('', [Validators.required]);
@@ -143,90 +144,55 @@ export class AppComponent implements OnInit {
// download helpers
downloadHelperMp3(name, is_playlist = false, forceView = false) {
/*
this.postsService.getFileStatusMp3(name).subscribe(fileExists => {
const exists = fileExists;
this.exists = exists[0];
if (exists[0] === 'failed') {
const percent = exists[2];
// console.log(percent);
if (percent > 0.30) {
this.determinateProgress = true;
this.percentDownloaded = percent * 100;
this.downloadingfile = false;
// if download only mode, just download the file. no redirect
if (forceView === false && this.downloadOnlyMode && !this.iOS) {
if (is_playlist) {
for (let i = 0; i < name.length; i++) {
this.downloadAudioFile(name[i]);
}
setTimeout(() => this.downloadHelperMp3(name, is_playlist, forceView), 500);
} else {
*/
this.downloadingfile = false;
// if download only mode, just download the file. no redirect
if (forceView === false && this.downloadOnlyMode && !this.iOS) {
if (is_playlist) {
for (let i = 0; i < name.length; i++) {
this.downloadAudioFile(name[i]);
}
} else {
this.downloadAudioFile(name);
}
} else {
if (is_playlist) {
window.location.href = this.baseStreamPath + this.audioFolderPath + name[0];
} else {
window.location.href = this.baseStreamPath + this.audioFolderPath + name;
}
}
// reloads mp3s
if (this.fileManagerEnabled) {
this.getMp3s();
}
/* }
});*/
this.downloadAudioFile(name);
}
} else {
if (is_playlist) {
window.location.href = this.baseStreamPath + this.audioFolderPath + name[0] + '.mp3';
} else {
window.location.href = this.baseStreamPath + this.audioFolderPath + name + '.mp3';
}
}
// reloads mp3s
if (this.fileManagerEnabled) {
this.getMp3s();
}
}
downloadHelperMp4(name, is_playlist = false, forceView = false) {
/*
this.postsService.getFileStatusMp4(name).subscribe(fileExists => {
const exists = fileExists;
this.exists = exists[0];
if (exists[0] === 'failed') {
const percent = exists[2];
if (percent > 0.30) {
this.determinateProgress = true;
this.percentDownloaded = percent * 100;
this.downloadingfile = false;
// if download only mode, just download the file. no redirect
if (forceView === false && this.downloadOnlyMode) {
if (is_playlist) {
for (let i = 0; i < name.length; i++) {
this.downloadVideoFile(name[i]);
}
setTimeout(() => this.downloadHelperMp4(name, is_playlist, forceView), 500);
} else {
*/
this.downloadingfile = false;
// if download only mode, just download the file. no redirect
if (forceView === false && this.downloadOnlyMode) {
if (is_playlist) {
for (let i = 0; i < name.length; i++) {
this.downloadVideoFile(name[i]);
}
} else {
this.downloadVideoFile(name);
}
} else {
if (is_playlist) {
window.location.href = this.baseStreamPath + this.videoFolderPath + name[0];
} else {
window.location.href = this.baseStreamPath + this.videoFolderPath + name;
}
}
// reloads mp4s
if (this.fileManagerEnabled) {
this.getMp4s();
}
/*
this.downloadVideoFile(name);
}
});
*/
} else {
if (is_playlist) {
window.location.href = this.baseStreamPath + this.videoFolderPath + name[0] + '.mp4';
} else {
window.location.href = this.baseStreamPath + this.videoFolderPath + name + '.mp4';
}
}
// reloads mp4s
if (this.fileManagerEnabled) {
this.getMp4s();
}
}
// download click handler
@@ -361,5 +327,9 @@ export class AppComponent implements OnInit {
}
);
}
onResize(event) {
this.files_cols = (event.target.innerWidth <= 450) ? 2 : 4;
}
}