summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.toml2
-rw-r--r--src/configuration.rs2
-rw-r--r--src/main.rs44
-rw-r--r--src/repository/client.rs18
-rw-r--r--src/repository/mod.rs48
-rw-r--r--src/repository/profile.rs2
-rw-r--r--src/state.rs4
-rw-r--r--src/types/block.rs4
-rw-r--r--src/types/content.rs8
-rw-r--r--src/version.rs4
10 files changed, 69 insertions, 67 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 1853f49..e3853c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,8 @@ documentation = "https://docs.rs/distrox"
repository = "https://github.com/matthiasbeyer/distrox"
homepage = "http://github.com/matthiasbeyer/distrox"
+edition = "2018"
+
[dependencies]
is-match = "0.1"
failure = "0.1"
diff --git a/src/configuration.rs b/src/configuration.rs
index b6dc879..d0ea012 100644
--- a/src/configuration.rs
+++ b/src/configuration.rs
@@ -1,4 +1,4 @@
-use types::util::MimeType;
+use crate::types::util::MimeType;
// use chrono::Duration;
diff --git a/src/main.rs b/src/main.rs
index f673081..d8d0af3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -34,16 +34,16 @@ use futures::future::Future;
use serde_json::to_string_pretty as serde_json_to_string_pretty;
use serde_json::from_str as serde_json_from_str;
-use configuration::Configuration;
-use repository::Repository;
-use types::block::Block;
-use types::content::Content;
-use types::content::Payload;
-use types::util::IPFSHash;
-use types::util::IPNSHash;
-use types::util::MimeType;
-use types::util::Timestamp;
-use types::util::Version;
+use crate::configuration::Configuration;
+use crate::repository::Repository;
+use crate::types::block::Block;
+use crate::types::content::Content;
+use crate::types::content::Payload;
+use crate::types::util::IPFSHash;
+use crate::types::util::IPNSHash;
+use crate::types::util::MimeType;
+use crate::types::util::Timestamp;
+use crate::types::util::Version;
use std::process::exit;
@@ -623,7 +623,7 @@ fn main() {
("create-attached-post-comments-blob", Some(mtch)) => {
debug!("Calling: create-attached-post-comments-blob");
- let (config, repo) = boot();
+ let (_config, repo) = boot();
let content = {
let devices = mtch.values_of("device").unwrap(); // safe by clap
@@ -671,7 +671,7 @@ fn main() {
("create-profile-blob", Some(mtch)) => {
debug!("Calling: create-profile-blob");
- let (config, repo) = boot();
+ let (_config, repo) = boot();
let content = {
let devices = mtch.values_of("device").unwrap(); // safe by clap
@@ -725,7 +725,7 @@ fn main() {
("create-block-blob", Some(mtch)) => {
debug!("Calling: create-block-blob");
- let (config, repo) = boot();
+ let (_config, repo) = boot();
let block = {
let version = usize::from_str(mtch.value_of("version").unwrap()) // safe by clap
@@ -759,7 +759,7 @@ fn main() {
("create-profile", Some(mtch)) => {
debug!("Calling: create-profile");
- let (config, repo) = boot();
+ let (_config, repo) = boot();
let name = mtch.value_of("name").map(String::from).unwrap(); // safe by clap
let keyname = format!("distrox-{}", name);
@@ -786,10 +786,10 @@ fn main() {
},
("post", Some(mtch)) => {
- use repository::ProfileName;
+ use crate::repository::ProfileName;
debug!("Calling: post");
- let (config, repo) = boot();
+ let (_config, repo) = boot();
let repo = Arc::new(repo);
let publish_key_name = mtch
.value_of("profile-name")
@@ -811,7 +811,7 @@ fn main() {
let time = ::chrono::offset::Local::now().naive_local();
- let repo2 = repo.clone();
+ let _repo2 = repo.clone();
hyper::rt::run({
repo.clone()
@@ -831,10 +831,10 @@ fn main() {
},
("publish", Some(mtch)) => {
- use repository::ProfileName;
+ use crate::repository::ProfileName;
debug!("Calling: publish");
- let (config, repo) = boot();
+ let (_config, repo) = boot();
let repo = Arc::new(repo);
let publish_key_name = mtch
.value_of("profile_name")
@@ -847,7 +847,7 @@ fn main() {
.map(IPFSHash::from)
.unwrap(); // safe by clap
- let repo2 = repo.clone();
+ let _repo2 = repo.clone();
hyper::rt::run({
repo.clone()
@@ -864,10 +864,10 @@ fn main() {
},
("get-profile-state", Some(mtch)) => {
- use repository::ProfileName;
+ use crate::repository::ProfileName;
debug!("Calling: get-profile-state");
- let (config, repo) = boot();
+ let (_config, repo) = boot();
let repo = Arc::new(repo);
let publish_key_name = mtch
.value_of("profile_name")
diff --git a/src/repository/client.rs b/src/repository/client.rs
index 55ba7c0..005a33c 100644
--- a/src/repository/client.rs
+++ b/src/repository/client.rs
@@ -13,14 +13,14 @@ use serde_json::to_string as serde_json_to_str;
use chrono::NaiveDateTime;
use itertools::Itertools;
-use types::block::Block;
-use types::content::Content;
-use types::content::Payload;
-use types::util::IPFSHash;
-use types::util::IPNSHash;
-use types::util::Timestamp;
-use repository::{ProfileName, ProfileKey};
-use version::protocol_version;
+use crate::types::block::Block;
+use crate::types::content::Content;
+use crate::types::content::Payload;
+use crate::types::util::IPFSHash;
+use crate::types::util::IPNSHash;
+use crate::types::util::Timestamp;
+use crate::repository::{ProfileName, ProfileKey};
+use crate::version::protocol_version;
pub fn deref_ipns_hash(client: Arc<IpfsClient>,
hash: &IPNSHash)
@@ -252,7 +252,7 @@ pub fn new_profile(client: Arc<IpfsClient>,
}
pub fn new_text_post(client: Arc<IpfsClient>,
- publish_key_id: ProfileKey,
+ _publish_key_id: ProfileKey,
parent_blocks: Vec<IPFSHash>,
text: String,
time: Option<NaiveDateTime>)
diff --git a/src/repository/mod.rs b/src/repository/mod.rs
index 56bee33..b1fc2f3 100644
--- a/src/repository/mod.rs
+++ b/src/repository/mod.rs
@@ -13,17 +13,17 @@ use failure::Error;
use failure::err_msg;
use futures::future::Future;
use futures::stream::Stream;
-use serde_json::from_str as serde_json_from_str;
+
use serde_json::to_string as serde_json_to_str;
use serde::Serialize;
use chrono::NaiveDateTime;
-use types::block::Block;
-use types::content::Content;
-use types::content::Payload;
-use types::util::IPFSHash;
-use types::util::IPNSHash;
-use version::protocol_version;
+use crate::types::block::Block;
+use crate::types::content::Content;
+use crate::types::content::Payload;
+use crate::types::util::IPFSHash;
+use crate::types::util::IPNSHash;
+
// use repository::iter::BlockIter;
// use repository::profile::Profile;
@@ -76,7 +76,7 @@ impl Repository {
-> impl Future<Item = Vec<u8>, Error = Error>
{
debug!("Resolving plain: {}", hash);
- ::repository::client::resolve_plain(self.client.clone(), hash)
+ crate::repository::client::resolve_plain(self.client.clone(), hash)
}
/// Gets a types::Block from a hash or fails
@@ -84,14 +84,14 @@ impl Repository {
-> impl Future<Item = Block, Error = Error>
{
debug!("Resolving block: {}", hash);
- ::repository::client::resolve_block(self.client.clone(), hash)
+ crate::repository::client::resolve_block(self.client.clone(), hash)
}
pub fn resolve_latest_block(&self, hash: &IPNSHash)
-> impl Future<Item = Block, Error = Error>
{
debug!("Resolving latest block: {}", hash);
- ::repository::client::resolve_latest_block(self.client.clone(), hash)
+ crate::repository::client::resolve_latest_block(self.client.clone(), hash)
}
/// Gets a types::Content from a hash or fails
@@ -99,7 +99,7 @@ impl Repository {
-> impl Future<Item = Content, Error = Error>
{
debug!("Resolving content: {}", hash);
- ::repository::client::resolve_content(self.client.clone(), hash)
+ crate::repository::client::resolve_content(self.client.clone(), hash)
}
/// Helper over Self::resolve_content() which ensures that the Content payload is None
@@ -108,7 +108,7 @@ impl Repository {
-> impl Future<Item = Content, Error = Error>
{
debug!("Resolving content (none): {}", hash);
- ::repository::client::resolve_content_none(self.client.clone(), hash)
+ crate::repository::client::resolve_content_none(self.client.clone(), hash)
}
/// Helper over Self::resolve_content() which ensures that the Content payload is Post
@@ -117,7 +117,7 @@ impl Repository {
-> impl Future<Item = Content, Error = Error>
{
debug!("Resolving content (post): {}", hash);
- ::repository::client::resolve_content_post(self.client.clone(), hash)
+ crate::repository::client::resolve_content_post(self.client.clone(), hash)
}
/// Helper over Self::resolve_content() which ensures that the Content payload is AttachedPostComments
@@ -126,7 +126,7 @@ impl Repository {
-> impl Future<Item = Content, Error = Error>
{
debug!("Resolving content (attached post comments): {}", hash);
- ::repository::client::resolve_content_attached_post_comments(self.client.clone(), hash)
+ crate::repository::client::resolve_content_attached_post_comments(self.client.clone(), hash)
}
/// Helper over Self::resolve_content() which ensures that the Content payload is Profile
@@ -135,7 +135,7 @@ impl Repository {
-> impl Future<Item = Content, Error = Error>
{
debug!("Resolving content (profile): {}", hash);
- ::repository::client::resolve_content_profile(self.client.clone(), hash)
+ crate::repository::client::resolve_content_profile(self.client.clone(), hash)
}
@@ -147,7 +147,7 @@ impl Repository {
-> impl Future<Item = IPFSHash, Error = Error>
{
debug!("Putting plain");
- ::repository::client::put_plain(self.client.clone(), data)
+ crate::repository::client::put_plain(self.client.clone(), data)
}
fn put_serialized<'a, S>(&'a self, s: &'a S)
@@ -172,14 +172,14 @@ impl Repository {
-> impl Future<Item = IPFSHash, Error = Error>
{
debug!("Putting block: {:?}", block);
- ::repository::client::put_block(self.client.clone(), block)
+ crate::repository::client::put_block(self.client.clone(), block)
}
pub fn put_content<'a>(&'a self, content: &'a Content)
-> impl Future<Item = IPFSHash, Error = Error>
{
debug!("Putting content: {:?}", content);
- ::repository::client::put_content(self.client.clone(), content)
+ crate::repository::client::put_content(self.client.clone(), content)
}
/// The default lifetime for name publishing (profile announcements)
@@ -212,7 +212,7 @@ impl Repository {
{
debug!("Announcing profile: key: {key:?}, state: {state:?}, lifetime: {lifetime:?}, ttl: {ttl:?}",
key = key, state = state, lifetime = lifetime, ttl = ttl);
- ::repository::client::announce_block(self.client.clone(), key, state, lifetime, ttl)
+ crate::repository::client::announce_block(self.client.clone(), key, state, lifetime, ttl)
}
pub fn new_profile<'a>(&'a self,
@@ -222,7 +222,7 @@ impl Repository {
ttl: Option<String>)
-> impl Future<Item = (ProfileName, ProfileKey), Error = Error>
{
- use ipfs_api::KeyType;
+
debug!("Creating new profile: key: {key:?}, profile: {profile:?}, lifetime: {lifetime:?}, ttl: {ttl:?}",
key = keyname, profile = profile, lifetime = lifetime, ttl = ttl);
@@ -233,7 +233,7 @@ impl Repository {
}
let client = self.client.clone();
- let result = ::repository::client::new_profile(client, keyname, profile, lifetime, ttl);
+ let result = crate::repository::client::new_profile(client, keyname, profile, lifetime, ttl);
::futures::future::Either::A(result)
}
@@ -246,7 +246,7 @@ impl Repository {
-> impl Future<Item = IPFSHash, Error = Error>
{
debug!("New text post under {:?}, after blocks {:?}", publish_key_id, parent_blocks);
- ::repository::client::new_text_post(self.client.clone(),
+ crate::repository::client::new_text_post(self.client.clone(),
publish_key_id,
parent_blocks,
text,
@@ -256,13 +256,13 @@ impl Repository {
pub fn get_key_id_from_key_name<'a>(&'a self, name: ProfileName)
-> impl Future<Item = ProfileKey, Error = Error>
{
- ::repository::client::get_key_id_from_key_name(self.client.clone(), name)
+ crate::repository::client::get_key_id_from_key_name(self.client.clone(), name)
}
pub fn deref_ipns_hash<'a>(&'a self, hash: &IPNSHash)
-> impl Future<Item = IPFSHash, Error = Error>
{
- ::repository::client::deref_ipns_hash(self.client.clone(), hash)
+ crate::repository::client::deref_ipns_hash(self.client.clone(), hash)
}
}
diff --git a/src/repository/profile.rs b/src/repository/profile.rs
index 7bbcfa2..9d27280 100644
--- a/src/repository/profile.rs
+++ b/src/repository/profile.rs
@@ -4,7 +4,7 @@ use std::collections::LinkedList;
//use failure::Error;
// use repository::Repository;
-use types::block::Block;
+use crate::types::block::Block;
// use types::content::Payload;
// use types::content::Content;
// use types::util::IPFSHash;
diff --git a/src/state.rs b/src/state.rs
index 723c8c1..46661b1 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -1,7 +1,7 @@
use std::collections::HashMap;
-use types::util::IPFSHash;
-use types::util::IPNSHash;
+use crate::types::util::IPFSHash;
+use crate::types::util::IPNSHash;
/// TODO: Use rustbreak for persistence layer
#[derive(Serialize, Deserialize, Debug)]
diff --git a/src/types/block.rs b/src/types/block.rs
index f9631c9..b044150 100644
--- a/src/types/block.rs
+++ b/src/types/block.rs
@@ -1,5 +1,5 @@
-use types::util::IPFSHash;
-use types::util::Version;
+use crate::types::util::IPFSHash;
+use crate::types::util::Version;
#[derive(Serialize, Deserialize, Debug)]
pub struct Block {
diff --git a/src/types/content.rs b/src/types/content.rs
index c306f28..8315804 100644
--- a/src/types/content.rs
+++ b/src/types/content.rs
@@ -1,9 +1,9 @@
use std::collections::BTreeMap;
-use types::util::IPFSHash;
-use types::util::IPNSHash;
-use types::util::MimeType;
-use types::util::Timestamp;
+use crate::types::util::IPFSHash;
+use crate::types::util::IPNSHash;
+use crate::types::util::MimeType;
+use crate::types::util::Timestamp;
#[derive(Serialize, Deserialize, Debug)]
pub struct Content {
diff --git a/src/version.rs b/src/version.rs
index c7bc456..473d425 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1,4 +1,4 @@
-pub fn protocol_version() -> ::types::util::Version {
- ::types::util::Version::from(1)
+pub fn protocol_version() -> crate::types::util::Version {
+ crate::types::util::Version::from(1)
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 20:25:49 +0000