-
Notifications
You must be signed in to change notification settings - Fork 14
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.
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
Base moodle's file_exist method on the file content instead of headers #6841
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,14 +137,17 @@ def list_files(self, course_id: int): | |
def file_exists(self, file_id) -> bool: | ||
"""Check if the file exists in the course.""" | ||
# Moodle file IDs are URLs, but they need the token to be accessible | ||
response = self._http.request("HEAD", f"{file_id}&token={self.token}") | ||
# Moodle API doesn't use status codes, we can't rely on that. | ||
# We don't want to download the full file so we'll do a HEAD request and assume: | ||
# - JSON response, it's an error response | ||
# - Anything else, it's the file we are after | ||
|
||
LOG.info("Headers from Moodle file check %s", response.headers) | ||
return not response.headers["content-type"].startswith("application/json") | ||
response = self._http.request( | ||
"GET", f"{file_id}&token={self.token}", headers={"Range": "bytes=0-1024"} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It turns out my information about Adobe requiring "%PDF" in the first 1024 bytes of the file is out of date, per https://helpx.adobe.com/acrobat/kb/pdf-error-1015-11001-update.html. I expect other PDF viewers are still more liberal though. |
||
) | ||
# API doesn't use status codes, we can't rely on that. | ||
if content_type := response.headers.get("content-type"): | ||
# JSON response, assume it's an error response | ||
return not content_type.startswith("application/json") | ||
|
||
# If the Moodle server doesn't return the content-type header, check the first bytes of the response | ||
# and check if the files is indeed a PDF. | ||
return b"%PDF" in response.content | ||
|
||
def page(self, course_id, page_id) -> dict | None: | ||
url = self._api_url(Function.GET_PAGES) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This issue already existed before, but can we be certain that
self.token
will never contain characters that need to be escaped in a query param?