YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-27 11:34:14 +00:00
Code Issues Projects Releases Wiki Activity

fix redirection reset

Browse Source
This commit is contained in:
yggverse 2025-01-22 21:31:45 +02:00
parent 7b3ff47139
commit 4a309d4ef7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/browser/window/tab/item/client/driver/gemini.rs
View File

@ -203,6 +203,7 @@ fn handle(
subject.page.title.replace(title.into()); subject.page.title.replace(title.into());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
} }
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-20 // https://geminiprotocol.net/docs/protocol-specification.gmi#status-20
Status::Success => match *feature { Status::Success => match *feature {
@ -274,6 +275,7 @@ fn handle(
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
}, },
_ => match response.meta.mime { _ => match response.meta.mime {
Some(mime) => match mime.as_str() { Some(mime) => match mime.as_str() {
@ -301,6 +303,7 @@ fn handle(
// Deactivate loading indication // Deactivate loading indication
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
// Update window components // Update window components
subject.page.window_action subject.page.window_action
@ -314,6 +317,7 @@ fn handle(
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
}, },
}, },
), ),
@ -343,23 +347,20 @@ fn handle(
&memory_input_stream, &memory_input_stream,
Some(&cancellable), Some(&cancellable),
move |result| { move |result| {
// Process buffer data
match result { match result {
Ok(buffer) => { Ok(buffer) => {
subject.page.title.replace(uri_to_title(&uri)); subject.page.title.replace(uri_to_title(&uri));
subject.page.content subject.page.content.to_image(&Texture::for_pixbuf(&buffer));
.to_image(&Texture::for_pixbuf(&buffer));
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
} }
Err(e) => { Err(e) => {
let status = subject.page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some(e.message())); status.set_description(Some(e.message()));
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
} }
} }
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false);
redirects.replace(0); // reset
}, },
) )
} }
@ -370,6 +371,7 @@ fn handle(
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
} }
} }
}, },
@ -383,6 +385,7 @@ fn handle(
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
}, },
}, },
None => { None => {
@ -391,6 +394,7 @@ fn handle(
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
}, },
} }
}, },
@ -463,6 +467,7 @@ fn handle(
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
} }
status => { status => {
let _status = subject.page.content.to_status_failure(); let _status = subject.page.content.to_status_failure();
@ -470,6 +475,7 @@ fn handle(
subject.page.title.replace(_status.title()); subject.page.title.replace(_status.title());
subject.page.navigation.request.widget.entry.set_progress_fraction(0.0); subject.page.navigation.request.widget.entry.set_progress_fraction(0.0);
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset
}, },
} }
} }