rearrange files

Author: o2sh

Diff for: src/main.rs

@@ -1,26 +1,15 @@
 // `error_chain!` can recurse deeply
 #![recursion_limit = "1024"]
 
+use crate::onefetch::{clap_app, error::*, image_backends, info, language::Language, options};
+
 use {
-    ascii_art::AsciiArt,
-    commit_info::CommitInfo,
-    error::*,
-    info::Info,
-    language::Language,
     process::{Command, Stdio},
     std::{convert::From, env, process, str::FromStr},
     strum::IntoEnumIterator,
 };
 
-mod ascii_art;
-mod clap_app;
-mod commit_info;
-mod error;
-mod image_backends;
-mod info;
-mod language;
-mod license;
-mod options;
+mod onefetch;
 
 fn run() -> Result<()> {
     #[cfg(windows)]
@@ -88,7 +77,7 @@ fn run() -> Result<()> {
         },
     };
 
-    let info = Info::new(config)?;
+    let info = info::Info::new(config)?;
 
     print!("{}", info);
     Ok(())

Diff for: src/ascii_art.rs renamed to src/onefetch/ascii_art.rs

@@ -1,10 +1,7 @@
 use {
-    crate::{
-        error::*,
-        language::Language,
-        license::Detector,
-        options::Options,
-        {AsciiArt, CommitInfo},
+    crate::onefetch::{
+        ascii_art::AsciiArt, commit_info::CommitInfo, error::*, language::Language,
+        license::Detector, options::Options,
     },
     colored::{Color, ColoredString, Colorize},
     git2::Repository,

Diff for: src/clap_app.rs renamed to src/onefetch/clap_app.rs

@@ -1,5 +1,5 @@
 use {
-    crate::error::*,
+    crate::onefetch::error::*,
     colored::Color,
     regex::Regex,
     std::collections::HashMap,
@@ -40,8 +40,8 @@ macro_rules! define_languages {
         impl Language {
             pub fn get_ascii_art(&self) -> &str {
                 match *self {
-                    $( Language::$name => include_str!(concat!("../resources/", $ascii)), )*
-                    Language::Unknown => include_str!("../resources/unknown.ascii"),
+                    $( Language::$name => include_str!(concat!("../../resources/", $ascii)), )*
+                    Language::Unknown => include_str!("../../resources/unknown.ascii"),
                 }
             }
 
@@ -78,7 +78,7 @@ macro_rules! define_languages {
                     #[test]
                     #[ignore]
                     fn [<$name:lower _width>] () {
-                        const ASCII: &str = include_str!(concat!("../resources/", $ascii));
+                        const ASCII: &str = include_str!(concat!("../../resources/", $ascii));
 
                         for (line_number, line) in ASCII.lines().enumerate() {
                             let line = COLOR_INTERPOLATION.replace_all(line, "");
@@ -91,7 +91,7 @@ macro_rules! define_languages {
                     #[test]
                     #[ignore]
                     fn [<$name:lower _height>] () {
-                        const ASCII: &str = include_str!(concat!("../resources/", $ascii));
+                        const ASCII: &str = include_str!(concat!("../../resources/", $ascii));
                         assert_le!(ASCII.lines().count(), MAX_HEIGHT, concat!($ascii, " is too tall."));
                     }
                 }

Diff for: src/commit_info.rs renamed to src/onefetch/commit_info.rs

@@ -1,8 +1,8 @@
 use askalono::{Store, TextData};
 
-use crate::error::*;
+use crate::onefetch::error::*;
 
-static CACHE_DATA: &[u8] = include_bytes!("../resources/licenses/cache.bin.zstd");
+static CACHE_DATA: &[u8] = include_bytes!("../../resources/licenses/cache.bin.zstd");
 const MIN_THRESHOLD: f32 = 0.8;
 
 pub struct Detector {

Diff for: src/error.rs renamed to src/onefetch/error.rs

@@ -0,0 +1,9 @@
+pub mod ascii_art;
+pub mod clap_app;
+pub mod commit_info;
+pub mod error;
+pub mod image_backends;
+pub mod info;
+pub mod language;
+pub mod license;
+pub mod options;

Diff for: src/image_backends/kitty.rs renamed to src/onefetch/image_backends/kitty.rs

@@ -1,5 +1,5 @@
 use {
-    crate::{image_backends::ImageBackend, info::InfoFieldOn, language::Language},
+    crate::onefetch::{image_backends::ImageBackend, info::InfoFieldOn, language::Language},
     image::DynamicImage,
 };