Compare commits

..

No commits in common. "4cd47a3509f5a6cc0ad8f6e9e1efb3da3c830830" and "05e773d62c8b1786263042dc9b922ba6add9ebc7" have entirely different histories.

3 changed files with 9 additions and 62 deletions

View File

@ -1,29 +0,0 @@
name: Build and Test Formaty
on: [push]
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Install Task
uses: go-task/setup-task@v2
with:
repo-token: ${{ secrets.TASK_GITHUB_API_TOKEN }}
- uses: actions/checkout@v2
- name: Stable with rustfmt and clippy
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
components: rustfmt, clippy
- name: Lint Code
run: task check
- name: Build
run: task build
- name: Run Unit Tests
run: task test
- name: Upload Built Binary
uses: christopherHX/gitea-upload-artifact@v4
with:
name: formaty
path: target/debug/formaty

View File

@ -1,24 +0,0 @@
name: Build and Release Formaty
on: [release]
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Install Task
uses: go-task/setup-task@v2
with:
repo-token: ${{ secrets.TASK_GITHUB_API_TOKEN }}
- uses: actions/checkout@v2
- name: Stable with rustfmt and clippy
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
- name: Build Release
run: task build:release
- uses: actions/gitea-release-action@v1
with:
files: |-
target/release/formaty

View File

@ -7,7 +7,7 @@ use serde::Deserialize;
use std::fs::{File, read_dir};
use std::io::Read;
use std::path::PathBuf;
use std::str;
use std::{fs, str};
#[derive(RustEmbed)]
#[folder = "formats/"]
@ -95,19 +95,19 @@ impl FormatConfig {
config.get_file_config(config_path)?;
let global_dir = match global_config_path {
Some(g) => Some(g.clone()),
Some(g) => g.clone(),
None => {
if let Some(app_dirs) = AppDirs::new(Some("formaty"), true)
&& app_dirs.config_dir.exists()
{
Some(app_dirs.config_dir)
} else {
None
let app_dirs = AppDirs::new(Some("formaty"), true).unwrap();
if !app_dirs.config_dir.exists() {
fs::create_dir(&app_dirs.config_dir)?;
}
app_dirs.config_dir
}
};
config.parse_directory(&global_dir)?;
config.parse_directory(&Some(global_dir))?;
Ok(config)
}