{"header":{"message":"New tests, refactor to be more modular, improve prompt ui, add test run parameter","description":null,"timestamp":"2023-07-13T10:41:25.457315194Z","authors":[{}]},"hash":"FZIABKEV74PFFRFETMT5WVL625I76UYN2LXKIKRZNQE5GDGX3GUQC","authors":[{"login":"CandyCorvid","key":"2nxySdD32H8TtzYpnH4CSW8jXS2rPVRjW8JNU3HGe7JX"}],"deps":{"hashes":[["FZIABKEV74PFFRFETMT5WVL625I76UYN2LXKIKRZNQE5GDGX3GUQC","New tests, refactor to be more modular, improve prompt ui, add test run parameter"],["AA",null],["ARXVO5XAQFZR3X6MXW525Z6WXUYUHRJUGTTNCEKKXRAKQQBG5ZXAC","Make connection generic on the network"],["JWLMAS7UWFXHWBYEBW4YSLPZUF7UFQHAKN3AUF2IAJWVXW46T5PQC","Simplify tests with rstest"],["3SPNKI46URBW4PD3JRMBV5YV5W56N3SFUTK25VQEF2FUZ64ZDQPAC","Improve parsing. Add modules that were missed"],["HVFBGX2A2LBL6HSFKPNIG5KGQPVMZ5GFYJ4ZPDAM4POSRTQSKN7QC","Implement basic text/gemini"],["XGDABCJNB4TBNPPDFFWXWU5NIEEDWB26GOETJMMEVEBWVCF2UWHAC","Add match_str macro"],["ONQEIR5BV26QJSI3HY7B3MN6VWEGSZIXAIUIANJ5ZLR3QN3DFGEAC","WIP mime-type handling"],["OSV63NXNIRGOEJZUECHXYYYEFUAFXLN4BNIH3MKLE7SDZLHGFEWAC","Implement contiguous preformat blocks with alt-text"],["WGRFJRTEXOKY7PV536O62WUE32T24VQEHFQP67GEZZ67AE37ZWUAC","Add tests, rename Status to Header, implement redirect and proper input handling"],["DBKKKHC2ER7XAYR6HAFQ6I75M3OLDOSGCB5BTEP7X6XAZRSWKIRAC","Initial commit"],["AMTMTTJTF2XHEUC6ACP2PHP7GAFMFZRSJ47VJBKEO22X4ZGFIX7QC","Upgrade status parsing"],["AOJXTWBZA2DQBFTJZX2YTGAKIB62SKTEVJ7RRIBJNDSMC75DDQVQC","Refactor read_until"]],"deps":["ARXVO5XAQFZR3X6MXW525Z6WXUYUHRJUGTTNCEKKXRAKQQBG5ZXAC","JWLMAS7UWFXHWBYEBW4YSLPZUF7UFQHAKN3AUF2IAJWVXW46T5PQC"],"known":["DBKKKHC2ER7XAYR6HAFQ6I75M3OLDOSGCB5BTEP7X6XAZRSWKIRAC","AMTMTTJTF2XHEUC6ACP2PHP7GAFMFZRSJ47VJBKEO22X4ZGFIX7QC","3SPNKI46URBW4PD3JRMBV5YV5W56N3SFUTK25VQEF2FUZ64ZDQPAC","ONQEIR5BV26QJSI3HY7B3MN6VWEGSZIXAIUIANJ5ZLR3QN3DFGEAC","AOJXTWBZA2DQBFTJZX2YTGAKIB62SKTEVJ7RRIBJNDSMC75DDQVQC","HVFBGX2A2LBL6HSFKPNIG5KGQPVMZ5GFYJ4ZPDAM4POSRTQSKN7QC","OSV63NXNIRGOEJZUECHXYYYEFUAFXLN4BNIH3MKLE7SDZLHGFEWAC","WGRFJRTEXOKY7PV536O62WUE32T24VQEHFQP67GEZZ67AE37ZWUAC","XGDABCJNB4TBNPPDFFWXWU5NIEEDWB26GOETJMMEVEBWVCF2UWHAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":34},"path":"src/server.rs","line":16,"ins":{"up_context":[{"change":2,"pos":215}],"down_context":[{"change":2,"pos":247}],"flag":"BLOCK","start":0,"end":143,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":215},"to":{"change":2,"start":215,"end":247},"introduced_by":2}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":"pub struct TcpNetwork {"},{"Add":" verifier: V,"},{"Add":"}"},{"Add":""},{"Add":"impl TcpNetwork {"},{"Add":" pub fn new(ver: V) -> Self {"},{"Add":" Self { verifier: ver }"},{"Add":" }"},{"Add":"}"}],"del_contents":[{"Del":"pub struct TcpNetwork(V, !);\n"}]}},{"Edit":{"inode":{"change":4,"pos":459},"path":"src/media.rs","line":7,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":595},"to":{"change":4,"start":595,"end":790},"introduced_by":4}],"inode":{"change":4,"pos":459}}},"contents":[{"Del":"}\nimpl<'a> Media<'a> {\n pub fn display(&self) {\n match self {\n Media::Gemini(g) => println!(\"{g:#?}\"), // TODO\n Media::Text(s) => println!(\"{s}\"),\n }\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":6,"ins":{"up_context":[{"change":4,"pos":40}],"down_context":[{"change":4,"pos":3845}],"flag":"BLOCK","start":144,"end":252,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":31},"to":{"change":4,"start":6831,"end":6915},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":40},"to":{"change":4,"start":6831,"end":6915},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3712},"to":{"change":4,"start":6831,"end":6915},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6915},"to":{"change":2,"start":941,"end":1035},"introduced_by":2}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":""},{"Add":"use server::Network;"},{"Add":"use std::{"},{"Add":" fmt::Display,"},{"Add":" io::{BufReader, Read, Result as ioResult, Write},"},{"Add":"};"}],"del_contents":[{"Del":"use response::header::{CertRequired, FailPerm, FailTemp, Input, Redirect, Success};\n"},{"Del":"use server::{Network, TcpNetwork};\nuse std::io::{BufReader, Read, Result as ioResult, Write};\n"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":21,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":215}],"down_context":[{"change":4,"pos":215}],"flag":"BLOCK","start":253,"end":327,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" use std::{"},{"Add":" fmt::Display,"},{"Add":" io::{stdout, Write},"},{"Add":" };"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":27,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":237}],"down_context":[{"change":4,"pos":237}],"flag":"BLOCK","start":328,"end":416,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" use url::Url;"},{"Add":""},{"Add":" use crate::{danger, media::Media, run, server::TcpNetwork, UI};"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":33,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":280}],"down_context":[{"change":4,"pos":280}],"flag":"BLOCK","start":417,"end":476,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" #[arg(short, long)]"},{"Add":" pub test_prompt: bool,"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":37,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":319}],"down_context":[{"change":4,"pos":319}],"flag":"BLOCK","start":477,"end":2678,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":""},{"Add":" pub enum Error {}"},{"Add":""},{"Add":" impl App {"},{"Add":" pub fn run(self) -> Result<(), Error> {"},{"Add":" let mut cli = Cli {};"},{"Add":" if self.test_prompt {"},{"Add":" let overt = cli.read(\"tell me something\");"},{"Add":" cli.warn(format_args!(\"your response was: {overt}\"));"},{"Add":""},{"Add":" let secret = cli.read_secret(\"tell me your secrets\");"},{"Add":" cli.warn(format_args!(\"your secret was: {secret}\"));"},{"Add":" Ok(())"},{"Add":" } else {"},{"Add":" let url = self.url.unwrap_or_else(|| {"},{"Add":" \"gemini://gemini.circumlunar.space/docs/specification.gmi\".into()"},{"Add":" });"},{"Add":" let url: Url = url.parse().expect(\"Not a valid URL\");"},{"Add":" run::>(&mut cli, url);"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub struct Cli {}"},{"Add":" impl UI for Cli {"},{"Add":" fn show(&self, content: Media) {"},{"Add":" match content {"},{"Add":" Media::Gemini(g) => println!(\"{g:#?}\"), // TODO"},{"Add":" Media::Text(s) => println!(\"{s}\"),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn read(&self, prompt: impl Display) -> String {"},{"Add":" print!(\"{prompt}: \");"},{"Add":" stdout().flush().unwrap();"},{"Add":" std::io::stdin()"},{"Add":" .lines()"},{"Add":" .next()"},{"Add":" .expect(\"End of input\")"},{"Add":" .expect(\"Failed to read input\")"},{"Add":" }"},{"Add":""},{"Add":" fn read_secret(&self, prompt: impl Display) -> String {"},{"Add":" let dim = ansi_term::Style::new().dimmed();"},{"Add":" print!(\"{prompt}: \");"},{"Add":" let hidden = \"(input hidden)\";"},{"Add":" let len = hidden.len() as u32;"},{"Add":" let back = ansi_control_codes::control_sequences::CUB(Some(len));"},{"Add":" print!(\"{}{back}\", dim.paint(hidden));"},{"Add":" stdout().flush().unwrap();"},{"Add":" rpassword::read_password().expect(\"Failed to read input\")"},{"Add":" }"},{"Add":""},{"Add":" fn warn(&self, warning: D) {"},{"Add":" println!(\"Warning: {warning}\")"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub trait UI {"},{"Add":" fn show(&self, content: media::Media);"},{"Add":" fn warn(&self, warning: D);"},{"Add":" fn read(&self, prompt: impl Display) -> String;"},{"Add":" fn read_secret(&self, prompt: impl Display) -> String;"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":108,"ins":{"up_context":[{"change":4,"pos":3977}],"down_context":[{"change":4,"pos":5223}],"flag":"BLOCK","start":2679,"end":2933,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3977},"to":{"change":4,"start":3977,"end":4103},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4103},"to":{"change":4,"start":5116,"end":5178},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5178},"to":{"change":2,"start":1036,"end":1110},"introduced_by":2}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" match cli.run() {"},{"Add":" Ok(()) => println!(\"done\"),"},{"Add":" Err(e) => match e {},"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn run(ui: &mut impl UI, mut url: Url)"},{"Add":"where"},{"Add":" ::Error: std::fmt::Debug,"},{"Add":"{"},{"Add":" while let Some(new_url) = run_url::(ui, url) {"}],"del_contents":[{"Del":" let url = cli\n .url\n .unwrap_or_else(|| \"gemini://gemini.circumlunar.space/docs/specification.gmi\".into());\n"},{"Del":" let mut url: Url = url.parse().expect(\"Not a valid URL\");\n"},{"Del":" while let Some(new_url) = run_url::>(url) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":123,"ins":{"up_context":[{"change":4,"pos":4124}],"down_context":[{"change":2,"pos":1159}],"flag":"BLOCK","start":2934,"end":3000,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4124},"to":{"change":2,"start":1111,"end":1159},"introduced_by":2}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":"fn run_url(ui: &mut impl UI, url: Url) -> Option"}],"del_contents":[{"Del":"fn run_url(url: Url) -> Option\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":135,"ins":{"up_context":[{"change":4,"pos":5339}],"down_context":[{"change":4,"pos":5385}],"flag":"BLOCK","start":3001,"end":3051,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5339},"to":{"change":4,"start":5339,"end":5385},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" handle_response_header(ui, head, url, stream)"}],"del_contents":[{"Del":" handle_response_header(head, url, stream)\n"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":139,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":5415}],"down_context":[{"change":4,"pos":5415}],"flag":"BLOCK","start":3052,"end":3074,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" ui: &mut impl UI,"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":141,"ins":{"up_context":[{"change":4,"pos":5443}],"down_context":[{"change":4,"pos":5488}],"flag":"BLOCK","start":3075,"end":3112,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5443},"to":{"change":4,"start":5443,"end":5488},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" url: Url,"},{"Add":" stream: impl Read,"}],"del_contents":[{"Del":" mut url: Url,\n mut stream: impl Read,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":145,"ins":{"up_context":[{"change":4,"pos":7108}],"down_context":[{"change":4,"pos":5817}],"flag":"BLOCK","start":3113,"end":3178,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7108},"to":{"change":4,"start":5508,"end":5548},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5548},"to":{"change":4,"start":7148,"end":7231},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7148},"to":{"change":4,"start":7148,"end":7231},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7231},"to":{"change":4,"start":5549,"end":5816},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5816},"to":{"change":4,"start":7408,"end":7593},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7408},"to":{"change":4,"start":7408,"end":7593},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" response::Header::Input(s) => handle::input(s, ui, url),"}],"del_contents":[{"Del":" response::Header::Input(s) => {\n"},{"Del":" let Input { prompt, sensitive } = s;\n println!(\"{prompt}\");\n"},{"Del":" let input = if let Some(true) = sensitive {\n // Read sensitive input\n rpassword::read_password()\n } else {\n // Read plain input\n std::io::stdin().lines().next().expect(\"End of input\")\n"},{"Del":" }\n .expect(\"Failed to read input\");\n let input = urlencoding::encode(&input);\n url.set_query(Some(&input));\n Some(url)\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":147,"ins":{"up_context":[{"change":4,"pos":5859}],"down_context":[{"change":4,"pos":7888}],"flag":"BLOCK","start":3179,"end":3223,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":5859},"to":{"change":4,"start":7635,"end":7673},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7635},"to":{"change":4,"start":7635,"end":7673},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7673},"to":{"change":4,"start":81,"end":156},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":156},"to":{"change":4,"start":5860,"end":5904},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5904},"to":{"change":4,"start":7803,"end":7856},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7803},"to":{"change":4,"start":7803,"end":7856},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7856},"to":{"change":4,"start":0,"end":47},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":47},"to":{"change":4,"start":41,"end":92},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7856},"to":{"change":4,"start":41,"end":92},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":92},"to":{"change":4,"start":168,"end":197},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":168},"to":{"change":4,"start":168,"end":197},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" handle::success(s, stream, ui);"}],"del_contents":[{"Del":" let Success { mime } = s;\n"},{"Del":" let body = stream.read_string().expect(\"failed to read body\");\n"},{"Del":" //TODO remove this debug output\n"},{"Del":" println!(\"page is encoded as {mime:?}\");\n"},{"Del":" println!(\"response body: {body}\");\n"},{"Del":" let media = decode_media(mime, &body);\n"},{"Del":" media.display();\n"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":149,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7905},"to":{"change":4,"start":7905,"end":7915},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7915},"to":{"change":4,"start":5905,"end":5948},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5948},"to":{"change":4,"start":7958,"end":8328},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7958},"to":{"change":4,"start":7958,"end":8328},"introduced_by":4}],"inode":{"change":4,"pos":3665}}},"contents":[{"Del":" }\n"},{"Del":" response::Header::Redirect(s) => {\n"},{"Del":" let Redirect { url, temporary } = s;\n if let Some(false) = temporary {\n println!(\"Server has permanently moved. Redirecting to: {url}\");\n println!(\"Please update your records!\");\n } else {\n println!(\"Server has temporarily moved. Redirecting to: {url}\");\n }\n Some(url)\n"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":150,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":8338}],"down_context":[{"change":4,"pos":5949}],"flag":"BLOCK","start":3224,"end":3296,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" response::Header::Redirect(s) => Some(handle::redirect(s, ui)),"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":152,"ins":{"up_context":[{"change":4,"pos":5992}],"down_context":[{"change":4,"pos":8543}],"flag":"BLOCK","start":3297,"end":3335,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":5992},"to":{"change":4,"start":8381,"end":8543},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8381},"to":{"change":4,"start":8381,"end":8543},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" handle::fail_temp(s, ui);"}],"del_contents":[{"Del":" let FailTemp { message, typ } = s;\n println!(\"Temporary failure: {typ:?}! Please try again. Details:\");\n println!(\"{message}\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":156,"ins":{"up_context":[{"change":4,"pos":6036}],"down_context":[{"change":4,"pos":8757}],"flag":"BLOCK","start":3336,"end":3374,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":6036},"to":{"change":4,"start":8613,"end":8757},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8613},"to":{"change":4,"start":8613,"end":8757},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" handle::fail_perm(s, ui);"}],"del_contents":[{"Del":" let FailPerm { message, typ } = s;\n println!(\"Permanent failure: {typ:?}! Details:\");\n println!(\"{message}\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":160,"ins":{"up_context":[{"change":4,"pos":6084}],"down_context":[{"change":4,"pos":8982}],"flag":"BLOCK","start":3375,"end":3417,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":6084},"to":{"change":4,"start":8831,"end":8982},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8831},"to":{"change":4,"start":8831,"end":8982},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" handle::cert_required(s, ui);"}],"del_contents":[{"Del":" let CertRequired { message, typ } = s;\n println!(\"Certificate required: {typ:?}! Details:\");\n println!(\"{message}\");\n"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":162,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":8999}],"down_context":[{"change":4,"pos":8999}],"flag":"BLOCK","start":3418,"end":4748,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"mod handle {"},{"Add":" use crate::{"},{"Add":" decode_media,"},{"Add":" io::ReadExt,"},{"Add":" response::header::{CertRequired, FailPerm, FailTemp, Input, Redirect, Success},"},{"Add":" UI,"},{"Add":" };"},{"Add":" use std::io::Read;"},{"Add":" use url::Url;"},{"Add":""},{"Add":" pub fn cert_required(s: CertRequired, ui: &mut impl UI) {"},{"Add":" let CertRequired { message, typ } = s;"},{"Add":" ui.warn(format_args!("},{"Add":" \"Certificate required: {typ:?}! Details:\\n{message}\""},{"Add":" ));"},{"Add":" }"},{"Add":""},{"Add":" pub fn fail_perm(s: FailPerm, ui: &mut impl UI) {"},{"Add":" let FailPerm { message, typ } = s;"},{"Add":" ui.warn(format_args!("},{"Add":" \"Permanent failure: {typ:?}! Details:\\n{message}\""},{"Add":" ));"},{"Add":" }"},{"Add":""},{"Add":" pub fn fail_temp(s: FailTemp, ui: &mut impl UI) {"},{"Add":" let FailTemp { message, typ } = s;"},{"Add":" ui.warn(format_args!("},{"Add":" \"Temporary failure: {typ:?}! Please try again. Details:\\n{message}\""},{"Add":" ));"},{"Add":" }"},{"Add":""},{"Add":" pub fn redirect(s: Redirect, ui: &mut impl UI) -> Url {"},{"Add":" let Redirect { url, temporary } = s;"},{"Add":" if let Some(false) = temporary {"},{"Add":" ui.warn(format_args!("},{"Add":" \"Server has permanently moved. Redirecting to: {url}\\nPlease update your records!\""},{"Add":" ));"},{"Add":" } else {"},{"Add":" ui.warn(format_args!("},{"Add":" \"Server has temporarily moved. Redirecting to: {url}\""},{"Add":" ));"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":208,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":9009}],"down_context":[{"change":4,"pos":9009}],"flag":"BLOCK","start":4749,"end":5527,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" url"},{"Add":" }"},{"Add":""},{"Add":" pub fn success(s: Success, mut stream: impl Read, ui: &mut impl UI) {"},{"Add":" let Success { mime } = s;"},{"Add":" let body = stream.read_string().expect(\"failed to read body\");"},{"Add":" //TODO remove this debug output"},{"Add":" println!(\"page is encoded as {mime:?}\");"},{"Add":" println!(\"response body: {body}\");"},{"Add":" let media = decode_media(mime, &body);"},{"Add":" ui.show(media);"},{"Add":" }"},{"Add":""},{"Add":" pub fn input(s: Input, ui: &mut impl UI, mut url: Url) -> Option {"},{"Add":" let Input { prompt, sensitive } = s;"},{"Add":" let input = if let Some(true) = sensitive {"},{"Add":" ui.read_secret(&prompt)"},{"Add":" } else {"},{"Add":" ui.read(&prompt)"},{"Add":" };"},{"Add":" let input = urlencoding::encode(&input);"},{"Add":" url.set_query(Some(&input));"},{"Add":" Some(url)"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":235,"ins":{"up_context":[{"change":4,"pos":158}],"down_context":[{"change":4,"pos":463}],"flag":"BLOCK","start":5528,"end":5654,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":158},"to":{"change":4,"start":264,"end":355},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":264},"to":{"change":4,"start":264,"end":355},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":355},"to":{"change":4,"start":159,"end":211},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":211},"to":{"change":4,"start":416,"end":463},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":416},"to":{"change":4,"start":416,"end":463},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" let media = match (mime.type_(), mime.subtype().as_ref()) {"},{"Add":" (mime::TEXT, \"gemini\") => Media::Gemini(body.into()),"}],"del_contents":[{"Del":" let media = match mime.type_() {\n mime::TEXT => match mime.subtype().as_ref() {\n"},{"Del":" \"gemini\" => Media::Gemini(body.into()),\n"},{"Del":" _ => Media::Text(body),\n },\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":280,"ins":{"up_context":[{"change":4,"pos":6208}],"down_context":[{"change":4,"pos":6300}],"flag":"BLOCK","start":5655,"end":5761,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6208},"to":{"change":4,"start":6208,"end":6300},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" use crate::{cl::Cli, read_response_header, send_request};"},{"Add":""},{"Add":" use super::response::{header, Header};"}],"del_contents":[{"Del":" use super::{\n handle_response_header,\n response::{header, Header},\n };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":285,"ins":{"up_context":[{"change":3,"pos":34}],"down_context":[{"change":3,"pos":58}],"flag":"BLOCK","start":5762,"end":5791,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":34},"to":{"change":3,"start":34,"end":58},"introduced_by":3}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" fn test_handle_redirect("}],"del_contents":[{"Del":" fn handle_redirect(\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":287,"ins":{"up_context":[{"change":3,"pos":111}],"down_context":[{"change":3,"pos":180}],"flag":"BLOCK","start":5792,"end":5866,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":111},"to":{"change":3,"start":111,"end":180},"introduced_by":3}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" #[values(None, Some(true), Some(false))] temporary: Option,"}],"del_contents":[{"Del":" #[values(None, Some(true), Some(false))] temp: Option,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":291,"ins":{"up_context":[{"change":4,"pos":6816}],"down_context":[{"change":4,"pos":6845}],"flag":"BLOCK","start":5867,"end":5890,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6816},"to":{"change":4,"start":6816,"end":6845},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" temporary,"}],"del_contents":[{"Del":" temporary: temp,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":293,"ins":{"up_context":[{"change":4,"pos":6857}],"down_context":[{"change":4,"pos":7088}],"flag":"BLOCK","start":5891,"end":6139,"inode":{"change":4,"pos":3665}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6857},"to":{"change":4,"start":6857,"end":7088},"introduced_by":4}],"inode":{"change":4,"pos":3665}},"ins_contents":[{"Add":" let mut app = Cli {};"},{"Add":" let url = {"},{"Add":" let crate::response::Header::Redirect(s) = head"},{"Add":" else {"},{"Add":" panic!(\"expected redirect\")"},{"Add":" };"},{"Add":" crate::handle::redirect(s, &mut app)"},{"Add":" };"}],"del_contents":[{"Del":" let url = \"gopher://abc.de\".parse().unwrap();\n let mut stream: &[u8] = b\"\";\n let Some(url) = handle_response_header(head, url, &mut stream)\n else {panic!(\"expected redirect handling to return a url\")};\n"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":302,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":7125}],"down_context":[{"change":4,"pos":7125}],"flag":"BLOCK","start":6140,"end":7059,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn test_request() {"},{"Add":" let url: Url = \"gemini://some/url\".try_into().unwrap();"},{"Add":" let req = b\"gemini://some/url\\r\\n\";"},{"Add":" let mut net_stream = [0; 1024];"},{"Add":""},{"Add":" send_request(&mut net_stream.as_mut_slice(), &url).expect(\"error sending request\");"},{"Add":""},{"Add":" assert_eq!(req, &net_stream[..req.len()]);"},{"Add":" }"},{"Add":""},{"Add":" #[rstest]"},{"Add":" #[case('0', Some(false))]"},{"Add":" #[case('1', Some(true))]"},{"Add":" #[case('3', None)]"},{"Add":" fn test_response_input(#[case] sensitive_code: char, #[case] sensitive: Option) {"},{"Add":" let exp_head = Header::Input(header::Input {"},{"Add":" prompt: \"prompt text\".to_string(),"},{"Add":" sensitive,"},{"Add":" });"},{"Add":""},{"Add":" let resp_text = format!(\"1{sensitive_code} prompt text\\r\\n\");"},{"Add":" let resp_head: &[u8] = resp_text.as_bytes();"},{"Add":" let head = read_response_header(&mut &*resp_head).expect(\"failed to read response\");"},{"Add":" assert_eq!(exp_head, head);"}]}},{"Edit":{"inode":{"change":4,"pos":3665},"path":"src/main.rs","line":330,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":7131}],"down_context":[{"change":4,"pos":7131}],"flag":"BLOCK","start":7060,"end":7153,"inode":{"change":4,"pos":3665}}},"contents":[{"Add":""},{"Add":" #[test]"},{"Add":" fn test_response_body() {"},{"Add":" let body: &[u8] = b\"some text\\r\\n\";"},{"Add":" }"}]}},{"Edit":{"inode":{"change":4,"pos":41929},"path":"Cargo.toml","line":9,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":42105}],"down_context":[{"change":4,"pos":42105}],"flag":"BLOCK","start":7154,"end":7204,"inode":{"change":4,"pos":41929}}},"contents":[{"Add":"ansi-control-codes = \"0.0.2\""},{"Add":"ansi_term = \"0.12.1\""}]}},{"Edit":{"inode":{"change":4,"pos":42312},"path":"Cargo.lock","line":6,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":42429}],"down_context":[{"change":4,"pos":42429}],"flag":"BLOCK","start":7205,"end":7631,"inode":{"change":4,"pos":42312}}},"contents":[{"Add":"name = \"ansi-control-codes\""},{"Add":"version = \"0.0.2\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"b7ca68a5142d31bc74840dc5520efedf65a3feb348fcca74d38ae1dadc0822f8\""},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"ansi_term\""},{"Add":"version = \"0.12.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2\""},{"Add":"dependencies = ["},{"Add":" \"winapi\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":4,"pos":42312},"path":"Cargo.lock","line":294,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":46837}],"down_context":[{"change":4,"pos":46837}],"flag":"BLOCK","start":7632,"end":7669,"inode":{"change":4,"pos":42312}}},"contents":[{"Add":" \"ansi-control-codes\","},{"Add":" \"ansi_term\","}]}}],"owner":"CandyCorvid","repo":"gemini","token":"YwxmI6s9InybXlYh4IBLp0hbsLJx0pTd5Ei3m0XuZHg=","login":null}

…

Dependencies

Change contents