Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@adlerre
adlerre committed Nov 12, 2024
1 parent c5e009d commit d4303d7
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 48 deletions.
56 changes: 28 additions & 28 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,50 +22,50 @@
],
"private": true,
"dependencies": {
"@angular/animations": "18.0.5",
"@angular/common": "18.0.5",
"@angular/compiler": "18.0.5",
"@angular/core": "18.0.5",
"@angular/forms": "18.0.5",
"@angular/localize": "18.0.5",
"@angular/platform-browser": "18.0.5",
"@angular/platform-browser-dynamic": "18.0.5",
"@angular/router": "18.0.5",
"@fortawesome/fontawesome-free": "^6.5.2",
"@ng-bootstrap/ng-bootstrap": "^17.0.0",
"@ng-select/ng-option-highlight": "^13.4.1",
"@ng-select/ng-select": "^13.4.1",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@angular/animations": "18.2.11",
"@angular/common": "18.2.11",
"@angular/compiler": "18.2.11",
"@angular/core": "18.2.11",
"@angular/forms": "18.2.11",
"@angular/localize": "18.2.11",
"@angular/platform-browser": "18.2.11",
"@angular/platform-browser-dynamic": "18.2.11",
"@angular/router": "18.2.11",
"@fortawesome/fontawesome-free": "^6.6.0",
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
"@ng-select/ng-option-highlight": "^13.9.1",
"@ng-select/ng-select": "^13.9.1",
"@ngx-translate/core": "^16.0.3",
"@ngx-translate/http-loader": "^16.0.0",
"@popperjs/core": "^2.11.8",
"@silvermine/videojs-quality-selector": "^1.3.1",
"@uirouter/angular": "13.0.0",
"@uirouter/core": "6.1.0",
"@uirouter/angular": "15.0.0",
"@uirouter/core": "6.1.1",
"@uirouter/rx": "1.0.0",
"angular-gauge": "^5.0.0",
"bootstrap": "5.3.3",
"core-js": "^3.37.1",
"core-js": "^3.39.0",
"messageformat": "^2.3.0",
"ngx-pipes": "^3.2.2",
"ngx-toastr": "^19.0.0",
"ngx-translate-messageformat-compiler": "^7.0.0",
"npm-font-open-sans": "^1.1.0",
"roboto-fontface": "^0.10.0",
"rxjs": "^7.5.5",
"tslib": "^2.6.3",
"tslib": "^2.8.1",
"typeface-titillium-web": "1.1.13",
"video.js": "8.12.0",
"zone.js": "~0.14.7"
"video.js": "8.19.1",
"zone.js": "~0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.0.6",
"@angular-devkit/core": "^18.0.6",
"@angular/cli": "18.0.6",
"@angular/compiler-cli": "18.0.5",
"@angular/language-service": "18.0.5",
"@angular-devkit/build-angular": "^18.2.11",
"@angular-devkit/core": "^18.2.11",
"@angular/cli": "18.2.11",
"@angular/compiler-cli": "18.2.11",
"@angular/language-service": "18.2.11",
"@types/node": "^20.14.9",
"angular-ide": "^0.9.77",
"cheerio": "^1.0.0-rc.12",
"cheerio": "^1.0.0",
"codelyzer": "^6.0.2",
"domhandler": "^5.0.3",
"imagemin": "^9.0.0",
Expand All @@ -74,7 +74,7 @@
"imagemin-mozjpeg": "^10.0.0",
"imagemin-pngquant": "^10.0.0",
"imagemin-svgo": "^11.0.1",
"p-limit": "^5.0.0",
"p-limit": "^6.1.0",
"ts-node": "^10.9.2",
"tslint": "~6.1.3",
"typescript": "5.4.5",
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<node.version>v20.11.1</node.version>
<npm.version>10.2.4</npm.version>
<selenium.version>4.22.0</selenium.version>
<webdrivermanager.version>5.9.1</webdrivermanager.version>
<selenium.version>4.26.0</selenium.version>
<webdrivermanager.version>5.9.2</webdrivermanager.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -194,13 +194,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.1-jre</version>
<version>33.3.1-jre</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.13.0</version>
<version>2.17.0</version>
</dependency>

<dependency>
Expand All @@ -212,7 +212,7 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>6.6.1</version>
<version>6.6.5</version>
</dependency>

<dependency>
Expand Down
29 changes: 14 additions & 15 deletions src/ui/src/app/settings/settings.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, OnInit, Input } from "@angular/core";
import { UntypedFormBuilder, UntypedFormArray, UntypedFormGroup, Validators } from "@angular/forms";
import { Component, Input, OnInit } from "@angular/core";
import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";

