Refactor the code to make it comply with PEP-8 standards:Convert all class definitions to CamelCase style.
(issue 37)
This commit is contained in:
@@ -2,16 +2,16 @@
|
||||
import logging
|
||||
import toml
|
||||
|
||||
from .pkg import pkg_info,pkg_media_info
|
||||
from .installer import pkg_installer
|
||||
from .pkg import PackageInfo,PackageMediaInfo
|
||||
from .installer import PackageInstaller
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class pkg_env_mgr:
|
||||
class PackageEnvManager:
|
||||
_instance = None
|
||||
def __new__(cls):
|
||||
if cls._instance is None:
|
||||
cls._instance = super(pkg_env_mgr, cls).__new__(cls)
|
||||
cls._instance = super(PackageEnvManager, cls).__new__(cls)
|
||||
return cls._instance
|
||||
|
||||
def __init__(self) -> None:
|
||||
@@ -19,46 +19,46 @@ class pkg_env_mgr:
|
||||
|
||||
pass
|
||||
|
||||
def get_env(self,cfg_path:str) -> pkg_env:
|
||||
def get_env(self,cfg_path:str) -> PackageEnv:
|
||||
if cfg_path in self._pkg_envs:
|
||||
return self._pkg_envs[cfg_path]
|
||||
else:
|
||||
pkg_env = pkg_env(cfg_path)
|
||||
pkg_env = PackageEnv(cfg_path)
|
||||
self._pkg_envs[cfg_path] = pkg_env
|
||||
return pkg_env
|
||||
|
||||
def get_user_env(self) -> pkg_env:
|
||||
def get_user_env(self) -> PackageEnv:
|
||||
pass
|
||||
|
||||
def get_system_env(self) -> pkg_env:
|
||||
def get_system_env(self) -> PackageEnv:
|
||||
pass
|
||||
|
||||
class pkg_env:
|
||||
class PackageEnv:
|
||||
def __init__(self,cfg_path:str) -> None:
|
||||
self.pkg_dir : str = ""
|
||||
self.pkg_obj_dir : str = ""
|
||||
self.is_strict : bool = True
|
||||
self.parent_envs : list[pkg_env] = None
|
||||
self.parent_envs : list[PackageEnv] = None
|
||||
self.index_dbs = None
|
||||
|
||||
self.cfg_path = cfg_path
|
||||
self._load_pkg_cfg(cfg_path)
|
||||
pass
|
||||
|
||||
def load(self,pkg_name:str,search_parent=True) -> pkg_media_info:
|
||||
def load(self,pkg_name:str,search_parent=True) -> PackageMediaInfo:
|
||||
pkg_path = None
|
||||
pkg_id,verion_str,cid = pkg_info.parse_pkg_name(pkg_name)
|
||||
pkg_id,verion_str,cid = PackageInfo.parse_pkg_name(pkg_name)
|
||||
|
||||
if cid is None:
|
||||
if verion_str is None:
|
||||
channel = self.get_pkg_channel_from_version(verion_str)
|
||||
channel:str = self.get_pkg_channel_from_version(verion_str)
|
||||
if channel is None:
|
||||
pkg_path = f"{self.pkg_dir}{pkg_id}"
|
||||
else:
|
||||
pkg_path = f"{self.pkg_dir}{pkg_id}#{channel}"
|
||||
else:
|
||||
channel = self.get_pkg_channel_from_version(verion_str)
|
||||
the_version = self.get_exact_version_from_installed(verion_str)
|
||||
channel:str = self.get_pkg_channel_from_version(verion_str)
|
||||
the_version:str = self.get_exact_version_from_installed(verion_str)
|
||||
if the_version is None:
|
||||
logger.warn(f"load {pkg_name} failed: no match version from {verion_str}")
|
||||
return None
|
||||
@@ -69,7 +69,7 @@ class pkg_env:
|
||||
else:
|
||||
pkg_path = f"{self.pkg_obj_dir}.{pkg_id}/{cid}"
|
||||
|
||||
media_info = self.try_load_pkg_media_info(pkg_id,pkg_path)
|
||||
media_info:PackageMediaInfo = self.try_load_pkg_media_info(pkg_path)
|
||||
if media_info is None:
|
||||
if search_parent:
|
||||
for parent_env in self.parent_envs:
|
||||
@@ -86,28 +86,28 @@ class pkg_env:
|
||||
def get_pkg_channel_from_version(self,pkg_version:str) -> str:
|
||||
pass
|
||||
|
||||
def get_pkg_media_info(self,pkg_name:str)->pkg_media_info:
|
||||
def get_pkg_media_info(self,pkg_name:str)->PackageMediaInfo:
|
||||
pass
|
||||
|
||||
def try_load_pkg_media_info(self,pkg_full_path:str) -> pkg_media_info:
|
||||
def try_load_pkg_media_info(self,pkg_full_path:str) -> PackageMediaInfo:
|
||||
pass
|
||||
|
||||
|
||||
def get_installed_pkg_info(self,pkg_name:str) -> pkg_info:
|
||||
def get_installed_pkg_info(self,pkg_name:str) -> PackageInfo:
|
||||
pass
|
||||
|
||||
def lookup(self,pkg_id:str,version_str:str) -> pkg_info:
|
||||
def lookup(self,pkg_id:str,version_str:str) -> PackageInfo:
|
||||
# to make sure pkg.cid is correct, we MUST verfiy eveything here
|
||||
pass
|
||||
|
||||
def get_installer(self) -> pkg_installer:
|
||||
def get_installer(self) -> PackageInstaller:
|
||||
pass
|
||||
|
||||
@classmethod
|
||||
def is_valied_media(pkg_full_path:str) -> bool:
|
||||
pass
|
||||
|
||||
def do_pkg_media_trans(self,pkg_info:pkg_info,source_path:str,target_path:str) -> bool:
|
||||
def do_pkg_media_trans(self,pkg_info:PackageInfo,source_path:str,target_path:str) -> bool:
|
||||
pass
|
||||
|
||||
def _load_pkg_cfg(self,cfg_path:str):
|
||||
|
||||
Reference in New Issue
Block a user