Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle non-200 status codes with JSON payload in GitHub API responses #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle non-200 status codes with JSON payload in GitHub API responses #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,11 @@ impl eframe::App for Flasher {

if internet {
let json = String::from_utf8(data).unwrap();
std::fs::write(path, json).unwrap();
if handle.response_code().unwrap() == 200 {
std::fs::write(path, json).unwrap();
} else {
std::fs::write(path, format!("GitHub Error: {}", json)).unwrap();
}
} else {
std::fs::write(path, "No Internet").unwrap();
}
Expand All @@ -290,12 +294,18 @@ impl eframe::App for Flasher {
if json.is_err() {
self.toasts.dismiss_all_toasts();
self.toasts
.error("Could not access github, Online Files Will be Unavailable")
.error("Could not access GitHub, Online Files Will be Unavailable")
.set_duration(Some(Duration::from_secs(5)))
.set_closable(false);
self.config
.logs
.push_str("PineFlash: Invalid json downloaded, could not fetch versions.\n");
if string.starts_with("GitHub Error: ") {
self.config
.logs
.push_str(format!("PineFlash: {}. Could not fetch versions.\n", string.as_str()).as_str());
} else {
self.config
.logs
.push_str("PineFlash: Invalid JSON downloaded, could not fetch versions.\n");
}
self.config.versions_checked = true;
} else {
for i in 0..3 {
Expand Down