hen6003/gemini-client - Change LWTUIM4B3G2LKUE4YLV72YERLELQZU2XA5I5BMHT7KLTNTPB2PZQC

Add internal page handlers

Created by hen6003 on July 18, 2022

LWTUIM4B3G2LKUE4YLV72YERLELQZU2XA5I5BMHT7KLTNTPB2PZQC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 1 [3.976]
[3.976]
[3.977]
```
mod handlers;
```
Deletion in src/main.rs at line 5 [3.976]
B:BD[3.1021] → [3.1021:1038]
```
use gemini::Url;
```
Insertion in src/main.rs at line 7 [3.976]
[3.1085]
[3.1085]
```
use url::Url;
```
Insertion in src/main.rs at line 9 [3.976]
[3.1086]
[4.0]
```
use std::collections::HashMap;
```

Replacement in src/main.rs at line 20 [3.976]

B:BD[3.1285] → [2.0:5]

[3.1285]

[2.5]


    #[serde(skip)]
    internal_handlers: HashMap<String, fn(&mut Self, &mut egui::Ui)>,

Replacement in src/main.rs at line 31 [3.976]

B:BD[3.1343] → [3.1343:1437]

    page: Option<Promise<io::Result<(gemini::response::Response, Option<gemini::Builder>)>>>,

[3.1343]

[3.1437]

    page: Option<Promise<io::Result<RequestType>>>,

Insertion in src/main.rs at line 35 [3.976]

[3.1500]

}
enum RequestType {
    Gemini(gemini::response::Response, Option<gemini::Builder>),
    Internal(String),

Insertion in src/main.rs at line 47 [3.976]

[4.152]

[2.51]

            internal_handlers: HashMap::from([
                (
                    "about".to_string(),
                    handlers::about as fn(&mut GeminiApp, &mut egui::Ui),
                ),
                ("history".to_string(), handlers::history),
                ("list".to_string(), handlers::list),
            ]),

Replacement in src/main.rs at line 78 [3.976]

B:BD[4.489] → [4.489:556]