import { of, forkJoin } from "rxjs";
import { mergeMap, map, mergeAll, take, delay, retryWhen } from "rxjs/operators";
import { forkJoin, of } from "rxjs";
import { delay, map, mergeAll, mergeMap, retryWhen, take } from "rxjs/operators";

import { Transition } from "@uirouter/core";

Expand All @@ -12,7 +12,7 @@ import { ErrorService } from "../_services/error.service";
import { SpinnerService } from "../spinner/spinner.service";

import { Codec, Format } from "../converter/definitions";
import { Settings, Output, AllowedFormat, HWAccel } from "./definitions";
import { AllowedFormat, HWAccel, Output, Settings } from "./definitions";
import { DEFAULT_BITRATES, DEFAULT_FORMATS } from "./defaults";
import { SettingsVideoComponent } from "./settings.video.component";
import { SettingsAudioComponent } from "./settings.audio.component";
Expand Down Expand Up @@ -51,7 +51,7 @@ export class SettingsComponent implements OnInit {
output: UntypedFormArray;

constructor(private $api: SettingsApiService, private $capi: ConverterApiService,
private $error: ErrorService, private $spinner: SpinnerService, public $fb: UntypedFormBuilder) {
private $error: ErrorService, private $spinner: SpinnerService, public $fb: UntypedFormBuilder) {
}

ngOnInit() {
Expand Down Expand Up @@ -128,7 +128,7 @@ export class SettingsComponent implements OnInit {
)
).pipe(
map(re => {
cc.encoders = { encoder: [re] };
cc.encoders = {encoder: [re]};
return cc;
})
);
Expand All @@ -141,7 +141,7 @@ export class SettingsComponent implements OnInit {
this.allowedFormats = Object.keys(DEFAULT_FORMATS).map(f => {
return {
name: f,
description: this.filterFormat(f).description || "",
description: this.filterFormat(f)?.description || "",
audio: DEFAULT_FORMATS[f].audio.map((n: string) => this.filterCodecs(n)).filter((r: any) => r),
video: DEFAULT_FORMATS[f].video.map((n: string) => this.filterCodecs(n)).filter((r: any) => r)
};
Expand Down Expand Up @@ -198,15 +198,15 @@ export class SettingsComponent implements OnInit {
}

filterFormat(name: string): Format {
return this.formats.find(f => f.name === name);
return this.formats.find(f => f.name.toLocaleLowerCase() === name.toLocaleLowerCase());
}

filterCodecs(name: string): Codec {
return this.codecs.find(f => f.name === name);
return this.codecs.find(f => f.name.toLocaleLowerCase() === name.toLocaleLowerCase());
}

filterParameter(params: Array<any>, name: string) {
return params.find(p => p.name === name);
return params.find(p => p.name.toLocaleLowerCase() === name.toLocaleLowerCase());
}

createOutput(output: Output = null): UntypedFormGroup {
Expand Down Expand Up @@ -253,15 +253,14 @@ export class SettingsComponent implements OnInit {
return name && re.test(name) ? "_" + name : name;
}

onSubmit({ value, valid }) {
onSubmit({value, valid}) {
if (valid) {
value.output.forEach((o: Output) => {
["video", "video-fallback", "audio"].forEach(type => {
if (o[type]) {
const sel = o[type].codec;
const cc = this.allowedFormats.find(f => f.name === o.format);
const sc = cc[type === "audio" ? type : "video"].
find(c => c.name === sel || c.encoders && c.encoders.encoder.find(e => e.name === sel));
const sc = cc[type === "audio" ? type : "video"].find(c => c.name === sel || c.encoders && c.encoders.encoder.find(e => e.name === sel));
const se = sc ?
sc.encoders.encoder.length === 1 ? sc.encoders.encoder[0] : sc.encoders.encoder.find(e => e.name === sel)
: cc.video[0].encoders.encoder[0];
Expand Down Expand Up @@ -338,7 +337,7 @@ export function resolveFnHWaccels($api: ConverterApiService, $error: ErrorServic
}

export function resolveFnSettings($api: SettingsApiService, $error: ErrorService, $spinner: SpinnerService, trans: Transition,
_codecs: Array<Codec>, _formats: Array<Format>, _hwAccesls: Array<HWAccel>) {
_codecs: Array<Codec>, _formats: Array<Format>, _hwAccesls: Array<HWAccel>) {
$spinner.setLoadingState(trans.options().source !== "url" && trans.from().name !== trans.to().name);

const reload = typeof trans.options().reload === "boolean" ? <boolean>trans.options().reload : false;
Expand Down

0 comments on commit d4303d7

Please sign in to comment.