aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client.rs104
-rw-r--r--src/error.rs38
-rw-r--r--src/item.rs40
-rw-r--r--src/lib.rs128
4 files changed, 187 insertions, 123 deletions
diff --git a/src/client.rs b/src/client.rs
new file mode 100644
index 0000000..2459f64
--- /dev/null
+++ b/src/client.rs
@@ -0,0 +1,104 @@
+// zotapi - Rust wrapper for Sot API as implemented by Hubzilla
+// Copyright (C) 2018 Harald Eilertsen <haraldei@anduin.net>
+//
+// 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.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use error::Error;
+use item::ItemBuilder;
+use reqwest::{
+ self,
+ header::{Accept, ContentType, qitem},
+ mime,
+ StatusCode,
+};
+use serde::Serialize;
+use std::io::Read;
+
+pub const ZOTAPI_CHANNEL_STREAM_PATH : &str = "/api/z/1.0/channel/stream";
+pub const ZOTAPI_NETWORK_STREAM_PATH : &str = "/api/z/1.0/network/stream";
+pub const ZOTAPI_ITEM_UPDATE_PATH : &str = "/api/z/1.0/item/update";
+
+pub struct Client {
+ inner: reqwest::Client,
+ base_url: String,
+ user: String,
+ pw: String,
+}
+
+impl Client {
+ pub fn new(url: &str, user: &str, pw: &str) -> Client {
+ Client {
+ inner: reqwest::Client::new(),
+ base_url: String::from(url),
+ user: String::from(user),
+ pw: String::from(pw),
+ }
+ }
+
+ pub fn channel_stream(&self) -> Result<String, Error> {
+ self.fetch_stream(ZOTAPI_CHANNEL_STREAM_PATH)
+ }
+
+ pub fn network_stream(&self) -> Result<String, Error> {
+ self.fetch_stream(ZOTAPI_NETWORK_STREAM_PATH)
+ }
+
+ pub fn item(&self) -> ItemBuilder {
+ ItemBuilder::new(self)
+ }
+
+ fn url(&self, path: &str) -> String {
+ self.base_url.clone() + path
+ }
+
+ fn fetch_stream(&self, path: &str) -> Result<String, Error> {
+ let url = self.url(path);
+ let mut res = self.inner.get(&url)
+ .header(Accept(vec![qitem(mime::APPLICATION_JSON)]))
+ .basic_auth(self.user.clone(), Some(self.pw.clone()))
+ .send()?;
+
+ match res.status() {
+ StatusCode::Unauthorized => Err(Error::Unauthorized),
+ StatusCode::Ok => {
+ let mut body = String::new();
+ res.read_to_string(&mut body)?;
+ Ok(body)
+ },
+ _ => Err(Error::Unknown)
+ }
+ }
+
+ pub fn post_data<T>(&self, path: &str, data: &T) -> Result<String, Error>
+ where T: Serialize,
+ {
+ let url = self.url(path);
+ let mut res = self.inner.post(&url)
+ .header(Accept(vec![qitem(mime::APPLICATION_JSON)]))
+ .header(ContentType::form_url_encoded())
+ .basic_auth(self.user.clone(), Some(self.pw.clone()))
+ .form(&data)
+ .send()?;
+
+ match res.status() {
+ StatusCode::Unauthorized => Err(Error::Unauthorized),
+ StatusCode::Ok => {
+ let mut body = String::new();
+ res.read_to_string(&mut body)?;
+ Ok(body)
+ },
+ _ => Err(Error::Unknown)
+ }
+ }
+}
diff --git a/src/error.rs b/src/error.rs
new file mode 100644
index 0000000..d4f6b96
--- /dev/null
+++ b/src/error.rs
@@ -0,0 +1,38 @@
+// zotapi - Rust wrapper for Sot API as implemented by Hubzilla
+// Copyright (C) 2018 Harald Eilertsen <haraldei@anduin.net>
+//
+// 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.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use reqwest;
+use std;
+
+#[derive(Debug)]
+pub enum Error {
+ Http(reqwest::Error),
+ Io(std::io::Error),
+ Unauthorized,
+ Unknown,
+}
+
+impl From<reqwest::Error> for Error {
+ fn from(e: reqwest::Error) -> Error {
+ Error::Http(e)
+ }
+}
+
+impl From<std::io::Error> for Error {
+ fn from(e: std::io::Error) -> Error {
+ Error::Io(e)
+ }
+}
diff --git a/src/item.rs b/src/item.rs
new file mode 100644
index 0000000..7fb751d
--- /dev/null
+++ b/src/item.rs
@@ -0,0 +1,40 @@
+// zotapi - Rust wrapper for Sot API as implemented by Hubzilla
+// Copyright (C) 2018 Harald Eilertsen <haraldei@anduin.net>
+//
+// 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.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use client::{self, Client};
+use error::Error;
+
+pub struct ItemBuilder<'a> {
+ client : &'a Client,
+ body: &'a str,
+}
+
+impl<'a> ItemBuilder<'a> {
+ pub fn new(client: &'a Client) -> ItemBuilder<'a> {
+ ItemBuilder {
+ client: client,
+ body: "",
+ }
+ }
+ pub fn body(&mut self, text: &'a str) -> &mut ItemBuilder<'a> {
+ self.body = text;
+ self
+ }
+
+ pub fn create(&self) -> Result<String, Error> {
+ self.client.post_data(client::ZOTAPI_ITEM_UPDATE_PATH, &[("body", self.body)])
+ }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 0ebc364..43ae727 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,133 +17,15 @@
extern crate reqwest;
extern crate serde;
-use reqwest::{
- header::{Accept, ContentType, qitem},
- mime,
- StatusCode,
-};
-use serde::Serialize;
-use std::io::Read;
+mod client;
+mod error;
+mod item;
-const ZOTAPI_CHANNEL_STREAM_PATH : &str = "/api/z/1.0/channel/stream";
-const ZOTAPI_NETWORK_STREAM_PATH : &str = "/api/z/1.0/network/stream";
-const ZOTAPI_ITEM_UPDATE_PATH : &str = "/api/z/1.0/item/update";
-
-#[derive(Debug)]
-pub enum Error {
- Http(reqwest::Error),
- Io(std::io::Error),
- Unauthorized,
- Unknown,
-}
-
-impl From<reqwest::Error> for Error {
- fn from(e: reqwest::Error) -> Error {
- Error::Http(e)
- }
-}
-
-impl From<std::io::Error> for Error {
- fn from(e: std::io::Error) -> Error {
- Error::Io(e)
- }
-}
-
-pub struct ItemBuilder<'a> {
- client : &'a Client,
- body: &'a str,
-}
-
-impl<'a> ItemBuilder<'a> {
- fn new(client: &'a Client) -> ItemBuilder<'a> {
- ItemBuilder {
- client: client,
- body: "",
- }
- }
- pub fn body(&mut self, text: &'a str) -> &mut ItemBuilder<'a> {
- self.body = text;
- self
- }
-
- pub fn create(&self) -> Result<String, Error> {
- self.client.post_data(ZOTAPI_ITEM_UPDATE_PATH, &[("body", self.body)])
- }
-}
-
-pub struct Client {
- inner: reqwest::Client,
- base_url: String,
- user: String,
- pw: String,
-}
-
-impl Client {
- pub fn channel_stream(&self) -> Result<String, Error> {
- self.fetch_stream(ZOTAPI_CHANNEL_STREAM_PATH)
- }
-
- pub fn network_stream(&self) -> Result<String, Error> {
- self.fetch_stream(ZOTAPI_NETWORK_STREAM_PATH)
- }
-
- pub fn item(&self) -> ItemBuilder {
- ItemBuilder::new(self)
- }
-
- fn url(&self, path: &str) -> String {
- self.base_url.clone() + path
- }
-
- fn fetch_stream(&self, path: &str) -> Result<String, Error> {
- let url = self.url(path);
- let mut res = self.inner.get(&url)
- .header(Accept(vec![qitem(mime::APPLICATION_JSON)]))
- .basic_auth(self.user.clone(), Some(self.pw.clone()))
- .send()?;
-
- match res.status() {
- StatusCode::Unauthorized => Err(Error::Unauthorized),
- StatusCode::Ok => {
- let mut body = String::new();
- res.read_to_string(&mut body)?;
- Ok(body)
- },
- _ => Err(Error::Unknown)
- }
- }
-
- fn post_data<T>(&self, path: &str, data: &T) -> Result<String, Error>
- where T: Serialize,
- {
- let url = self.url(path);
- let mut res = self.inner.post(&url)
- .header(Accept(vec![qitem(mime::APPLICATION_JSON)]))
- .header(ContentType::form_url_encoded())
- .basic_auth(self.user.clone(), Some(self.pw.clone()))
- .form(&data)
- .send()?;
-
- match res.status() {
- StatusCode::Unauthorized => Err(Error::Unauthorized),
- StatusCode::Ok => {
- let mut body = String::new();
- res.read_to_string(&mut body)?;
- Ok(body)
- },
- _ => Err(Error::Unknown)
- }
- }
-}
+use client::Client;
pub fn client(url: &str, user: &str, pw: &str) -> Client
{
- Client {
- inner: reqwest::Client::new(),
- base_url: String::from(url),
- user: String::from(user),
- pw: String::from(pw),
- }
+ Client::new(url, user, pw)
}
#[cfg(test)]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:56:16 +0000