                    Ok((gemini, _)) => match gemini.body_bytes() {

[4.489]

[4.556]

                    Ok(RequestType::Gemini(gemini, _)) => match gemini.body_bytes() {

Insertion in src/main.rs at line 101 [3.976]

[4.1455]


                    _ => todo!("Unable to save page"),

Replacement in src/main.rs at line 116 [3.976]

B:BD[4.1772] → [4.1772:1832]

            let new_url = match new_url.split_once("://") {

[4.1772]

[4.1832]

            let new_url = match new_url.split_once(":") {

Replacement in src/main.rs at line 118 [3.976]

B:BD[4.1868] → [4.1868:1928]

                None => "gemini://".to_string() + &new_url,

[4.1868]

[4.1928]

                None => {
                    match new_url.split_once("://") {
                        Some(_) => "gemini:",
                        None => "gemini://",
                    }
                    .to_string()
                        + &new_url
                }

Replacement in src/main.rs at line 129 [3.976]

B:BD[4.2000] → [4.2000:2149]

                match new_url.scheme() {
                    "gemini" => (),
                    _ => {
                        // TODO: Mime launch

[4.2000]

[4.2149]

                let (sender, promise) = Promise::new();

Replacement in src/main.rs at line 131 [3.976]

B:BD[4.2150] → [4.2150:2316]

                        self.url_history.pop();
                        self.reload = true;
                        return;
                    }
                }

[4.2150]

[4.2316]

                self.page = Some(promise);

Replacement in src/main.rs at line 134 [3.976]

B:BD[4.2378] → [4.2378:2475]

                let tls_config = self.tls_config.clone();
                let ctx = ctx.clone();

[4.2378]

[4.2475]

                match new_url.scheme() {
                    "gemini" => {
                        let tls_config = self.tls_config.clone();
                        let ctx = ctx.clone();

Replacement in src/main.rs at line 139 [3.976]

B:BD[4.2476] → [4.2476:2724]

                let (sender, promise) = Promise::new();
                self.page = Some(promise);
                thread::spawn(move || {
                    sender.send((|| -> io::Result<(gemini::response::Response, Option<gemini::Builder>)> {

[4.2476]

[4.2724]

                        thread::spawn(move || {
                            sender.send((|| -> io::Result<RequestType> {

Replacement in src/main.rs at line 148 [3.976]

B:BD[4.3090] → [4.3090:3392]

                                    new_url.host_str()
                                        .ok_or_else(|| io::Error::new(
                                            io::ErrorKind::InvalidInput,
                                            "No hostname",
                                        ))?

[4.3090]

[4.3392]

                                    new_url
                                        .host_str()
                                        .ok_or_else(|| {
                                            io::Error::new(
                                                io::ErrorKind::InvalidInput,
                                                "No hostname",
                                            )
                                        })?

Replacement in src/main.rs at line 173 [3.976]

B:BD[4.4301] → [4.4301:5021]

                                let body =
                                    if let Some(mime_type) = gemini.header.mime_type() {
                                        if mime_type.split(';').next().unwrap() == "text/gemini" { 
                                            if let Some(body) = gemini.body_text() {
                                                Some(gemini::parse::parse_gemtext(body).map_err(|err| {
                                                    io::Error::new(io::ErrorKind::Other, err)
                                                })?)
                                            } else {
                                                None
                                            }

[4.4301]

[4.5021]

                                let body = if let Some(mime_type) = gemini.header.mime_type() {
                                    if mime_type.split(';').next().unwrap() == "text/gemini" {
                                        if let Some(body) = gemini.body_text() {
                                            Some(gemini::parse::parse_gemtext(body).map_err(
                                                |err| io::Error::new(io::ErrorKind::Other, err),
                                            )?)

Replacement in src/main.rs at line 184 [3.976]

B:BD[4.5251] → [4.5251:5290]

};

[4.5251]

[4.5290]

Replacement in src/main.rs at line 189 [3.976]

B:BD[4.5291] → [4.5291:5342]

                                Ok((gemini, body))

[4.5291]

[4.5342]

                                Ok(RequestType::Gemini(gemini, body))

Replacement in src/main.rs at line 192 [3.976]

B:BD[4.5378] → [4.5378:5441]

                    ctx.request_repaint();
                });

[4.5378]

[4.5441]

                            ctx.request_repaint();
                        });
                    }
                    "internal" => {
                        sender.send(Ok(RequestType::Internal(new_url.path().to_string())));
                        ctx.request_repaint();
                    }
                    _ => {
                        // TODO: Mime launch
                        self.url_bar = self.url_history.pop().unwrap();
                        self.reload = true;
                        return;
                    }
                }

Replacement in src/main.rs at line 223 [3.976]

B:BD[4.5530] → [4.5530:5572]

            ui.horizontal_centered(|ui| {

[4.5530]

[4.5572]

            ui.horizontal(|ui| {

Insertion in src/main.rs at line 230 [3.976]

[3.2404]

[4.5753]

                // Use a larger text size

Replacement in src/main.rs at line 252 [3.976]

B:BD[3.2751] → [4.6247:6508]

                // URL entry
                let response = ui.add(
                    egui::TextEdit::singleline(&mut self.url_bar)
                        //.desired_width(f32::INFINITY)
                        .hint_text("Enter URL..."),
                );

[3.2751]

[3.2849]

                ui.with_layout(egui::Layout::right_to_left(), |ui| {
                    // Buttons
                    // Settings
                    let button = ui.button("⚙");

Replacement in src/main.rs at line 257 [3.976]

B:BD[3.2850] → [3.2850:2937]

B:BD[3.2937] → [4.6509:6617]

∅:D[4.6617] → [3.3023:3041]

B:BD[3.3023] → [3.3023:3041]

                if response.lost_focus() && ui.input().key_pressed(egui::Key::Enter) {
                    self.url_history.push(self.url_bar.to_owned());
                    self.reload = true;
                }

[3.2850]

[4.6618]

                    button.clone().on_hover_text("Settings");
                    if button.clicked() {
                        self.url_history.push("internal:settings".to_string());
                        self.reload = true;
                    }
                    // Save page
                    let button = ui.button("💾");

Replacement in src/main.rs at line 267 [3.976]

B:BD[4.6619] → [4.6619:6746]

                // Menu
                ui.menu_button("☰", |ui| {
                    if ui.button("Save page").clicked() {

[4.6619]

[4.6746]

                    button.clone().on_hover_text("Save page");
                    if button.clicked() {

Replacement in src/main.rs at line 272 [3.976]

B:BD[4.6819] → [4.6819:6860]

                })
                //});

[4.6819]

[3.3041]


                    // URL entry
                    let response = ui.add(
                        egui::TextEdit::singleline(&mut self.url_bar)
                            .desired_width(ui.available_size().x)
                            .hint_text("Enter URL..."),
                    );
                    if response.lost_focus() && ui.input().key_pressed(egui::Key::Enter) {
                        self.url_history.push(self.url_bar.to_owned());
                        self.reload = true;
                    }
                });

Replacement in src/main.rs at line 298 [3.976]

B:BD[3.3614] → [3.3614:3705]

                            Some(Ok((gemini, body))) => match gemini.status().category() {

[3.3614]

[3.3705]

                            Some(Ok(RequestType::Internal(internal))) => {
                                if let Some(handler) = self.internal_handlers.get(internal) {
                                    handler(self, ui);
                                }
                            }
                            Some(Ok(RequestType::Gemini(gemini, body))) => match gemini.status().category() {

Insertion in src/main.rs at line 305 [3.976]

[3.3769]

[4.6915]

                                    if gemini.status().code() == gemini::Code::PermanentRedirect {
                                        self.url_history.pop();
                                    }

Replacement in src/main.rs at line 410 [3.976]
B:BD[3.9208] → [2.311:344]
```
                                
```
[3.9208]
[2.344]
Replacement in src/main.rs at line 413 [3.976]
B:BD[2.475] → [2.475:512]
```
                                    
```
[2.475]
[2.512]