Thanks to visit codestin.com
Credit goes to github.com

Skip to content

resmgr download: guess type from content #991

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

Merged
kba merged 1 commit into from
Mar 13, 2023
Merged

resmgr download: guess type from content #991

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion ocrd/ocrd/resource_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
from urllib.parse import urlparse, unquote
from zipfile import ZipFile

from mimetypes import guess_type
from filetype import guess
import requests
from yaml import safe_load, safe_dump

Expand Down Expand Up @@ -317,7 +319,13 @@ def download(
Path('out').mkdir()
with pushd_popd('out'):
suffixes = ''.join(Path(nth_url_segment(url)).suffixes)
mimetype = EXT_TO_MIME.get(suffixes, 'application/octet-stream')
mimetype = guess(f'../{archive_fname}')
if mimetype is None:
mimetype = guess_type(f'../{archive_fname}')[0]
else:
mimetype = mimetype.mime
if mimetype is None:
mimetype = EXT_TO_MIME.get(suffixes, 'application/octet-stream')
log.info("Extracting %s archive to %s/out" % (mimetype, tempdir))
if mimetype == 'application/zip':
with ZipFile(f'../{archive_fname}', 'r') as zipf:
Expand Down
1 change: 1 addition & 0 deletions ocrd/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ pyyaml
Deprecated == 1.2.0
memory-profiler >= 0.58.0
sparklines >= 0.4.2
filetype
2 changes: 1 addition & 1 deletion repo/spec
Open in desktop
Submodule spec updated 17 files
+0 −65 CHANGELOG.md
+0 −10 Makefile
+0 −16 README.md
+1 −1 bagit-profile.json
+6 −2 bagit-profile.yml
+3 −11 cli.md
+0 −163 decisions.md
+66 −0 logging.md
+89 −211 mets.md
+0 −157 nextflow.md
+292 −0 ocrd_api.swagger.yml
+9 −97 ocrd_tool.md
+1 −1 ocrd_tool.schema.json
+2 −76 ocrd_tool.schema.yml
+19 −7 ocrd_zip.md
+0 −510 openapi.yml
+0 −20 scripts/yaml-to-json.py