restructure sharry module (logic)

src/main.rs

@@ -1,7 +1,7 @@
 mod sharry;
 
 use log::info;
-use sharry::{Alias, NewShareRequest, URI};
+use sharry::{Alias, NewShareRequest, Share};
 use std::time::Duration;
 use ureq::Agent;
 
@@ -14,16 +14,15 @@ fn main() {
         .into();
 
     let alias = Alias::new(
-        URI::new("sharry.yavook.de"),
+        "sharry.yavook.de".into(),
         "G7RYoWME1W7-pcgipemJcr8-39FcMd92gBu-RgufeHc51z6",
     );
 
-    let share = alias.create_share(&agent, &NewShareRequest::new(Some("foo"), "", 10));
-
-    let share = share.unwrap();
+    let share = NewShareRequest::new(Some("foo"), "", 10);
+    let share = Share::create(&agent, &alias, share).unwrap();
     info!("share: {:?}", share);
 
-    share.create_file(&agent, "./myfile.dat").unwrap();
+    // share.create_file(&agent, "./myfile.dat").unwrap();
 
     share.notify(&agent).unwrap();
 }

src/sharry/alias.rs

@@ -1,41 +1,38 @@
-use log::debug;
-use ureq::{Agent, RequestBuilder};
+use std::fmt::{Debug, Display};
 
-use super::{
-    api::{NewShareRequest, NewShareResponse, URI},
-    share::Share,
-};
+use log::debug;
+use ureq::RequestBuilder;
+
+use super::api::URI;
 
 #[derive(Debug)]
 pub struct Alias {
-    pub(super) uri: URI,
+    pub(super) api_uri: String,
     pub(super) id: String,
 }
 
