diff --git a/.drone.yml b/.drone.yml index 32c0fb1..c2ef003 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Lynnesbian +# SPDX-FileCopyrightText: 2021-2022 Lynnesbian # SPDX-License-Identifier: CC0-1.0 --- diff --git a/.gitattributes b/.gitattributes index bf85d00..7ce4ef8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,4 @@ +# SPDX-FileCopyrightText: 2021-2022 Lynnesbian +# SPDX-License-Identifier: CC0-1.0 + doc/screenshot.png filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index d89f529..15edd5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Lynnesbian +# SPDX-FileCopyrightText: 2021-2022 Lynnesbian # SPDX-License-Identifier: CC0-1.0 /target diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0248606..a2b2e51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Lynnesbian +# SPDX-FileCopyrightText: 2021-2022 Lynnesbian # SPDX-License-Identifier: CC0-1.0 image: "rust:latest" diff --git a/.reuse/dep5 b/.reuse/dep5 index 61c1207..da26d20 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,7 +3,7 @@ Upstream-Name: fif Upstream-Contact: Lynnesbian Source: https://gitlab.com/Lynnesbian/fif/ -Files: .idea/**/* .idea/* Cargo.lock .mailmap .kateproject +Files: .idea/**/* .idea/* Cargo.lock .mailmap .kateproject *.toml Copyright: Lynnesbian License: CC0-1.0 diff --git a/Cargo.toml b/Cargo.toml index 706bbaf..8607cfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,3 @@ -# SPDX-FileCopyrightText: 2021 Lynnesbian -# SPDX-License-Identifier: CC0-1.0 - [package] name = "fif" description = "A command-line tool for detecting and optionally correcting files with incorrect extensions." diff --git a/Cross.toml b/Cross.toml index 9bef396..86773d6 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,5 +1,2 @@ -# SPDX-FileCopyrightText: 2021 Lynnesbian -# SPDX-License-Identifier: CC0-1.0 - [build.env] passthrough = ["RUST_BACKTRACE", "RUST_LOG", "FIF_LOG"] diff --git a/build.rs b/build.rs index bb177e4..dc5a373 100644 --- a/build.rs +++ b/build.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later use std::process::Command; diff --git a/clippy.sh b/clippy.sh index 130dda1..831105a 100755 --- a/clippy.sh +++ b/clippy.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Lynnesbian +# SPDX-FileCopyrightText: 2021-2022 Lynnesbian # SPDX-License-Identifier: CC0-1.0 set -e diff --git a/clippy.toml b/clippy.toml index 5657ebd..b99c74f 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,6 +1,3 @@ -# SPDX-FileCopyrightText: 2021 Lynnesbian -# SPDX-License-Identifier: CC0-1.0 - # avoid-breaking-exported-api = false # only available on nightly for now cognitive-complexity-threshold = 15 msrv = "1.54.0" diff --git a/rustfmt.toml b/rustfmt.toml index 6302064..b80b680 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,6 +1,3 @@ -# SPDX-FileCopyrightText: 2021 Lynnesbian -# SPDX-License-Identifier: CC0-1.0 - max_width = 120 fn_single_line = true hard_tabs = true diff --git a/src/files.rs b/src/files.rs index 0e6f2fb..3b26661 100644 --- a/src/files.rs +++ b/src/files.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later //! File handling - scanning, detecting MIME types, and so on. diff --git a/src/findings.rs b/src/findings.rs index 7d46bc5..0cd63da 100644 --- a/src/findings.rs +++ b/src/findings.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later //! The [`Findings`] and [`ScanError`] structs, used for conveying whether a given file was able to be scanned, whether diff --git a/src/formats.rs b/src/formats.rs index e8583ea..4054c4e 100644 --- a/src/formats.rs +++ b/src/formats.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later //! Logic for handling the various output formats that fif can output to. diff --git a/src/lib.rs b/src/lib.rs index e446041..3c4eaff 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later //! This library consists of all of the things fif needs to run. It only exists as a library to separate code, and to diff --git a/src/main.rs b/src/main.rs index 6399152..ef314cd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later // fif - a command-line tool for detecting and optionally correcting files with incorrect extensions. diff --git a/src/mime_db.rs b/src/mime_db.rs index 54a05e7..a0ab85c 100644 --- a/src/mime_db.rs +++ b/src/mime_db.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later //! Backend-neutral Mime database abstraction. diff --git a/src/parameters.rs b/src/parameters.rs index f4dea28..5d938a4 100644 --- a/src/parameters.rs +++ b/src/parameters.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later //! Command line argument parsing logic and associated functions. @@ -58,8 +58,8 @@ pub enum Prompt { long_version = CLAP_LONG_VERSION.as_str(), author = option_env!("CARGO_PKG_AUTHORS").unwrap_or("Lynnesbian"), about = option_env!("CARGO_PKG_DESCRIPTION").unwrap_or("File Info Fixer"), - before_help = "Copyright © 2021 Lynnesbian under the GPL3 (or later) License.", - after_long_help = "Copyright © 2021 Lynnesbian\n\ + before_help = "Copyright © 2021-2022 Lynnesbian under the GPL3 (or later) License.", + after_long_help = "Copyright © 2021-2022 Lynnesbian\n\ This program is free software: you can redistribute it and/or modify \ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 \ of the License, or (at your option) any later version.", diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 6743f61..bcd2e30 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -1,5 +1,4 @@ -// SPDX-FileCopyrightText: 2021 2021 Lynnesbian -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later use std::collections::{BTreeMap, HashMap}; diff --git a/src/utils.rs b/src/utils.rs index 4477889..8cf786f 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Lynnesbian +// SPDX-FileCopyrightText: 2021-2022 Lynnesbian // SPDX-License-Identifier: LGPL-3.0-or-later //! Various minor utilities. diff --git a/test.py b/test.py index 636045c..87d5a87 100755 --- a/test.py +++ b/test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# SPDX-FileCopyrightText: 2021 Lynnesbian +# SPDX-FileCopyrightText: 2021-2022 Lynnesbian # # SPDX-License-Identifier: LGPL-3.0-or-later