updated copyright years, fixed reuse compliance

somehow i had listed the license as LGPL 3 instead of GPL 3 in all the reuse headers, and never noticed... 0uo
master
Lynne Megido 7 months ago
parent 66dd11397a
commit fc45376673
Signed by: lynnesbian
GPG Key ID: F0A184B5213D9F90
  1. 2
      .drone.yml
  2. 3
      .gitattributes
  3. 2
      .gitignore
  4. 2
      .gitlab-ci.yml
  5. 2
      .reuse/dep5
  6. 3
      Cargo.toml
  7. 3
      Cross.toml
  8. 4
      build.rs
  9. 2
      clippy.sh
  10. 3
      clippy.toml
  11. 3
      rustfmt.toml
  12. 4
      src/files.rs
  13. 4
      src/findings.rs
  14. 4
      src/formats.rs
  15. 4
      src/lib.rs
  16. 4
      src/main.rs
  17. 4
      src/mime_db.rs
  18. 8
      src/parameters.rs
  19. 5
      src/tests/mod.rs
  20. 4
      src/utils.rs
  21. 4
      test.py

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lynnesbian
# SPDX-FileCopyrightText: 2021-2022 Lynnesbian
# SPDX-License-Identifier: CC0-1.0
---

3
.gitattributes vendored

@ -1 +1,4 @@
# SPDX-FileCopyrightText: 2021-2022 Lynnesbian
# SPDX-License-Identifier: CC0-1.0
doc/screenshot.png filter=lfs diff=lfs merge=lfs -text

2
.gitignore vendored

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lynnesbian
# SPDX-FileCopyrightText: 2021-2022 Lynnesbian
# SPDX-License-Identifier: CC0-1.0
/target

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lynnesbian
# SPDX-FileCopyrightText: 2021-2022 Lynnesbian
# SPDX-License-Identifier: CC0-1.0
image: "rust:latest"

@ -3,7 +3,7 @@ Upstream-Name: fif
Upstream-Contact: Lynnesbian <lynne@bune.city>
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

@ -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."

@ -1,5 +1,2 @@
# SPDX-FileCopyrightText: 2021 Lynnesbian
# SPDX-License-Identifier: CC0-1.0
[build.env]
passthrough = ["RUST_BACKTRACE", "RUST_LOG", "FIF_LOG"]

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
use std::process::Command;

@ -1,6 +1,6 @@
#!/bin/bash
# SPDX-FileCopyrightText: 2021 Lynnesbian
# SPDX-FileCopyrightText: 2021-2022 Lynnesbian
# SPDX-License-Identifier: CC0-1.0
set -e

@ -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"

@ -1,6 +1,3 @@
# SPDX-FileCopyrightText: 2021 Lynnesbian
# SPDX-License-Identifier: CC0-1.0
max_width = 120
fn_single_line = true
hard_tabs = true

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
//! File handling - scanning, detecting MIME types, and so on.

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
//! The [`Findings`] and [`ScanError`] structs, used for conveying whether a given file was able to be scanned, whether
//! its MIME type could be inferred, and whether the file should be renamed.

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
//! Logic for handling the various output formats that fif can output to.

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-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
//! make documentation and testing a bit easier. I don't recommend using this as a library for your crate, as it may

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
// fif - a command-line tool for detecting and optionally correcting files with incorrect extensions.

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
//! Backend-neutral Mime database abstraction.

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-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.",

@ -1,6 +1,5 @@
// SPDX-FileCopyrightText: 2021 2021 Lynnesbian
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
use std::collections::{BTreeMap, HashMap};
use std::ffi::OsStr;

@ -1,5 +1,5 @@
// SPDX-FileCopyrightText: 2021 Lynnesbian
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-FileCopyrightText: 2021-2022 Lynnesbian
// SPDX-License-Identifier: GPL-3.0-or-later
//! Various minor utilities.

@ -1,8 +1,8 @@
#!/usr/bin/env python
# SPDX-FileCopyrightText: 2021 Lynnesbian
# SPDX-FileCopyrightText: 2021-2022 Lynnesbian
#
# SPDX-License-Identifier: LGPL-3.0-or-later
# SPDX-License-Identifier: GPL-3.0-or-later
import re
import subprocess

Loading…
Cancel
Save