+pub(super) trait SharryAlias {
+    fn sharry_header(self, alias: &Alias) -> Self;
+}
+
+impl<B> SharryAlias for RequestBuilder<B> {
+    fn sharry_header(self, alias: &Alias) -> Self {
+        self.header("Sharry-Alias", &alias.id)
+    }
+}
+
 impl Alias {
-    pub fn new(uri: URI, id: impl Into<String>) -> Self {
-        Self { uri, id: id.into() }
-    }
-
-    pub(super) fn add_headers<B>(&self, req: RequestBuilder<B>) -> RequestBuilder<B> {
-        req.header("Sharry-Alias", &self.id)
-    }
-
-    pub fn create_share(&self, http: &Agent, data: &NewShareRequest) -> Result<Share, ureq::Error> {
-        let endpoint = self.uri.get_endpoint("alias/upload/new");
-
-        let res = self
-            .add_headers(http.post(endpoint))
-            .send_json(data)?
-            .body_mut()
-            .read_json::<NewShareResponse>()?;
-
-        debug!("response: {:?}", res);
-
-        if !(res.success && (res.message == "Share created.")) {
-            return Err(ureq::Error::Other("unexpected response json".into()));
-        }
-
-        Ok(Share::new(self, res.id))
+    pub fn new(api_uri: URI, id: impl Into<String>) -> Self {
+        Self {
+            api_uri: api_uri.into(),
+            id: id.into(),
+        }
+    }
+
+    pub(super) fn get_endpoint(&self, endpoint: impl Display + Debug) -> String {
+        let uri = format!("{}/{}", self.api_uri, endpoint);
+        debug!("endpoint uri: {:?}", uri);
+
+        uri
     }
 }

src/sharry/api.rs

@@ -1,31 +1,28 @@
-use std::fmt::Display;
-
-use log::debug;
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug)]
 pub struct URI {
     protocol: String,
     base_url: String,
 }
 
 impl URI {
-    pub fn new_protocol(base_url: impl Into<String>, protocol: impl Into<String>) -> Self {
+    pub fn with_protocol(protocol: impl Into<String>, base_url: impl Into<String>) -> Self {
         Self {
             protocol: protocol.into(),
             base_url: base_url.into(),
         }
     }
-
-    pub fn new(base_url: impl Into<String>) -> Self {
-        Self::new_protocol(base_url, "https")
 }
 
-    pub(super) fn get_endpoint(&self, endpoint: impl Display) -> String {
-        let uri = format!("{}://{}/api/v2/{}", self.protocol, self.base_url, endpoint);
-        debug!("uri: {:?}", uri);
+impl From<&str> for URI {
+    fn from(value: &str) -> Self {
+        Self::with_protocol("https", value)
+    }
+}
 
-        uri
+impl Into<String> for URI {
+    fn into(self) -> String {
+        format!("{}://{}/api/v2", self.protocol, self.base_url)
     }
 }
 

src/sharry/mod.rs

@@ -4,3 +4,4 @@ mod share;
 
 pub use alias::Alias;
 pub use api::{NewShareRequest, URI};
+pub use share::Share;

src/sharry/share.rs

@@ -1,81 +1,47 @@
-use log::debug;
-use std::{ffi::OsStr, fs, path::Path};
-use ureq::{Agent, http::StatusCode};
+use log::{debug, warn};
 
-use super::{alias::Alias, api};
-use api::NotifyShareResponse;
+use super::{
+    alias::{Alias, SharryAlias},
+    api::{NewShareRequest, NewShareResponse, NotifyShareResponse},
+};
 
 #[derive(Debug)]
 pub struct Share<'t> {
-    alias: &'t Alias,
-    id: String,
+    pub(super) alias: &'t Alias,
+    pub(super) id: String,
 }
 
 impl<'t> Share<'t> {
-    pub(super) fn new(alias: &'t Alias, id: String) -> Self {
-        Self { alias, id }
+    pub fn create(
+        http: &ureq::Agent,
+        alias: &'t Alias,
+        data: NewShareRequest,
+    ) -> Result<Self, ureq::Error> {
+        let res = http
+            .post(alias.get_endpoint("alias/upload/new"))
+            .sharry_header(alias)
+            .send_json(data)?
+            .body_mut()
+            .read_json::<NewShareResponse>()?;
+
+        debug!("response: {:?}", res);
+
+        if !(res.success && (res.message == "Share created.")) {
+            warn!("unexpected json response");
+            return Err(ureq::Error::Other("unexpected json response".into()));
         }
 
-    pub fn create_file(
-        &self,
-        http: &Agent,
-        path: impl AsRef<OsStr> + AsRef<Path>,
-    ) -> Result<(), ureq::Error> {
-        let filename = Path::new(&path)
-            .file_name()
-            .and_then(OsStr::to_str)
-            .unwrap_or("file.bin");
-
-        let size = fs::metadata(&path)?.len();
-
-        let endpoint = self
-            .alias
-            .uri
-            .get_endpoint(&format!("alias/upload/{}/files/tus", &self.id));
-
-        let res = self
-            .alias
-            .add_headers(http.post(endpoint))
-            .header("Sharry-File-Name", filename)
-            // .header("Sharry-File-Type", "application/octet-stream")
-            // .header("Sharry-File-Length", size)
-            // .header("Tus-Resumable", "1.0.0")
-            .header("Upload-Length", size)
-            .send_empty()?;
-
-        if res.status() != StatusCode::CREATED {
-            return Err(ureq::Error::Other("unexpected response status".into()));
-        }
-
-        let location = res
-            .headers()
-            .get("Location")
-            .ok_or_else(|| ureq::Error::Other("Location header not found".into()))?
-            .to_str()
-            .map_err(|_| ureq::Error::Other("Location header invalid".into()))?;
-
-        debug!("location: {}", location);
-
-        // let start = 10;
-        // let count = 10;
-
-        // let mut f = File::open(path)?;
-        // f.seek(SeekFrom::Start(0));
-        // let mut buf = vec![0; count];
-        // f.read_exact(&mut buf)?;
-
-        Ok(())
+        Ok(Self { alias, id: res.id })
     }
 
     pub fn notify(&self, http: &ureq::Agent) -> Result<(), ureq::Error> {
         let endpoint = self
             .alias
-            .uri
-            .get_endpoint(&format!("alias/mail/notify/{}", &self.id));
+            .get_endpoint(format!("alias/mail/notify/{}", self.id));
 
-        let res = self
-            .alias
-            .add_headers(http.post(endpoint))
+        let res = http
+            .post(endpoint)
+            .sharry_header(self.alias)
             .send_empty()?
             .body_mut()
             .read_json::<NotifyShareResponse>()?;