failover to python-magic detection if vendored library not present #17
Conversation
| @@ -79,18 +79,60 @@ | |||
| TYPECODE_LIBMAGIC_DATABASE = 'typecode.libmagic.db' | |||
|
|
|||
|
|
|||
| def load_lib_failover(): | |||
| # loader from python-magic | |||
There was a problem hiding this comment.
That's nice extra credits but not needed IMHO since Adam is already credited at the top for the whole file.
src/typecode/magic2.py
Outdated
| # Copyright: Adam Hupp | ||
| libmagic = None | ||
| # Let's try to find magic or magic1 | ||
| dll = ctypes.util.find_library('magic') \ |
There was a problem hiding this comment.
I am not a big fan of line continuations and end-of-line comments. I reckon you copied the code from upstream, butw what about instead something along these lines:
dll = (ctypes.util.find_library('magic')
or ctypes.util.find_library('magic1')
or ctypes.util.find_library('cygmagic-1')
or ctypes.util.find_library('libmagic-1')
or ctypes.util.find_library('msys-magic-1')
)|
|
||
| if not libmagic or not libmagic._name: | ||
| return None | ||
| return libmagic |
There was a problem hiding this comment.
Do you know if there could be a way to test/check the version of this libmagic? Because unless this is close enough to the one provided as a plugin, there could be some magic database inconsistencies.
There was a problem hiding this comment.
We could do a check, but we don't really know what threshold we should really put there. How would you define close enough?
I would suggest to leave a warning, and let the community report any issue.
We could have a TAINTED flag like linux does which could be put in the typecode dependent reports
There was a problem hiding this comment.
Well in hindsight, let's leave it this way.... after all in https://github.com/nexB/scancode-plugins/blob/main/builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py I do not even check for version
|
Something that's a head scratcher to me is: where is the magic DB obtained from when not provided by a plugin? |
tardyp
force-pushed
the
failover
branch
2 times, most recently
from
5362fc5 to
b892dea
Compare
|
as per doc: I added the version api which might help in case of a later bug report |
This allows scancode to work on platforms not supported by typecode-libmagic e.g. M1 Macs or windows WSL Most of this code is from https://github.com/ahupp/python-magic/blob/e0ccc6d/magic/loader.py by Adam Hupp, MIT License, compatible with typecode's Apache Signed-off-by: Pierre Tardy <[email protected]>
|
@pombredanne shall we merge this? I think you may need to re run flaky azure pipelines. |
Signed-off-by: Philippe Ombredanne <[email protected]>
|
Merged in #20 |
This allows scancode to work on platforms not supported by typecode-libmagic
e.g. M1 Macs or windows WSL
100% tests pass with this change on my M1 Mac