chore: removed old files
This commit is contained in:
parent
eaaf6f65e0
commit
2dd2e6e0ec
GPG key ID:
A4895B84D311642C
3 changed files with 0 additions and 274 deletions
|
|
@ -1,11 +0,0 @@
|
|||
use clap::Subcommand;
|
||||
|
||||
use crate::proto::{Header, Item, Request};
|
||||
|
||||
|
||||
impl PostWomanActions {
|
||||
pub async fn build(&self) -> Item {
|
||||
match self {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
use std::str::FromStr;
|
||||
use postman_collection::v2_1_0::{Spec, RequestClass, Items, Url, UrlClass, HeaderUnion, Body};
|
||||
|
||||
pub fn collect(collection: Spec) -> Vec<RequestClass> {
|
||||
let mut reqs = Vec::new();
|
||||
for item in collection.item {
|
||||
reqs.append(&mut requests(item)); // TODO creating all these vectors is a waste!
|
||||
}
|
||||
reqs
|
||||
}
|
||||
|
||||
pub fn requests(root: Items) -> Vec<RequestClass> {
|
||||
let mut reqs = Vec::new();
|
||||
|
||||
if let Some(r) = root.request {
|
||||
match r {
|
||||
postman_collection::v2_1_0::RequestUnion::RequestClass(x) => reqs.push(x),
|
||||
postman_collection::v2_1_0::RequestUnion::String(url) => reqs.push(
|
||||
RequestClass {
|
||||
method: Some("GET".into()),
|
||||
url: Some(Url::String(url)),
|
||||
auth: None,
|
||||
body: None,
|
||||
certificate: None,
|
||||
description: None,
|
||||
header: None,
|
||||
proxy: None,
|
||||
}
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(items) = root.item {
|
||||
for item in items {
|
||||
reqs.append(&mut requests(item));
|
||||
}
|
||||
}
|
||||
|
||||
reqs
|
||||
}
|
||||
|
||||
pub fn url(req: &RequestClass) -> String {
|
||||
let mut base_url = match &req.url {
|
||||
Some(Url::String(x)) => x.clone(),
|
||||
Some(Url::UrlClass(UrlClass { raw: Some(raw) , .. })) => raw.clone(),
|
||||
// TODO compose UrlClass
|
||||
_ => "".into(),
|
||||
};
|
||||
|
||||
for (k, v) in std::env::vars() {
|
||||
let key = format!("{{{{{}}}}}", k);
|
||||
if base_url.contains(&key) {
|
||||
base_url = base_url.replace(&key, &v);
|
||||
}
|
||||
}
|
||||
|
||||
base_url
|
||||
}
|
||||
|
||||
pub async fn send(req: RequestClass) -> reqwest::Result<reqwest::Response> {
|
||||
let method = reqwest::Method::from_bytes(
|
||||
&req.method.as_ref().unwrap_or(&"GET".into()).as_bytes() // TODO lol?
|
||||
).unwrap_or(reqwest::Method::GET); // TODO throw an error rather than replacing it silently
|
||||
|
||||
let url = reqwest::Url::from_str(&url(&req)).unwrap();
|
||||
|
||||
let mut out = reqwest::Client::new().request(method, url);
|
||||
|
||||
match req.header {
|
||||
Some(HeaderUnion::HeaderArray(x)) => {
|
||||
for h in x {
|
||||
out = out.header(h.key, h.value);
|
||||
}
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
|
||||
match req.body {
|
||||
Some(Body { raw: Some(x), .. }) => {
|
||||
out = out.body(x)
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
|
||||
out.send().await
|
||||
}
|
||||
177
src/proto.rs
177
src/proto.rs
|
|
@ -1,177 +0,0 @@
|
|||
use serde::{Serialize, Deserialize};
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct PostWomanCollection {
|
||||
pub variables: Vec<String>, // TODO these sure aren't just strings for sure...
|
||||
pub info: CollectionInfo,
|
||||
pub item: Vec<Item>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct CollectionInfo {
|
||||
pub name: String,
|
||||
pub description: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Item {
|
||||
pub name: String,
|
||||
pub event: Option<Vec<Event>>,
|
||||
pub request: Option<Request>,
|
||||
pub response: Option<Vec<Response>>,
|
||||
pub item: Option<Vec<Item>>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Response {
|
||||
pub name: String,
|
||||
pub code: u16,
|
||||
pub header: String,
|
||||
// pub cookie: Vec<String>,
|
||||
pub body: Body,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Event {
|
||||
pub listen: String,
|
||||
pub script: Script,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Script {
|
||||
pub r#type: String,
|
||||
pub exec: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
#[serde(untagged)]
|
||||
pub enum Request {
|
||||
Object {
|
||||
url: Url,
|
||||
method: String,
|
||||
header: Option<Vec<Header>>,
|
||||
body: Option<Body>,
|
||||
description: Option<String>,
|
||||
},
|
||||
String(String),
|
||||
}
|
||||
|
||||
impl ToString for Request {
|
||||
fn to_string(&self) -> String {
|
||||
match self {
|
||||
Self::String(x) => x.clone(),
|
||||
Self::Object {
|
||||
url,
|
||||
method: _, header: _, body: _, description: _
|
||||
} => url.to_string(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Header {
|
||||
pub key: String,
|
||||
pub value: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Query {
|
||||
pub key: String,
|
||||
pub value: String,
|
||||
pub equals: bool,
|
||||
pub description: Option<String>,
|
||||
}
|
||||
|
||||
impl ToString for Query {
|
||||
fn to_string(&self) -> String {
|
||||
format!("{}={}", self.key, self.value)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
#[serde(untagged)]
|
||||
pub enum Body {
|
||||
Object(serde_json::Value),
|
||||
String(String),
|
||||
}
|
||||
|
||||
impl ToString for Body {
|
||||
fn to_string(&self) -> String {
|
||||
match self {
|
||||
Body::Object(v) => serde_json::to_string(v).unwrap(),
|
||||
Body::String(s) => s.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
#[serde(untagged)]
|
||||
pub enum Url {
|
||||
Object {
|
||||
raw: Option<String>,
|
||||
protocol: String,
|
||||
host: Vec<String>,
|
||||
path: Vec<String>,
|
||||
query: Option<Vec<Query>>,
|
||||
variable: Option<Vec<String>>, // TODO surely aren't just strings
|
||||
},
|
||||
String(String),
|
||||
}
|
||||
|
||||
impl ToString for Url {
|
||||
fn to_string(&self) -> String {
|
||||
match self {
|
||||
Url::String(s) => s.clone(),
|
||||
Url::Object {
|
||||
raw, protocol,
|
||||
host,path, query,
|
||||
variable: _
|
||||
} => {
|
||||
match &raw {
|
||||
Some(s) => s.clone(),
|
||||
None => {
|
||||
let mut url = String::new();
|
||||
url.push_str(&protocol);
|
||||
url.push_str("://");
|
||||
url.push_str(&host.join("."));
|
||||
url.push_str("/");
|
||||
url.push_str(&path.join("/"));
|
||||
|
||||
if let Some(query) = &query {
|
||||
url.push_str("?");
|
||||
let q : Vec<String> = query.iter().map(|x| x.to_string()).collect();
|
||||
url.push_str(&q.join("&"));
|
||||
}
|
||||
|
||||
url
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// barebones custom error
|
||||
|
||||
// #[derive(Debug, Clone)]
|
||||
// pub struct PostWomanError {
|
||||
// msg : String,
|
||||
// }
|
||||
//
|
||||
// impl PostWomanError {
|
||||
// pub fn throw(msg: impl ToString) -> Box<dyn std::error::Error> {
|
||||
// Box::new(
|
||||
// PostWomanError {
|
||||
// msg: msg.to_string(),
|
||||
// }
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// impl std::fmt::Display for PostWomanError {
|
||||
// fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
// write!(f, "PostWomanError({})", self.msg)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// impl std::error::Error for PostWomanError {}
|
||||
Loading…
Reference in a new issue