refactor

GitoxideLabs · Jul 25, 2020 · f66b116 · f66b116
1 parent f932256
commit f66b116
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 27 deletions.
diff --git a/gitoxide-core/src/lib.rs b/gitoxide-core/src/lib.rs
@@ -35,4 +35,3 @@ impl FromStr for OutputFormat {
 
 pub mod pack;
 pub mod repository;
-pub mod verify;
diff --git a/gitoxide-core/src/pack.rs b/gitoxide-core/src/pack.rs
diff --git a/gitoxide-core/src/pack/explode.rs b/gitoxide-core/src/pack/explode.rs
@@ -0,0 +1,10 @@
+use anyhow::Result;
+use git_features::progress::Progress;
+use std::path::Path;
+
+pub fn pack_or_pack_index<P>(_path: impl AsRef<Path>, _progress: Option<P>, _delete_pack: bool) -> Result<()>
+where
+    P: Progress,
+{
+    Ok(())
+}
diff --git a/gitoxide-core/src/pack/mod.rs b/gitoxide-core/src/pack/mod.rs
@@ -0,0 +1,2 @@
+pub mod explode;
+pub mod verify;
diff --git a/gitoxide-core/src/verify.rs → gitoxide-core/src/pack/verify.rs b/gitoxide-core/src/verify.rs → gitoxide-core/src/pack/verify.rs
diff --git a/src/plumbing/lean.rs b/src/plumbing/lean.rs
@@ -71,7 +71,7 @@ mod options {
         /// the algorithm used to verify the pack. They differ in costs.
         ///
         /// Possible values are "less-time" and "less-memory". Default is "less-memory".
-        pub algorithm: Option<core::verify::Algorithm>,
+        pub algorithm: Option<core::pack::verify::Algorithm>,
 
         /// output statistical information about the pack
         #[argh(switch, short = 's')]
@@ -116,6 +116,7 @@ fn prepare(verbose: bool, name: &str) -> (Option<prodash::line::JoinHandle>, Opt
 }
 
 pub fn main() -> Result<()> {
+    use gitoxide_core::pack::verify;
     pub use options::*;
     let cli: Args = crate::shared::from_env();
     let thread_limit = cli.threads;
@@ -137,21 +138,21 @@ pub fn main() -> Result<()> {
             re_encode,
         }) => {
             let (_handle, progress) = prepare(verbose, "pack-verify");
-            core::verify::pack_or_pack_index(
+            verify::pack_or_pack_index(
                 path,
                 progress,
-                core::verify::Context {
+                verify::Context {
                     output_statistics: if statistics {
                         Some(core::OutputFormat::Human)
                     } else {
                         None
                     },
-                    algorithm: algorithm.unwrap_or(core::verify::Algorithm::LessTime),
+                    algorithm: algorithm.unwrap_or(verify::Algorithm::LessTime),
                     thread_limit,
                     mode: match (decode, re_encode) {
-                        (true, false) => core::verify::Mode::Sha1CRC32Decode,
-                        (true, true) | (false, true) => core::verify::Mode::Sha1CRC32DecodeEncode,
-                        (false, false) => core::verify::Mode::Sha1CRC32,
+                        (true, false) => verify::Mode::Sha1CRC32Decode,
+                        (true, true) | (false, true) => verify::Mode::Sha1CRC32DecodeEncode,
+                        (false, false) => verify::Mode::Sha1CRC32,
                     },
                     out: stdout(),
                     err: stderr(),

diff --git a/src/plumbing/pretty.rs b/src/plumbing/pretty.rs
@@ -3,6 +3,7 @@ use gitoxide_core as core;
 use std::io::{stderr, stdout, Write};
 use structopt::StructOpt;
 
+use gitoxide_core::pack::verify;
 use options::*;
 
 mod options {
@@ -71,9 +72,9 @@ mod options {
                 long,
                 short = "a",
                 default_value = "less-time",
-                possible_values(core::verify::Algorithm::variants())
+                possible_values(core::pack::verify::Algorithm::variants())
             )]
-            algorithm: core::verify::Algorithm,
+            algorithm: core::pack::verify::Algorithm,
 
             /// Display verbose messages and progress information
             #[structopt(long, short = "v")]
@@ -235,15 +236,15 @@ pub fn main() -> Result<()> {
             progress_keep_open,
             move |progress, out, err| {
                 let mode = match (decode, re_encode) {
-                    (true, false) => core::verify::Mode::Sha1CRC32Decode,
-                    (true, true) | (false, true) => core::verify::Mode::Sha1CRC32DecodeEncode,
-                    (false, false) => core::verify::Mode::Sha1CRC32,
+                    (true, false) => verify::Mode::Sha1CRC32Decode,
+                    (true, true) | (false, true) => verify::Mode::Sha1CRC32DecodeEncode,
+                    (false, false) => verify::Mode::Sha1CRC32,
                 };
                 let output_statistics = if statistics { Some(format) } else { None };
-                core::verify::pack_or_pack_index(
+                verify::pack_or_pack_index(
                     path,
                     progress,
-                    core::verify::Context {
+                    verify::Context {
                         output_statistics,
                         thread_limit,
                         algorithm,