Compare commits
No commits in common. "main" and "v0.1.2" have entirely different histories.
7 changed files with 40 additions and 322 deletions
162
.github/workflows/build.yml
vendored
162
.github/workflows/build.yml
vendored
|
|
@ -1,23 +1,11 @@
|
||||||
name: Windows Installer bauen
|
name: Windows Installer bauen
|
||||||
|
|
||||||
# Von GitHub Actions auf selbstgehostete Forgejo Actions umgestellt (Windows
|
|
||||||
# Runner rcp-24, derselbe Runner wie NovaStudioCast, siehe NOVA-SERVER/forgejo-runner).
|
|
||||||
# Zwei Aenderungen gegenueber der alten GitHub Version:
|
|
||||||
# 1. dtolnay/rust-toolchain ist auf dieser Forgejo Instanz nicht gespiegelt
|
|
||||||
# (nur die offiziellen actions/* Actions sind das), deshalb Rust hier
|
|
||||||
# direkt per rustup eingerichtet.
|
|
||||||
# 2. tauri-apps/tauri-action ist ebenfalls nicht gespiegelt, deshalb wird bei
|
|
||||||
# einem Versions-Tag von Hand gebaut, signiert und als Forgejo Release
|
|
||||||
# veroeffentlicht (Installer + latest.json), statt diese GitHub Action zu
|
|
||||||
# nutzen. "npm run tauri build" erzeugt bei gesetzten
|
|
||||||
# TAURI_SIGNING_PRIVATE_KEY(_PASSWORD) Umgebungsvariablen automatisch eine
|
|
||||||
# .sig Signaturdatei neben dem Installer, unabhaengig von tauri-action.
|
|
||||||
# actions/upload-artifact bewusst bei v3 belassen, v4+ wird von Forgejo nicht
|
|
||||||
# unterstuetzt (GHESNotSupportedError, siehe NovaStudioCast build.yml).
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- 'tauri-app/**'
|
||||||
|
- '.github/workflows/build.yml'
|
||||||
tags:
|
tags:
|
||||||
- 'v*.*.*'
|
- 'v*.*.*'
|
||||||
workflow_dispatch: {}
|
workflow_dispatch: {}
|
||||||
|
|
@ -34,8 +22,6 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: Code auschecken
|
- name: Code auschecken
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Node.js einrichten
|
- name: Node.js einrichten
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
|
|
@ -43,11 +29,7 @@ jobs:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
|
|
||||||
- name: Rust einrichten
|
- name: Rust einrichten
|
||||||
shell: pwsh
|
uses: dtolnay/rust-toolchain@stable
|
||||||
run: |
|
|
||||||
rustup toolchain install stable --profile minimal
|
|
||||||
rustup default stable
|
|
||||||
rustup target add x86_64-pc-windows-msvc
|
|
||||||
|
|
||||||
- name: Node Abhängigkeiten installieren
|
- name: Node Abhängigkeiten installieren
|
||||||
working-directory: tauri-app
|
working-directory: tauri-app
|
||||||
|
|
@ -61,6 +43,10 @@ jobs:
|
||||||
New-Item -ItemType Directory -Force -Path $binDir | Out-Null
|
New-Item -ItemType Directory -Force -Path $binDir | Out-Null
|
||||||
$triple = "x86_64-pc-windows-msvc"
|
$triple = "x86_64-pc-windows-msvc"
|
||||||
|
|
||||||
|
# Prueft, dass eine heruntergeladene Datei tatsaechlich ein echtes Windows
|
||||||
|
# Programm ist, statt z.B. einer kleinen, fehlgeschlagenen Downloadantwort
|
||||||
|
# (Fehlerseite, abgebrochene Uebertragung), die sonst unbemerkt als exe
|
||||||
|
# eingepackt wuerde und erst beim Nutzer mit "os error" fehlschlaegt.
|
||||||
function Assert-ValidExe($path) {
|
function Assert-ValidExe($path) {
|
||||||
if (-not (Test-Path $path)) {
|
if (-not (Test-Path $path)) {
|
||||||
Write-Error "$path wurde nicht angelegt, Download ist fehlgeschlagen."
|
Write-Error "$path wurde nicht angelegt, Download ist fehlgeschlagen."
|
||||||
|
|
@ -93,6 +79,9 @@ jobs:
|
||||||
|
|
||||||
Write-Host "Ermittle aktuelle DeepFilterNet Windows Datei..."
|
Write-Host "Ermittle aktuelle DeepFilterNet Windows Datei..."
|
||||||
$release = Invoke-RestMethod -Uri "https://api.github.com/repos/Rikorose/DeepFilterNet/releases/latest" -Headers @{ "User-Agent" = "novaphonic-build" }
|
$release = Invoke-RestMethod -Uri "https://api.github.com/repos/Rikorose/DeepFilterNet/releases/latest" -Headers @{ "User-Agent" = "novaphonic-build" }
|
||||||
|
# Bewusst "windows" statt nur "win" im Muster: "win" allein steckt zufaellig
|
||||||
|
# auch im Wort "darwin" (Apple macOS), das hatte vorher versehentlich die
|
||||||
|
# falsche, nicht-Windows-Datei ausgewaehlt.
|
||||||
$winAsset = $release.assets | Where-Object { $_.name -match "(?i)deep-filter-.*x86_64-pc-windows-msvc\.exe$" } | Select-Object -First 1
|
$winAsset = $release.assets | Where-Object { $_.name -match "(?i)deep-filter-.*x86_64-pc-windows-msvc\.exe$" } | Select-Object -First 1
|
||||||
if (-not $winAsset) {
|
if (-not $winAsset) {
|
||||||
Write-Error "Kein passendes DeepFilterNet Windows Asset in der aktuellen Release gefunden. Bitte https://github.com/Rikorose/DeepFilterNet/releases manuell pruefen und diesen Schritt anpassen."
|
Write-Error "Kein passendes DeepFilterNet Windows Asset in der aktuellen Release gefunden. Bitte https://github.com/Rikorose/DeepFilterNet/releases manuell pruefen und diesen Schritt anpassen."
|
||||||
|
|
@ -115,117 +104,32 @@ jobs:
|
||||||
|
|
||||||
- name: Installer als Artefakt hochladen (nur bei normalem Push)
|
- name: Installer als Artefakt hochladen (nur bei normalem Push)
|
||||||
if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
|
if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: novaphonic-windows-installer
|
name: novaphonic-windows-installer
|
||||||
path: |
|
path: |
|
||||||
tauri-app/src-tauri/target/release/bundle/nsis/*.exe
|
tauri-app/src-tauri/target/release/bundle/nsis/*.exe
|
||||||
|
|
||||||
- name: Änderungsliste seit dem letzten Tag ermitteln (nur bei Versions-Tag)
|
- name: Bauen, signieren und GitHub Release veröffentlichen (nur bei Versions-Tag)
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
id: changelog
|
uses: tauri-apps/tauri-action@v0
|
||||||
shell: pwsh
|
|
||||||
run: |
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
$currentTag = "${{ github.ref_name }}"
|
|
||||||
$prevTag = git tag --sort=-v:refname | Where-Object { $_ -ne $currentTag } | Select-Object -First 1
|
|
||||||
Write-Host "Aktueller Tag: $currentTag"
|
|
||||||
Write-Host "Vorheriger Tag: $(if ($prevTag) { $prevTag } else { 'keiner, es ist das erste Release' })"
|
|
||||||
if ($prevTag) {
|
|
||||||
$log = git log --pretty=format:"- %s" "$prevTag..$currentTag"
|
|
||||||
} else {
|
|
||||||
$log = git log --pretty=format:"- %s" "$currentTag"
|
|
||||||
}
|
|
||||||
$changelog = "changelog<<CHANGELOG_EOF`n$($log -join "`n")`nCHANGELOG_EOF"
|
|
||||||
Add-Content -Path $env:GITHUB_OUTPUT -Value $changelog
|
|
||||||
|
|
||||||
- name: Versionsnummer aus Tag automatisch setzen (nur bei Versions-Tag)
|
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
|
||||||
working-directory: tauri-app
|
|
||||||
shell: pwsh
|
|
||||||
run: |
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
$version = "${{ github.ref_name }}" -replace '^v', ''
|
|
||||||
Write-Host "Setze Version auf $version in tauri.conf.json, package.json, Cargo.toml ..."
|
|
||||||
|
|
||||||
$confPath = "src-tauri/tauri.conf.json"
|
|
||||||
$content = Get-Content $confPath -Raw
|
|
||||||
$neu = $content -replace '("version"\s*:\s*)"[^"]*"', "`$1`"$version`""
|
|
||||||
if ($neu -eq $content) { Write-Error "Version in $confPath nicht gefunden/ersetzt." }
|
|
||||||
Set-Content -Path $confPath -Value $neu -NoNewline
|
|
||||||
|
|
||||||
$pkgPath = "package.json"
|
|
||||||
$content = Get-Content $pkgPath -Raw
|
|
||||||
$neu = $content -replace '("version"\s*:\s*)"[^"]*"', "`$1`"$version`""
|
|
||||||
if ($neu -eq $content) { Write-Error "Version in $pkgPath nicht gefunden/ersetzt." }
|
|
||||||
Set-Content -Path $pkgPath -Value $neu -NoNewline
|
|
||||||
|
|
||||||
$cargoPath = "src-tauri/Cargo.toml"
|
|
||||||
$content = Get-Content $cargoPath -Raw
|
|
||||||
$neu = $content -replace '(?m)^version = "[^"]*"', "version = `"$version`""
|
|
||||||
if ($neu -eq $content) { Write-Error "Version in $cargoPath nicht gefunden/ersetzt." }
|
|
||||||
Set-Content -Path $cargoPath -Value $neu -NoNewline
|
|
||||||
|
|
||||||
Write-Host " Erledigt, alle drei Dateien jetzt auf $version."
|
|
||||||
|
|
||||||
- name: Bauen und signieren (nur bei Versions-Tag)
|
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
|
||||||
working-directory: tauri-app
|
|
||||||
run: npm run tauri build
|
|
||||||
|
|
||||||
- name: Forgejo Release veröffentlichen (nur bei Versions-Tag)
|
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
|
||||||
shell: pwsh
|
|
||||||
env:
|
env:
|
||||||
FORGEJO_TOKEN: ${{ secrets.FORGEJO_RELEASE_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
CHANGELOG: ${{ steps.changelog.outputs.changelog }}
|
with:
|
||||||
run: |
|
projectPath: tauri-app
|
||||||
$ErrorActionPreference = "Stop"
|
tagName: ${{ github.ref_name }}
|
||||||
$repoApi = "https://forgejo.kiw-schmiede.eu/api/v1/repos/kiw-schmiede/novaphonic"
|
releaseName: 'NovaPhonic ${{ github.ref_name }}'
|
||||||
$headers = @{ Authorization = "token $env:FORGEJO_TOKEN" }
|
# Bewusst kein fest eingetragener Text mehr: JJ hat am 2026-08-19
|
||||||
$tag = "${{ github.ref_name }}"
|
# festgelegt, dass die Release-Beschreibung immer den tatsächlichen
|
||||||
|
# Stand dokumentieren und nie ein alter, unveränderter Text sein
|
||||||
$bundleDir = "tauri-app/src-tauri/target/release/bundle/nsis"
|
# darf. releaseBody liefert nur noch die kurze Einleitung, den
|
||||||
$installer = Get-ChildItem -Path $bundleDir -Filter "*.exe" | Select-Object -First 1
|
# eigentlichen Änderungs-Teil ("Änderungen in diesem Release")
|
||||||
$sigFile = "$($installer.FullName).sig"
|
# erzeugt GitHub selbst automatisch aus den Commits seit dem
|
||||||
if (-not (Test-Path $sigFile)) {
|
# letzten Tag (generateReleaseNotes), dadurch ist die Beschreibung
|
||||||
Write-Error "Keine .sig Datei neben $($installer.Name) gefunden, Signierung ist vermutlich fehlgeschlagen (TAURI_SIGNING_PRIVATE_KEY gesetzt?)."
|
# bei jedem künftigen Release automatisch aktuell, ohne dass hier
|
||||||
}
|
# manuell etwas nachgepflegt werden muss.
|
||||||
$signature = Get-Content $sigFile -Raw
|
releaseBody: 'NovaPhonic ${{ github.ref_name }}. Enthält den Windows Installer sowie das Update Manifest für die In App Aktualisierung.'
|
||||||
|
releaseDraft: false
|
||||||
Write-Host "Lege Forgejo Release fuer $tag an ..."
|
prerelease: false
|
||||||
$releaseBody = @{
|
includeUpdaterJson: true
|
||||||
tag_name = $tag
|
generateReleaseNotes: true
|
||||||
name = "NovaPhonic $tag"
|
|
||||||
body = "NovaPhonic $tag. Enthaelt den Windows Installer sowie das Update Manifest fuer die In App Aktualisierung.`n`nAenderungen in diesem Release:`n$env:CHANGELOG"
|
|
||||||
draft = $false
|
|
||||||
prerelease = $false
|
|
||||||
} | ConvertTo-Json
|
|
||||||
$release = Invoke-RestMethod -Uri "$repoApi/releases" -Method Post -Headers $headers -ContentType "application/json" -Body $releaseBody
|
|
||||||
Write-Host " Release ID $($release.id) angelegt."
|
|
||||||
|
|
||||||
Write-Host "Lade Installer hoch ..."
|
|
||||||
$installerUploadUrl = "$repoApi/releases/$($release.id)/assets?name=$($installer.Name)"
|
|
||||||
Invoke-RestMethod -Uri $installerUploadUrl -Method Post -Headers $headers -Form @{ attachment = Get-Item $installer.FullName } | Out-Null
|
|
||||||
|
|
||||||
$installerAsset = (Invoke-RestMethod -Uri "$repoApi/releases/$($release.id)" -Headers $headers).assets | Where-Object { $_.name -eq $installer.Name }
|
|
||||||
|
|
||||||
Write-Host "Baue latest.json (Update Manifest) ..."
|
|
||||||
$latestJson = @{
|
|
||||||
version = $tag
|
|
||||||
notes = "NovaPhonic $tag"
|
|
||||||
pub_date = (Get-Date -AsUTC -Format "yyyy-MM-ddTHH:mm:ssZ")
|
|
||||||
platforms = @{
|
|
||||||
"windows-x86_64" = @{
|
|
||||||
signature = $signature
|
|
||||||
url = $installerAsset.browser_download_url
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} | ConvertTo-Json -Depth 5
|
|
||||||
Set-Content -Path "latest.json" -Value $latestJson -NoNewline
|
|
||||||
|
|
||||||
Write-Host "Lade latest.json hoch ..."
|
|
||||||
$manifestUploadUrl = "$repoApi/releases/$($release.id)/assets?name=latest.json"
|
|
||||||
Invoke-RestMethod -Uri $manifestUploadUrl -Method Post -Headers $headers -Form @{ attachment = Get-Item "latest.json" } | Out-Null
|
|
||||||
|
|
||||||
Write-Host "Fertig: https://forgejo.kiw-schmiede.eu/kiw-schmiede/novaphonic/releases/tag/$tag"
|
|
||||||
|
|
|
||||||
85
app/app.js
85
app/app.js
|
|
@ -148,65 +148,6 @@
|
||||||
loudnormToggle.addEventListener('change', syncLoudnormOptions);
|
loudnormToggle.addEventListener('change', syncLoudnormOptions);
|
||||||
syncLoudnormOptions();
|
syncLoudnormOptions();
|
||||||
|
|
||||||
// ---------- Automatisches Speichern ----------
|
|
||||||
// Standard bleibt der "Speichern unter" Dialog nach jeder Verarbeitung (wie
|
|
||||||
// bisher). Wer die Checkbox aktiviert, bekommt stattdessen jedes Ergebnis
|
|
||||||
// automatisch in einem einmal gewählten Ordner abgelegt, ohne Dialog. Die
|
|
||||||
// Einstellung wird über zwei kleine Rust Commands (load_settings/save_settings)
|
|
||||||
// in einer settings Datei im App Konfigurationsordner gespeichert, damit sie
|
|
||||||
// App-Neustarts übersteht.
|
|
||||||
const autoSaveToggle = $('autoSaveToggle');
|
|
||||||
const autoSaveFolderRow = $('autoSaveFolderRow');
|
|
||||||
const autoSaveFolderPath = $('autoSaveFolderPath');
|
|
||||||
const chooseAutoSaveFolderBtn = $('chooseAutoSaveFolderBtn');
|
|
||||||
let appSettings = { autoSaveEnabled: false, autoSaveFolder: null };
|
|
||||||
|
|
||||||
function syncAutoSaveUi() {
|
|
||||||
autoSaveFolderRow.style.display = autoSaveToggle.checked ? 'block' : 'none';
|
|
||||||
autoSaveFolderPath.textContent = appSettings.autoSaveFolder || 'Kein Ordner ausgewählt';
|
|
||||||
}
|
|
||||||
|
|
||||||
async function persistSettings() {
|
|
||||||
appSettings.autoSaveEnabled = autoSaveToggle.checked;
|
|
||||||
if (!isTauri()) return;
|
|
||||||
try {
|
|
||||||
await window.__TAURI__.core.invoke('save_settings', { settings: appSettings });
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
autoSaveToggle.addEventListener('change', () => {
|
|
||||||
syncAutoSaveUi();
|
|
||||||
persistSettings();
|
|
||||||
});
|
|
||||||
|
|
||||||
chooseAutoSaveFolderBtn.addEventListener('click', async () => {
|
|
||||||
if (!isTauri()) return;
|
|
||||||
try {
|
|
||||||
const folder = await window.__TAURI__.core.invoke('pick_save_folder');
|
|
||||||
if (folder) {
|
|
||||||
appSettings.autoSaveFolder = folder;
|
|
||||||
syncAutoSaveUi();
|
|
||||||
persistSettings();
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
async function loadSettings() {
|
|
||||||
if (!isTauri()) { syncAutoSaveUi(); return; }
|
|
||||||
try {
|
|
||||||
const loaded = await window.__TAURI__.core.invoke('load_settings');
|
|
||||||
if (loaded) appSettings = loaded;
|
|
||||||
autoSaveToggle.checked = !!appSettings.autoSaveEnabled;
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
syncAutoSaveUi();
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---------- Pipeline Ablauf ----------
|
// ---------- Pipeline Ablauf ----------
|
||||||
const STEP_IDS = ['denoise', 'cut', 'loudnorm'];
|
const STEP_IDS = ['denoise', 'cut', 'loudnorm'];
|
||||||
|
|
||||||
|
|
@ -274,31 +215,8 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
async function showResult(result) {
|
function showResult(result) {
|
||||||
const name = result.outputPath.split(/[\\/]/).pop();
|
const name = result.outputPath.split(/[\\/]/).pop();
|
||||||
|
|
||||||
// Automatisches Speichern: wenn aktiviert und ein Ordner gewählt wurde,
|
|
||||||
// landet das Ergebnis sofort dort, ohne "Speichern unter" Dialog.
|
|
||||||
if (appSettings.autoSaveEnabled && appSettings.autoSaveFolder) {
|
|
||||||
try {
|
|
||||||
const saved = await window.__TAURI__.core.invoke('auto_save_output', {
|
|
||||||
sourcePath: result.outputPath,
|
|
||||||
suggestedName: name,
|
|
||||||
targetFolder: appSettings.autoSaveFolder
|
|
||||||
});
|
|
||||||
$('resultArea').innerHTML =
|
|
||||||
'<div class="result-box"><span class="rb-name">' + name.replace(/</g, '<') + '</span></div>' +
|
|
||||||
'<div class="status-ok" style="margin-top:8px;">Automatisch gespeichert unter: ' +
|
|
||||||
String(saved).replace(/</g, '<') + '</div>';
|
|
||||||
return;
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
// Bei einem Fehler beim automatischen Speichern (z.B. Ordner nicht mehr
|
|
||||||
// vorhanden) auf den manuellen Weg zurückfallen, damit das fertige
|
|
||||||
// Ergebnis nicht verloren geht.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$('resultArea').innerHTML =
|
$('resultArea').innerHTML =
|
||||||
'<div class="result-box">' +
|
'<div class="result-box">' +
|
||||||
'<span class="rb-name">' + name.replace(/</g, '<') + '</span>' +
|
'<span class="rb-name">' + name.replace(/</g, '<') + '</span>' +
|
||||||
|
|
@ -386,6 +304,5 @@
|
||||||
// ---------- Start ----------
|
// ---------- Start ----------
|
||||||
initProgressListener();
|
initProgressListener();
|
||||||
checkTools();
|
checkTools();
|
||||||
loadSettings();
|
|
||||||
checkForUpdate(true);
|
checkForUpdate(true);
|
||||||
})();
|
})();
|
||||||
|
|
|
||||||
|
|
@ -81,18 +81,6 @@
|
||||||
<option value="-14">-14 LUFS (Streaming, laut)</option>
|
<option value="-14">-14 LUFS (Streaming, laut)</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="checkbox-row" style="margin-top:16px;">
|
|
||||||
<input type="checkbox" id="autoSaveToggle">
|
|
||||||
<label for="autoSaveToggle">Ergebnis automatisch speichern, ohne Dialog</label>
|
|
||||||
</div>
|
|
||||||
<div class="row" id="autoSaveFolderRow" style="margin-top:10px; display:none;">
|
|
||||||
<div class="selected-file">
|
|
||||||
<span class="sf-name" id="autoSaveFolderPath">Kein Ordner ausgewählt</span>
|
|
||||||
<button class="secondary" type="button" id="chooseAutoSaveFolderBtn">Ordner wählen</button>
|
|
||||||
</div>
|
|
||||||
<div class="hint-small">Jedes fertige Video landet automatisch in diesem Ordner, ohne dass du jedes Mal einen Speicherort auswählen musst.</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "novaphonic",
|
"name": "novaphonic",
|
||||||
"version": "0.1.3",
|
"version": "0.1.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"tauri": "tauri"
|
"tauri": "tauri"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "novaphonic"
|
name = "novaphonic"
|
||||||
version = "0.1.3"
|
version = "0.1.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "NovaPhonic, ein Tool von KI-WERKE zum automatischen Videoschnitt und zur Audio Veredelung"
|
description = "NovaPhonic, ein Tool von KI-WERKE zum automatischen Videoschnitt und zur Audio Veredelung"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use tauri::{AppHandle, Emitter, Manager};
|
use tauri::{AppHandle, Emitter};
|
||||||
use tauri_plugin_shell::process::CommandEvent;
|
use tauri_plugin_shell::process::CommandEvent;
|
||||||
use tauri_plugin_shell::ShellExt;
|
use tauri_plugin_shell::ShellExt;
|
||||||
|
|
||||||
|
|
@ -75,93 +75,6 @@ fn cleanup_temp_work_dir(source_path: &str) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------- Einstellungen (automatisches Standardspeicherziel) ----------
|
|
||||||
// Wird als kleine JSON Datei im App Konfigurationsordner des Nutzers abgelegt
|
|
||||||
// (z.B. unter Windows in AppData\Roaming\...), nicht im Temp-Ordner, damit sie
|
|
||||||
// App-Neustarts übersteht. Betrifft ausschließlich diese Einstellung, niemals
|
|
||||||
// Videoinhalte oder Zwischenergebnisse.
|
|
||||||
#[derive(Serialize, Deserialize, Clone, Default)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
struct AppSettings {
|
|
||||||
auto_save_enabled: bool,
|
|
||||||
auto_save_folder: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn settings_path(app: &AppHandle) -> Result<PathBuf, String> {
|
|
||||||
let dir = app
|
|
||||||
.path()
|
|
||||||
.app_config_dir()
|
|
||||||
.map_err(|e| format!("Konnte Konfigurationsordner nicht ermitteln: {e}"))?;
|
|
||||||
fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
|
|
||||||
Ok(dir.join("settings.json"))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
fn load_settings(app: AppHandle) -> AppSettings {
|
|
||||||
let Ok(path) = settings_path(&app) else {
|
|
||||||
return AppSettings::default();
|
|
||||||
};
|
|
||||||
match fs::read_to_string(&path) {
|
|
||||||
Ok(text) => serde_json::from_str(&text).unwrap_or_default(),
|
|
||||||
Err(_) => AppSettings::default(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
fn save_settings(app: AppHandle, settings: AppSettings) -> Result<(), String> {
|
|
||||||
let path = settings_path(&app)?;
|
|
||||||
let text = serde_json::to_string_pretty(&settings).map_err(|e| e.to_string())?;
|
|
||||||
fs::write(&path, text).map_err(|e| format!("Konnte Einstellungen nicht speichern: {e}"))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
fn pick_save_folder() -> Option<String> {
|
|
||||||
let folder = rfd::FileDialog::new().pick_folder()?;
|
|
||||||
Some(folder.to_string_lossy().to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Kopiert das fertige Ergebnis direkt in den vom Nutzer festgelegten Standard-
|
|
||||||
// Ordner, ohne "Speichern unter" Dialog, und räumt danach wie gewohnt den
|
|
||||||
// temporären Arbeitsordner auf. Bei einem Namenskonflikt wird die bestehende
|
|
||||||
// Datei bewusst nicht überschrieben, sondern ein Zähler an den Dateinamen
|
|
||||||
// angehängt, damit nie versehentlich ein älteres Ergebnis verloren geht.
|
|
||||||
#[tauri::command]
|
|
||||||
fn auto_save_output(
|
|
||||||
source_path: String,
|
|
||||||
suggested_name: String,
|
|
||||||
target_folder: String,
|
|
||||||
) -> Result<String, String> {
|
|
||||||
let folder = PathBuf::from(&target_folder);
|
|
||||||
if !folder.is_dir() {
|
|
||||||
return Err(format!(
|
|
||||||
"Zielordner nicht gefunden: {}",
|
|
||||||
folder.display()
|
|
||||||
));
|
|
||||||
}
|
|
||||||
let name_path = PathBuf::from(&suggested_name);
|
|
||||||
let stem = name_path
|
|
||||||
.file_stem()
|
|
||||||
.and_then(|s| s.to_str())
|
|
||||||
.unwrap_or("nova_ergebnis")
|
|
||||||
.to_string();
|
|
||||||
let ext = name_path
|
|
||||||
.extension()
|
|
||||||
.and_then(|s| s.to_str())
|
|
||||||
.unwrap_or("mp4")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let mut dest = folder.join(&suggested_name);
|
|
||||||
let mut counter = 1;
|
|
||||||
while dest.exists() {
|
|
||||||
dest = folder.join(format!("{stem} ({counter}).{ext}"));
|
|
||||||
counter += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
fs::copy(&source_path, &dest).map_err(|e| format!("Konnte Datei nicht speichern: {e}"))?;
|
|
||||||
cleanup_temp_work_dir(&source_path);
|
|
||||||
Ok(dest.to_string_lossy().to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wichtig: Tauri spricht Sidecar Programme zur Laufzeit nur über ihren bloßen
|
// Wichtig: Tauri spricht Sidecar Programme zur Laufzeit nur über ihren bloßen
|
||||||
// Namen an (z.B. "auto-editor"), der Ordnerpfad "binaries/" wird ausschließlich
|
// Namen an (z.B. "auto-editor"), der Ordnerpfad "binaries/" wird ausschließlich
|
||||||
// beim Einrichten in tauri.conf.json (externalBin) und in den Capabilities
|
// beim Einrichten in tauri.conf.json (externalBin) und in den Capabilities
|
||||||
|
|
@ -572,11 +485,7 @@ fn main() {
|
||||||
pick_video_file,
|
pick_video_file,
|
||||||
save_output_as,
|
save_output_as,
|
||||||
check_tools,
|
check_tools,
|
||||||
process_video,
|
process_video
|
||||||
load_settings,
|
|
||||||
save_settings,
|
|
||||||
pick_save_folder,
|
|
||||||
auto_save_output
|
|
||||||
])
|
])
|
||||||
.run(tauri::generate_context!())
|
.run(tauri::generate_context!())
|
||||||
.expect("Fehler beim Starten der Tauri Anwendung");
|
.expect("Fehler beim Starten der Tauri Anwendung");
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "NovaPhonic",
|
"productName": "NovaPhonic",
|
||||||
"version": "0.1.3",
|
"version": "0.1.2",
|
||||||
"identifier": "com.kiwerkepro.novaphonic",
|
"identifier": "com.kiwerkepro.novaphonic",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../../app"
|
"frontendDist": "../../app"
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
},
|
},
|
||||||
"plugins": {
|
"plugins": {
|
||||||
"updater": {
|
"updater": {
|
||||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEE1NzVEMkZBOEM1NDhGRApSV1Q5U01Xb0wxMVhDaENFOHRPV29oeUxkdmEzYkQ1NTV6NHE0NHUwbERYeUliRkErVXBoU3AvTwo=",
|
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDMxOUJBODQxRTFFMzNFRjcKUldUM1B1UGhRYWliTVIySHBRUno3R2NvSC9SV2hzV1BXVFp3Rit5eThhSVBvdmxJM1k3ZzBLV1oK",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
"https://github.com/kiwerkepro-org/novaphonic/releases/latest/download/latest.json"
|
"https://github.com/kiwerkepro-org/novaphonic/releases/latest/download/latest.json"
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue