mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-04-02 01:25:27 +00:00
rename event name, use const
This commit is contained in:
yggverse
parent
731a55cf47
commit
827f3bb7e9
1 changed files with 18 additions and 17 deletions
|
|
@ -153,6 +153,7 @@ fn handle(
|
||||||
on_failure: Option<Box<dyn Fn()>>,
|
on_failure: Option<Box<dyn Fn()>>,
|
||||||
is_snap_history: bool,
|
is_snap_history: bool,
|
||||||
) {
|
) {
|
||||||
|
const EVENT_COMPLETED: &str = "Completed";
|
||||||
let uri = request.uri().clone();
|
let uri = request.uri().clone();
|
||||||
client.request_async(
|
client.request_async(
|
||||||
request,
|
request,
|
||||||
|
|
@ -185,7 +186,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
match input {
|
match input {
|
||||||
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-10
|
// https://geminiprotocol.net/docs/protocol-specification.gmi#status-10
|
||||||
Input::Default { message } => page.input.set_new_response(
|
Input::Default { message } => page.input.set_new_response(
|
||||||
|
|
@ -322,7 +323,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
i.add_event("Done".to_string());
|
i.add_event(EVENT_COMPLETED.to_string());
|
||||||
},
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let s = page.content.to_status_failure();
|
let s = page.content.to_status_failure();
|
||||||
|
|
@ -333,7 +334,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Err((_, e)) => {
|
Err((_, e)) => {
|
||||||
|
|
@ -345,7 +346,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
|
|
@ -358,7 +359,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
@ -397,7 +398,7 @@ fn handle(
|
||||||
{
|
{
|
||||||
let mut i = page.info.borrow_mut();
|
let mut i = page.info.borrow_mut();
|
||||||
i
|
i
|
||||||
.add_event("Done".to_string())
|
.add_event(EVENT_COMPLETED.to_string())
|
||||||
.set_mime(Some(success.mime().to_string()))
|
.set_mime(Some(success.mime().to_string()))
|
||||||
.set_request(Some(uri.to_string()))
|
.set_request(Some(uri.to_string()))
|
||||||
.set_size(Some(buffer.byte_length()));
|
.set_size(Some(buffer.byte_length()));
|
||||||
|
|
@ -410,7 +411,7 @@ fn handle(
|
||||||
{
|
{
|
||||||
let mut i = page.info.borrow_mut();
|
let mut i = page.info.borrow_mut();
|
||||||
i
|
i
|
||||||
.add_event("Done".to_string())
|
.add_event(EVENT_COMPLETED.to_string())
|
||||||
.set_mime(Some(success.mime().to_string()))
|
.set_mime(Some(success.mime().to_string()))
|
||||||
.set_request(Some(uri.to_string()))
|
.set_request(Some(uri.to_string()))
|
||||||
.set_size(None);
|
.set_size(None);
|
||||||
|
|
@ -437,7 +438,7 @@ fn handle(
|
||||||
{
|
{
|
||||||
let mut i = page.info.borrow_mut();
|
let mut i = page.info.borrow_mut();
|
||||||
i
|
i
|
||||||
.add_event("Done".to_string())
|
.add_event(EVENT_COMPLETED.to_string())
|
||||||
.set_mime(Some(success.mime().to_string()))
|
.set_mime(Some(success.mime().to_string()))
|
||||||
.set_request(Some(uri.to_string()))
|
.set_request(Some(uri.to_string()))
|
||||||
.set_size(None);
|
.set_size(None);
|
||||||
|
|
@ -462,7 +463,7 @@ fn handle(
|
||||||
{
|
{
|
||||||
let mut i = page.info.borrow_mut();
|
let mut i = page.info.borrow_mut();
|
||||||
i
|
i
|
||||||
.add_event("Done".to_string())
|
.add_event(EVENT_COMPLETED.to_string())
|
||||||
.set_mime(Some(mime.to_string()))
|
.set_mime(Some(mime.to_string()))
|
||||||
.set_request(Some(uri.to_string()))
|
.set_request(Some(uri.to_string()))
|
||||||
.set_size(None);
|
.set_size(None);
|
||||||
|
|
@ -484,7 +485,7 @@ fn handle(
|
||||||
page.set_progress(0.0);
|
page.set_progress(0.0);
|
||||||
page.set_title(&s.title());
|
page.set_title(&s.title());
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
// Disallow external redirection by default as potentially unsafe
|
// Disallow external redirection by default as potentially unsafe
|
||||||
// even not specified, require follow confirmation @TODO optional
|
// even not specified, require follow confirmation @TODO optional
|
||||||
} else if uri.host() != target.host() {
|
} else if uri.host() != target.host() {
|
||||||
|
|
@ -509,7 +510,7 @@ fn handle(
|
||||||
page.set_progress(0.0);
|
page.set_progress(0.0);
|
||||||
page.set_title(t);
|
page.set_title(t);
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
} else {
|
} else {
|
||||||
let t = target.to_string();
|
let t = target.to_string();
|
||||||
if matches!(redirect, Redirect::Permanent { .. }) {
|
if matches!(redirect, Redirect::Permanent { .. }) {
|
||||||
|
|
@ -519,7 +520,7 @@ fn handle(
|
||||||
{
|
{
|
||||||
let mut i = page.info.take();
|
let mut i = page.info.take();
|
||||||
i
|
i
|
||||||
.add_event("Done".to_string())
|
.add_event(EVENT_COMPLETED.to_string())
|
||||||
.set_mime(None)
|
.set_mime(None)
|
||||||
.set_request(Some(uri.to_string()))
|
.set_request(Some(uri.to_string()))
|
||||||
.set_size(None);
|
.set_size(None);
|
||||||
|
|
@ -535,7 +536,7 @@ fn handle(
|
||||||
page.set_progress(0.0);
|
page.set_progress(0.0);
|
||||||
page.set_title(&s.title());
|
page.set_title(&s.title());
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Response::Certificate(ref certificate) => match certificate {
|
Response::Certificate(ref certificate) => match certificate {
|
||||||
|
|
@ -553,7 +554,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Response::Failure(failure) => match failure {
|
Response::Failure(failure) => match failure {
|
||||||
|
|
@ -571,7 +572,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
if let Some(callback) = on_failure {
|
if let Some(callback) = on_failure {
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
|
|
@ -591,7 +592,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done");
|
update_page_info(&page, &uri, EVENT_COMPLETED);
|
||||||
if let Some(callback) = on_failure {
|
if let Some(callback) = on_failure {
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
|
|
@ -608,7 +609,7 @@ fn handle(
|
||||||
page.snap_history();
|
page.snap_history();
|
||||||
}
|
}
|
||||||
redirects.replace(0); // reset
|
redirects.replace(0); // reset
|
||||||
update_page_info(&page, &uri, "Done")
|
update_page_info(&page, &uri, EVENT_COMPLETED)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue