xorbitlab
/
metube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed "any" format to act like original

This commit is contained in:
asuyou 2021-11-13 23:49:30 +00:00
parent 63ec5c37af
commit b661d4db59
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/app.component.ts
View File

@ -5,7 +5,7 @@ import { CookieService } from 'ngx-cookie-service';
import { DownloadsService, Status } from './downloads.service'; import { DownloadsService, Status } from './downloads.service';
import { MasterCheckboxComponent } from './master-checkbox.component'; import { MasterCheckboxComponent } from './master-checkbox.component';
import { Formats, Format, Quality, fillQualities, getQualityById } from './formats'; import { Formats, Format, Quality, getQualityById } from './formats';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@ -14,7 +14,7 @@ import { Formats, Format, Quality, fillQualities, getQualityById } from './forma
}) })
export class AppComponent implements AfterViewInit { export class AppComponent implements AfterViewInit {
addUrl: string; addUrl: string;
formats: Format[] = fillQualities(Formats); formats: Format[] = Formats;
qualities: Quality[]; qualities: Quality[];
quality: Quality; quality: Quality;
format: string; format: string;
@ -91,7 +91,7 @@ export class AppComponent implements AfterViewInit {
addDownload(url?: string, quality?: string, format?: string) { addDownload(url?: string, quality?: string, format?: string) {
url = url ?? this.addUrl url = url ?? this.addUrl
quality = quality ?? this.quality.value quality = quality ?? this.quality.value
format = format ?? this.quality.fmt format = format ?? this.format
this.addInProgress = true; this.addInProgress = true;
this.downloads.add(url, quality, format).subscribe((status: Status) => { this.downloads.add(url, quality, format).subscribe((status: Status) => {

45
ui/src/app/formats.ts
View File

@ -8,51 +8,46 @@ export interface Quality {
id: string; id: string;
text: string; text: string;
value: string; value: string;
fmt?: string;
} }
export const Formats: Format[] = [ export const Formats: Format[] = [
{ {
id: 'any', id: 'any',
text: 'Any', text: 'Any',
qualities: [], qualities: [
{ id: '0', value: 'best', text: 'Best' },
{ id: '1', value: '1440', text: '1440p' },
{ id: '2', value: '1080', text: '1080p' },
{ id: '3', value: '720', text: '720p' },
{ id: '4', value: '480', text: '480p' },
{ id: '5', value: 'audio', text: 'Audio Only' },
],
}, },
{ {
id: 'mp4', id: 'mp4',
text: 'MP4', text: 'MP4',
qualities: [ qualities: [
{ id: "1", value: 'best', text: 'Best MP4' }, { id: '6', value: 'best', text: 'Best' },
{ id: "2", value: '1440', text: '1440p' }, { id: '7', value: '1440', text: '1440p' },
{ id: "3", value: '1080', text: '1080p' }, { id: '8', value: '1080', text: '1080p' },
{ id: "4", value: '720', text: '720p' }, { id: '9', value: '720', text: '720p' },
{ id: "5", value: '480', text: '480p' }, { id: '10', value: '480', text: '480p' },
], ],
}, },
{ {
id: 'mp3', id: 'mp3',
text: 'MP3', text: 'MP3',
qualities: [ qualities: [
{ id: "6", value: 'best', text: 'Best MP3' }, { id: '11', value: 'best', text: 'Best' },
{ id: "7", value: '128', text: '128 kbps' }, { id: '12', value: '128', text: '128 kbps' },
{ id: "8", value: '192', text: '192 kbps' }, { id: '13', value: '192', text: '192 kbps' },
{ id: "9", value: '320', text: '320 kbps' }, { id: '14', value: '320', text: '320 kbps' },
], ],
}, },
]; ];
export const fillQualities = (formats: Format[]): Format[] => {
let allQualities: Quality[] = [];
formats.forEach((fmt) => {
fmt.qualities = fmt.qualities.map((ql) => ({ ...ql, fmt: fmt.id }));
allQualities = allQualities.concat(fmt.qualities);
});
formats.find((format) => format.id === 'any').qualities = allQualities;
return formats;
};
export const getQualityById = (formats: Format[], id: string): Quality => { export const getQualityById = (formats: Format[], id: string): Quality => {
return formats return formats
.find(ql => ql.qualities.find(el => el.id === id)).qualities .find((ql) => ql.qualities.find((el) => el.id === id))
.find(el => el.id === id) .qualities.find((el) => el.id === id);
} };