Style: Automatische Formatierung & Clippy-Fixes
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Skipped
TruffleHog Secret Scan / TruffleHog (push) Successful in 23s
Code Quality (Auto-Format & Clippy-Fix) / Formatierung & Clippy automatisch beheben (push) Successful in 36s
Security Scans / Trivy & OSV-Scanner (push) Successful in 42s
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Skipped
TruffleHog Secret Scan / TruffleHog (push) Successful in 23s
Code Quality (Auto-Format & Clippy-Fix) / Formatierung & Clippy automatisch beheben (push) Successful in 36s
Security Scans / Trivy & OSV-Scanner (push) Successful in 42s
This commit is contained in:
+1
-7
@@ -8,18 +8,12 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
/// Hauptkonfigurationsstruktur der Anwendung.
|
/// Hauptkonfigurationsstruktur der Anwendung.
|
||||||
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
|
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
|
||||||
|
#[derive(Default)]
|
||||||
pub struct AppConfig {
|
pub struct AppConfig {
|
||||||
/// Allgemeine Einstellungen
|
/// Allgemeine Einstellungen
|
||||||
pub general: General,
|
pub general: General,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AppConfig {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self {
|
|
||||||
general: General::default(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Allgemeine Konfigurationseinstellungen.
|
/// Allgemeine Konfigurationseinstellungen.
|
||||||
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
|
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
|
||||||
|
|||||||
+2
-3
@@ -111,15 +111,14 @@ pub fn run_compose_command(dir: &Path, args: &[&str]) -> std::io::Result<Output>
|
|||||||
|| stderr.contains("unknown command \"compose\"")
|
|| stderr.contains("unknown command \"compose\"")
|
||||||
|| stderr.contains("unknown command: compose"));
|
|| stderr.contains("unknown command: compose"));
|
||||||
|
|
||||||
if is_unavailable {
|
if is_unavailable
|
||||||
if let Ok(fallback_out) = Command::new("docker-compose")
|
&& let Ok(fallback_out) = Command::new("docker-compose")
|
||||||
.current_dir(dir)
|
.current_dir(dir)
|
||||||
.args(args)
|
.args(args)
|
||||||
.output()
|
.output()
|
||||||
{
|
{
|
||||||
return Ok(fallback_out);
|
return Ok(fallback_out);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
|
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
|
||||||
|
|||||||
Reference in New Issue
Block a user