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.

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

resmgr download: separate name and url #792

Closed
wants to merge 17 commits into from
Closed

Conversation

bertsky
Copy link
Collaborator

@bertsky bertsky commented Feb 2, 2022

Fixes #780

Redefine `download` command to allow setting a `name` for arbitrary (unregistered) URLs, or overriding URLs for existing (registered) names.
Change `-n` / `--any-url` from a flag to an option, change `URL_OR_NAME` to pure `NAME`. Simplify implementation.
@bertsky
Copy link
Collaborator Author

bertsky commented Feb 2, 2022

We should add a test for the -n URL TOOL NAME use-case as well (both as an unregistered resource and as URL-override).

- `Processor`: add `module` and `moduledir` property
- `Processor.__init__`: delegate to `self.list_all_resources` for `-L`
- `Processor.__init__`: delegate to `self.resolve_resource` for `-C`
- `Processor.list_all_resources`: pass moduledir for additional candidates,
  revise filter criterion (solely based on MIME type, and strictly matching
  filename suffixes - unless any MIME is unknown)
- `Processor.resolve_resource`: pass moduledir for additional candidates
- `ocrd_utils.get_processor_resource_types`: show MIME types instead of
  just directory vs file (with `*/*` as fall-back)
- `OcrdResourceManager.list_installed`: adapt (MIME type, but not enforcing
  suffixes; no moduledir)
ocrd/ocrd/cli/ocrd_tool.py Show resolved Hide resolved
ocrd/ocrd/processor/base.py Show resolved Hide resolved
ocrd_utils/ocrd_utils/os.py Show resolved Hide resolved
@bertsky
Copy link
Collaborator Author

bertsky commented Feb 9, 2022

Note: this warrants a new minor release, because the resmgr download CLI has changed slightly, and so has ocrd_utils.get_processor_resource_types.

Documentation will have to be updated in various places:

@kba
Copy link
Member

kba commented Feb 22, 2022

Merged into #800

@kba kba closed this Feb 22, 2022
@bertsky bertsky deleted the patch-3 branch June 6, 2024 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

resmgr download: allow specifying name independent of URL
2 participants