Skip to content

Add format=original query parameter to download URLs #8

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

Open
ThexXTURBOXx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add format=original query parameter to download URLs #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ac0059
Add `format=original` query parameter to download URLs
ThexXTURBOXx Dec 17, 2025
2c72640
Borrow url object
ThexXTURBOXx Dec 17, 2025
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
6 changes: 4 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,13 @@ impl Mediawiki {
if !image["missing"].is_null() {
return Ok(None);
}
let url = image["imageinfo"][0]["url"]
let lossy_url = image["imageinfo"][0]["url"]
.as_str()
.ok_or_else(|| Error::Json(image.clone()))?;
let url = format!("{}{}format=original", lossy_url,
Copy link
Member

@tomodachi94 tomodachi94 Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we can probably add a line like this to make this simpler:

        request.arg("format", "original");

Probably add it around https://github.com/FTB-Gamepedia/mediawiki-rs/pull/8/changes#diff-b1a35a68f14e696205874893c07fd24fdb88882b47c23cc0e0c80a30c7d53759R152-R153 if I were to choose, but anywhere before the actual request happens should be fine.

Copy link
Member

@retep998 retep998 Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The argument is not going on that request, because that's the request to get the image URL in the first place. It has to be added to the later request where we actually download the image.

Copy link
Author

@ThexXTURBOXx ThexXTURBOXx Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that my approach of using format to append a string is not the best way. I have not done too much with Rust yet, so sorry if I don't know about every API method there is!
But yeah, @retep998 is right: the format=original parameter needs to be added to this request, not the one before, where only the JSON is being fetched

if lossy_url.contains('?') { '&' } else { '?' });
let mut response = loop {
let mut request = self.client.request(Method::GET, url);
let mut request = self.client.request(Method::GET, &url);
request = request.header(USER_AGENT, &*self.config.useragent);
let response = request.send()?;
if response.status() == StatusCode::OK {
Expand Down