mirror of
https://github.com/LBRYFoundation/LBRY-Vault.git
synced 2025-09-02 18:25:21 +00:00
HW_PluginBase: small clean-up for 'maximum_library'
This commit is contained in:
parent
e07d5d8422
commit
dc6dbe5bfb
1 changed files with 4 additions and 3 deletions
|
@ -46,7 +46,9 @@ class HW_PluginBase(BasePlugin):
|
||||||
keystore_class: Type['Hardware_KeyStore']
|
keystore_class: Type['Hardware_KeyStore']
|
||||||
libraries_available: bool
|
libraries_available: bool
|
||||||
|
|
||||||
|
# define supported library versions: minimum_library <= x < maximum_library
|
||||||
minimum_library = (0, )
|
minimum_library = (0, )
|
||||||
|
maximum_library = (float('inf'), )
|
||||||
|
|
||||||
def __init__(self, parent, config, name):
|
def __init__(self, parent, config, name):
|
||||||
BasePlugin.__init__(self, parent, config, name)
|
BasePlugin.__init__(self, parent, config, name)
|
||||||
|
@ -149,17 +151,16 @@ class HW_PluginBase(BasePlugin):
|
||||||
# if no exception so far, we might still raise LibraryFoundButUnusable
|
# if no exception so far, we might still raise LibraryFoundButUnusable
|
||||||
if (library_version == 'unknown'
|
if (library_version == 'unknown'
|
||||||
or versiontuple(library_version) < self.minimum_library
|
or versiontuple(library_version) < self.minimum_library
|
||||||
or hasattr(self, "maximum_library") and versiontuple(library_version) >= self.maximum_library):
|
or versiontuple(library_version) >= self.maximum_library):
|
||||||
raise LibraryFoundButUnusable(library_version=library_version)
|
raise LibraryFoundButUnusable(library_version=library_version)
|
||||||
except ImportError:
|
except ImportError:
|
||||||
return False
|
return False
|
||||||
except LibraryFoundButUnusable as e:
|
except LibraryFoundButUnusable as e:
|
||||||
library_version = e.library_version
|
library_version = e.library_version
|
||||||
max_version_str = version_str(self.maximum_library) if hasattr(self, "maximum_library") else "inf"
|
|
||||||
self.libraries_available_message = (
|
self.libraries_available_message = (
|
||||||
_("Library version for '{}' is incompatible.").format(self.name)
|
_("Library version for '{}' is incompatible.").format(self.name)
|
||||||
+ '\nInstalled: {}, Needed: {} <= x < {}'
|
+ '\nInstalled: {}, Needed: {} <= x < {}'
|
||||||
.format(library_version, version_str(self.minimum_library), max_version_str))
|
.format(library_version, version_str(self.minimum_library), version_str(self.maximum_library)))
|
||||||
self.logger.warning(self.libraries_available_message)
|
self.logger.warning(self.libraries_available_message)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue