consolidate sharry module

src/cli.rs

@@ -11,7 +11,7 @@ use log::LevelFilter;
 
 use crate::{
     file::{Checked, FileTrait},
-    sharry::{AliasID, NewShareRequest, Uri},
+    sharry::{AliasID, Uri, json::NewShareRequest},
 };
 
 #[derive(Parser)]

src/impl_ureq.rs

@@ -50,7 +50,7 @@ impl sharry::Client for ureq::Agent {
         &self,
         uri: &Uri,
         alias_id: &AliasID,
-        data: sharry::NewShareRequest,
+        data: sharry::json::NewShareRequest,
     ) -> crate::Result<ShareID> {
         let res = {
             let endpoint = uri.share_create();
@@ -65,7 +65,7 @@ impl sharry::Client for ureq::Agent {
             crate::Error::res_status_check(res.status(), ureq::http::StatusCode::OK)?;
 
             res.body_mut()
-                .read_json::<sharry::NewShareResponse>()
+                .read_json::<sharry::json::NewShareResponse>()
                 .map_err(crate::Error::response)?
         };
 
@@ -94,7 +94,7 @@ impl sharry::Client for ureq::Agent {
             crate::Error::res_status_check(res.status(), ureq::http::StatusCode::OK)?;
 
             res.body_mut()
-                .read_json::<sharry::NotifyShareResponse>()
+                .read_json::<sharry::json::NotifyShareResponse>()
                 .map_err(crate::Error::response)?
         };
 

src/sharry/client.rs

@@ -1,33 +0,0 @@
-use crate::file;
-
-use super::{
-    AliasID, ShareID,
-    api::{FileID, NewShareRequest, Uri},
-};
-
-pub trait Client {
-    fn share_create(
-        &self,
-        uri: &Uri,
-        alias_id: &AliasID,
-        data: NewShareRequest,
-    ) -> crate::Result<ShareID>;
-
-    fn share_notify(&self, uri: &Uri, alias_id: &AliasID, share_id: &ShareID) -> crate::Result<()>;
-
-    fn file_create(
-        &self,
-        uri: &Uri,
-        alias_id: &AliasID,
-        share_id: &ShareID,
-        file: &file::Checked,
-    ) -> crate::Result<FileID>;
-
-    fn file_patch(
-        &self,
-        uri: &Uri,
-        alias_id: &AliasID,
-        share_id: &ShareID,
-        chunk: &file::Chunk,
-    ) -> crate::Result<()>;
-}

src/sharry/json.rs

@@ -1,11 +1,5 @@
-mod ids;
-mod uri;
-
 use serde::{Deserialize, Serialize};
 
-pub use ids::{AliasID, FileID, ShareID};
-pub use uri::Uri;
-
 #[derive(Serialize, Debug)]
 #[allow(non_snake_case)]
 pub struct NewShareRequest {

src/sharry/mod.rs

@@ -1,7 +1,35 @@
-mod api;
+mod ids;
-mod client;
+pub mod json;
+mod uri;
 
-pub use api::{
+pub use ids::{AliasID, FileID, ShareID};
-    AliasID, FileID, NewShareRequest, NewShareResponse, NotifyShareResponse, ShareID, Uri,
+pub use uri::Uri;
-};
+
-pub use client::Client;
+use crate::file;
+
+pub trait Client {
+    fn share_create(
+        &self,
+        uri: &Uri,
+        alias_id: &AliasID,
+        data: json::NewShareRequest,
+    ) -> crate::Result<ShareID>;
+
+    fn share_notify(&self, uri: &Uri, alias_id: &AliasID, share_id: &ShareID) -> crate::Result<()>;
+
+    fn file_create(
+        &self,
+        uri: &Uri,
+        alias_id: &AliasID,
+        share_id: &ShareID,
+        file: &file::Checked,
+    ) -> crate::Result<FileID>;
+
+    fn file_patch(
+        &self,
+        uri: &Uri,
+        alias_id: &AliasID,
+        share_id: &ShareID,
+        chunk: &file::Chunk,
+    ) -> crate::Result<()>;
+}