Fix build errors and update to latest tauri version
parent
7047dc7903
commit
db01332c15
GPG Key ID:
7E6D18B61C8D2F4B
@ -0,0 +1,11 @@
|
|||||||
|
[language-server.rust-analyzer]
|
||||||
|
command = "rust-analyzer"
|
||||||
|
|
||||||
|
[language-server.rust-analyzer.config]
|
||||||
|
inlayHints.bindingModeHints.enable = false
|
||||||
|
inlayHints.closingBraceHints.minLines = 10
|
||||||
|
inlayHints.closureReturnTypeHints.enable = "with_block"
|
||||||
|
inlayHints.discriminantHints.enable = "fieldless"
|
||||||
|
inlayHints.lifetimeElisionHints.enable = "skip_trivial"
|
||||||
|
inlayHints.typeHints.hideClosureInitialization = false
|
||||||
|
cargo.features = "all"
|
||||||
@ -1,66 +1,57 @@
|
|||||||
{
|
{
|
||||||
"root": true,
|
"root": true,
|
||||||
"ignorePatterns": [
|
"ignorePatterns": ["projects/**/*"],
|
||||||
"projects/**/*"
|
"overrides": [
|
||||||
],
|
{
|
||||||
"overrides": [
|
"files": ["*.ts"],
|
||||||
{
|
"parserOptions": {
|
||||||
"files": [
|
"project": ["tsconfig.json"],
|
||||||
"*.ts"
|
"createDefaultProgram": true
|
||||||
],
|
},
|
||||||
"parserOptions": {
|
"extends": [
|
||||||
"project": [
|
"plugin:@angular-eslint/recommended",
|
||||||
"tsconfig.json"
|
"plugin:@angular-eslint/template/process-inline-templates"
|
||||||
],
|
],
|
||||||
"createDefaultProgram": true
|
"rules": {
|
||||||
},
|
"@angular-eslint/directive-selector": [
|
||||||
"extends": [
|
"error",
|
||||||
"plugin:@angular-eslint/recommended",
|
{
|
||||||
"plugin:@angular-eslint/template/process-inline-templates"
|
"type": "attribute",
|
||||||
],
|
"prefix": "app",
|
||||||
"rules": {
|
"style": "camelCase"
|
||||||
"@angular-eslint/directive-selector": [
|
}
|
||||||
"error",
|
],
|
||||||
{
|
"@angular-eslint/component-selector": [
|
||||||
"type": "attribute",
|
"error",
|
||||||
"prefix": "app",
|
{
|
||||||
"style": "camelCase"
|
"type": "element",
|
||||||
}
|
"prefix": "app",
|
||||||
],
|
"style": "kebab-case"
|
||||||
"@angular-eslint/component-selector": [
|
}
|
||||||
"error",
|
],
|
||||||
{
|
"quotes": [
|
||||||
"type": "element",
|
"warn",
|
||||||
"prefix": "app",
|
"double",
|
||||||
"style": "kebab-case"
|
{
|
||||||
}
|
"avoidEscape": true
|
||||||
],
|
}
|
||||||
"quotes": [
|
],
|
||||||
"warn",
|
"indent": [
|
||||||
"double",
|
"error",
|
||||||
{
|
4,
|
||||||
"avoidEscape": true
|
{
|
||||||
}
|
"SwitchCase": 1
|
||||||
],
|
}
|
||||||
"indent": [
|
],
|
||||||
"error",
|
"no-unused-expressions": "warn",
|
||||||
4,
|
"no-extraneous-class": "off",
|
||||||
{
|
"semi": "error"
|
||||||
"SwitchCase": 1
|
}
|
||||||
}
|
},
|
||||||
],
|
{
|
||||||
"no-unused-expressions": "warn",
|
"files": ["*.html"],
|
||||||
"semi": "error"
|
"extends": ["plugin:@angular-eslint/template/recommended"],
|
||||||
}
|
"rules": {}
|
||||||
},
|
}
|
||||||
{
|
]
|
||||||
"files": [
|
|
||||||
"*.html"
|
|
||||||
],
|
|
||||||
"extends": [
|
|
||||||
"plugin:@angular-eslint/template/recommended"
|
|
||||||
],
|
|
||||||
"rules": {}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,15 @@
|
|||||||
|
[language-server.biome]
|
||||||
|
command = "biome"
|
||||||
|
args = ["lsp-proxy"]
|
||||||
|
|
||||||
|
[[language]]
|
||||||
|
name = "typescript"
|
||||||
|
language-servers = ["typescript-language-server"]
|
||||||
|
auto-format = true
|
||||||
|
formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.ts"] }
|
||||||
|
|
||||||
|
[[language]]
|
||||||
|
name = "javascript"
|
||||||
|
language-servers = ["typescript-language-server", "biome"]
|
||||||
|
auto-format = true
|
||||||
|
formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.js"] }
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://biomejs.dev/schemas/1.3.3/schema.json",
|
||||||
|
"organizeImports": {
|
||||||
|
"enabled": true
|
||||||
|
},
|
||||||
|
"linter": {
|
||||||
|
"enabled": true,
|
||||||
|
"rules": {
|
||||||
|
"recommended": true,
|
||||||
|
"complexity": {
|
||||||
|
"noStaticOnlyClass": "off"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,63 +1,64 @@
|
|||||||
{
|
{
|
||||||
"name": "mediarepo-ui",
|
"name": "mediarepo-ui",
|
||||||
"version": "1.0.4",
|
"version": "1.0.5",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
"watch": "ng build --watch --configuration development",
|
"watch": "ng build --watch --configuration development",
|
||||||
"watch-prod": "ng build --watch --configuration production",
|
"watch-prod": "ng build --watch --configuration production",
|
||||||
"test": "ng test",
|
"test": "ng test",
|
||||||
"lint": "ng lint",
|
"lint": "ng lint",
|
||||||
"tauri": "tauri"
|
"tauri": "tauri"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "~13.3.2",
|
"@angular/animations": "~13.3.2",
|
||||||
"@angular/cdk": "^13.3.2",
|
"@angular/cdk": "^13.3.2",
|
||||||
"@angular/common": "~13.3.2",
|
"@angular/common": "~13.3.2",
|
||||||
"@angular/compiler": "~13.3.2",
|
"@angular/compiler": "~13.3.2",
|
||||||
"@angular/core": "~13.3.2",
|
"@angular/core": "~13.3.2",
|
||||||
"@angular/flex-layout": "^13.0.0-beta.36",
|
"@angular/flex-layout": "^13.0.0-beta.36",
|
||||||
"@angular/forms": "~13.3.2",
|
"@angular/forms": "~13.3.2",
|
||||||
"@angular/material": "^13.3.2",
|
"@angular/material": "^13.3.2",
|
||||||
"@angular/platform-browser": "~13.3.2",
|
"@angular/platform-browser": "~13.3.2",
|
||||||
"@angular/platform-browser-dynamic": "~13.3.2",
|
"@angular/platform-browser-dynamic": "~13.3.2",
|
||||||
"@angular/router": "~13.3.2",
|
"@angular/router": "~13.3.2",
|
||||||
"@ng-icons/core": "^15.1.0",
|
"@ng-icons/core": "^15.1.0",
|
||||||
"@ng-icons/feather-icons": "^15.1.0",
|
"@ng-icons/feather-icons": "^15.1.0",
|
||||||
"@ng-icons/material-icons": "^15.1.0",
|
"@ng-icons/material-icons": "^15.1.0",
|
||||||
"@tauri-apps/api": "^1.0.0-rc.3",
|
"@tauri-apps/api": "^1.5.3",
|
||||||
"chart.js": "^3.7.1",
|
"chart.js": "^3.7.1",
|
||||||
"primeicons": "^5.0.0",
|
"primeicons": "^5.0.0",
|
||||||
"primeng": "^13.3.2",
|
"primeng": "^13.3.2",
|
||||||
"rxjs": "~7.5.5",
|
"rxjs": "~7.5.5",
|
||||||
"tslib": "^2.3.1",
|
"tslib": "^2.3.1",
|
||||||
"w3c-keys": "^1.0.3",
|
"w3c-keys": "^1.0.3",
|
||||||
"zone.js": "~0.11.5"
|
"zone.js": "~0.11.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/build-angular": "~13.3.2",
|
"@angular-devkit/build-angular": "~13.3.2",
|
||||||
"@angular-eslint/builder": "^13.2.0",
|
"@angular-eslint/builder": "^13.2.0",
|
||||||
"@angular-eslint/eslint-plugin": "^13.2.0",
|
"@angular-eslint/eslint-plugin": "^13.2.0",
|
||||||
"@angular-eslint/eslint-plugin-template": "^13.2.0",
|
"@angular-eslint/eslint-plugin-template": "^13.2.0",
|
||||||
"@angular-eslint/schematics": "^13.2.0",
|
"@angular-eslint/schematics": "^13.2.0",
|
||||||
"@angular-eslint/template-parser": "^13.2.0",
|
"@angular-eslint/template-parser": "^13.2.0",
|
||||||
"@angular/cli": "~13.3.2",
|
"@angular/cli": "~13.3.2",
|
||||||
"@angular/compiler-cli": "~13.3.2",
|
"@angular/compiler-cli": "~13.3.2",
|
||||||
"@tauri-apps/cli": "^1.0.0-rc.8",
|
"@angular/language-service": "^17.1.1",
|
||||||
"@types/file-saver": "^2.0.4",
|
"@tauri-apps/cli": "^1.5.4",
|
||||||
"@types/jasmine": "~4.0.2",
|
"@types/file-saver": "^2.0.4",
|
||||||
"@types/node": "^17.0.23",
|
"@types/jasmine": "~4.0.2",
|
||||||
"@typescript-eslint/eslint-plugin": "5.19.0",
|
"@types/node": "^17.0.23",
|
||||||
"@typescript-eslint/parser": "^5.19.0",
|
"@typescript-eslint/eslint-plugin": "5.19.0",
|
||||||
"eslint": "^8.13.0",
|
"@typescript-eslint/parser": "^5.19.0",
|
||||||
"jasmine-core": "~4.0.0",
|
"eslint": "^8.13.0",
|
||||||
"karma": "~6.3.10",
|
"jasmine-core": "~4.0.0",
|
||||||
"karma-chrome-launcher": "~3.1.0",
|
"karma": "~6.3.10",
|
||||||
"karma-coverage": "~2.2.0",
|
"karma-chrome-launcher": "~3.1.0",
|
||||||
"karma-jasmine": "~4.0.2",
|
"karma-coverage": "~2.2.0",
|
||||||
"karma-jasmine-html-reporter": "~1.7.0",
|
"karma-jasmine": "~4.0.2",
|
||||||
"typescript": "~4.6.3"
|
"karma-jasmine-html-reporter": "~1.7.0",
|
||||||
}
|
"typescript": "~4.6.3"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,76 +1,74 @@
|
|||||||
{
|
{
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "mediarepo-ui",
|
"productName": "mediarepo-ui",
|
||||||
"version": "1.0.4"
|
"version": "1.0.4"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
"distDir": "../dist/mediarepo-ui",
|
"distDir": "../dist/mediarepo-ui",
|
||||||
"devPath": "http://localhost:4200",
|
"devPath": "http://localhost:4200",
|
||||||
"beforeDevCommand": "yarn start",
|
"beforeDevCommand": "yarn start",
|
||||||
"beforeBuildCommand": "yarn build"
|
"beforeBuildCommand": "yarn build"
|
||||||
},
|
},
|
||||||
"tauri": {
|
"tauri": {
|
||||||
"bundle": {
|
"bundle": {
|
||||||
"active": true,
|
"active": true,
|
||||||
"targets": "all",
|
"targets": ["msi", "app", "dmg", "updater"],
|
||||||
"identifier": "net.trivernis.mediarepo",
|
"identifier": "net.trivernis.mediarepo",
|
||||||
"icon": [
|
"icon": [
|
||||||
"icons/32x32.png",
|
"icons/32x32.png",
|
||||||
"icons/64x64.png",
|
"icons/64x64.png",
|
||||||
"icons/128x128.png",
|
"icons/128x128.png",
|
||||||
"icons/128x128@2x.png",
|
"icons/128x128@2x.png",
|
||||||
"icons/icon.ico",
|
"icons/icon.ico",
|
||||||
"icons/icon.icns"
|
"icons/icon.icns"
|
||||||
],
|
],
|
||||||
"resources": [],
|
"resources": [],
|
||||||
"externalBin": [],
|
"externalBin": [],
|
||||||
"copyright": "",
|
"copyright": "",
|
||||||
"category": "Productivity",
|
"category": "Productivity",
|
||||||
"shortDescription": "A media management tool",
|
"shortDescription": "A media management tool",
|
||||||
"longDescription": "",
|
"longDescription": "",
|
||||||
"deb": {
|
"deb": {
|
||||||
"depends": [],
|
"depends": []
|
||||||
"useBootstrapper": false
|
},
|
||||||
},
|
"macOS": {
|
||||||
"macOS": {
|
"frameworks": [],
|
||||||
"frameworks": [],
|
"minimumSystemVersion": "",
|
||||||
"minimumSystemVersion": "",
|
"exceptionDomain": "",
|
||||||
"useBootstrapper": false,
|
"signingIdentity": null,
|
||||||
"exceptionDomain": "",
|
"entitlements": null
|
||||||
"signingIdentity": null,
|
},
|
||||||
"entitlements": null
|
"windows": {
|
||||||
},
|
"certificateThumbprint": null,
|
||||||
"windows": {
|
"digestAlgorithm": "sha256",
|
||||||
"certificateThumbprint": null,
|
"timestampUrl": ""
|
||||||
"digestAlgorithm": "sha256",
|
}
|
||||||
"timestampUrl": ""
|
},
|
||||||
}
|
"updater": {
|
||||||
},
|
"active": false
|
||||||
"updater": {
|
},
|
||||||
"active": false
|
"allowlist": {
|
||||||
},
|
"dialog": {
|
||||||
"allowlist": {
|
"all": true
|
||||||
"dialog": {
|
},
|
||||||
"all": true
|
"shell": {
|
||||||
},
|
"all": true
|
||||||
"shell": {
|
},
|
||||||
"all": true
|
"path": {
|
||||||
},
|
"all": true
|
||||||
"path": {
|
}
|
||||||
"all": true
|
},
|
||||||
}
|
"windows": [
|
||||||
},
|
{
|
||||||
"windows": [
|
"title": "mediarepo",
|
||||||
{
|
"width": 1920,
|
||||||
"title": "mediarepo",
|
"height": 1080,
|
||||||
"width": 1920,
|
"resizable": true,
|
||||||
"height": 1080,
|
"fullscreen": false
|
||||||
"resizable": true,
|
}
|
||||||
"fullscreen": false
|
],
|
||||||
}
|
"security": {
|
||||||
],
|
"csp": null
|
||||||
"security": {
|
}
|
||||||
"csp": null
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,65 +1,71 @@
|
|||||||
import {downloadDir} from "@tauri-apps/api/path";
|
import { downloadDir } from "@tauri-apps/api/path";
|
||||||
import {dialog} from "@tauri-apps/api";
|
import { dialog } from "@tauri-apps/api";
|
||||||
import {File} from "../../../api/models/File";
|
import type { File } from "../../../api/models/File";
|
||||||
|
|
||||||
export class FileHelper {
|
export class FileHelper {
|
||||||
|
/**
|
||||||
|
* Opens a dialog to get a download location for the given file
|
||||||
|
* @param {File} file
|
||||||
|
*/
|
||||||
|
public static async getFileDownloadLocation(
|
||||||
|
file: File,
|
||||||
|
): Promise<string | null> {
|
||||||
|
let extension = FileHelper.getExtensionForMime(file.mimeType);
|
||||||
|
|
||||||
/**
|
const downloadDirectory = await downloadDir();
|
||||||
* Opens a dialog to get a download location for the given file
|
const suggestionPath = downloadDirectory + file.cd + "." + extension;
|
||||||
* @param {File} file
|
|
||||||
*/
|
|
||||||
public static async getFileDownloadLocation(file: File): Promise<string | undefined> {
|
|
||||||
let extension = FileHelper.getExtensionForMime(file.mimeType);
|
|
||||||
|
|
||||||
const downloadDirectory = await downloadDir();
|
return await dialog.save({
|
||||||
const suggestionPath = downloadDirectory + file.cd + "." + extension;
|
defaultPath: suggestionPath,
|
||||||
|
filters: [
|
||||||
|
{
|
||||||
|
name: file.mimeType,
|
||||||
|
extensions: [extension ?? "*"],
|
||||||
|
},
|
||||||
|
{ name: "All", extensions: ["*"] },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return await dialog.save({
|
/**
|
||||||
defaultPath: suggestionPath,
|
* Parses a mime into its two components
|
||||||
filters: [{
|
* @param {string | undefined} mimeType
|
||||||
name: file.mimeType,
|
* @returns {[string, string] | undefined}
|
||||||
extensions: [extension ?? "*"]
|
*/
|
||||||
}, { name: "All", extensions: ["*"] }]
|
public static parseMime(
|
||||||
});
|
mimeType: string | undefined,
|
||||||
}
|
): [string, string] | undefined {
|
||||||
|
if (!mimeType) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
let mimeParts = mimeType.split("/");
|
||||||
|
if (mimeParts.length < 2) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const type = mimeParts[0];
|
||||||
|
const subtype = mimeParts[1];
|
||||||
|
|
||||||
/**
|
return [type, subtype];
|
||||||
* Parses a mime into its two components
|
}
|
||||||
* @param {string | undefined} mimeType
|
|
||||||
* @returns {[string, string] | undefined}
|
|
||||||
*/
|
|
||||||
public static parseMime(mimeType: string | undefined): [string, string] | undefined {
|
|
||||||
if (!mimeType) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
let mimeParts = mimeType.split("/");
|
|
||||||
if (mimeParts.length < 2) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
const type = mimeParts[0];
|
|
||||||
const subtype = mimeParts[1];
|
|
||||||
|
|
||||||
return [type, subtype];
|
/**
|
||||||
}
|
* Returns the extension for a mime type
|
||||||
|
* @param {string} mime
|
||||||
|
* @returns {string | undefined}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
public static getExtensionForMime(mime: string): string | undefined {
|
||||||
|
let parts = mime.split("/");
|
||||||
|
|
||||||
/**
|
if (parts.length === 2) {
|
||||||
* Returns the extension for a mime type
|
const type = parts[0];
|
||||||
* @param {string} mime
|
const subtype = parts[1];
|
||||||
* @returns {string | undefined}
|
return FileHelper.convertMimeSubtypeToExtension(subtype);
|
||||||
* @private
|
}
|
||||||
*/
|
return undefined;
|
||||||
public static getExtensionForMime(mime: string): string | undefined {
|
}
|
||||||
let parts = mime.split("/");
|
|
||||||
|
|
||||||
if (parts.length === 2) {
|
private static convertMimeSubtypeToExtension(subtype: string): string {
|
||||||
const type = parts[0];
|
return subtype;
|
||||||
const subtype = parts[1];
|
}
|
||||||
return FileHelper.convertMimeSubtypeToExtension(subtype);
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static convertMimeSubtypeToExtension(subtype: string): string {
|
|
||||||
return subtype;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue