main, parser, utils: reorganize utility funttions and reflect ab3cfg changes

Co-Authored-By: liushuyu <[email protected]>

Author: Cyanoxygen

acbs/main.py

@@ -7,11 +7,11 @@
 from pathlib import Path
 from typing import List, Tuple
 
-import acbs.ab3cfg
 import acbs.fetch
 import acbs.parser
 
 from acbs import __version__
+from acbs.ab3cfg import is_in_stage2
 from acbs.base import ACBSPackageInfo
 from acbs.checkpoint import ACBSShrinkWrap, do_shrink_wrap, checkpoint_to_group
 from acbs.const import CONF_DIR, DUMP_DIR, LOG_DIR, TMP_DIR, AUTOBUILD_CONF_DIR
@@ -39,15 +39,13 @@ def __init__(self, args) -> None:
         self.package_cursor = 0
         self.reorder = args.reorder
         self.save_list = args.save_list
-        self.stage2 = False
         # static vars
         self.autobuild_conf_dir = AUTOBUILD_CONF_DIR
         self.conf_dir = CONF_DIR
         self.dump_dir = DUMP_DIR
         self.tmp_dir = TMP_DIR
         self.log_dir = LOG_DIR
-        self.ab3 = acbs.ab3cfg.AB3Cfg(os.path.join(AUTOBUILD_CONF_DIR, 'ab3cfg.sh'))
-        self.stage2 = self.ab3.is_in_stage2()
+        self.stage2 = is_in_stage2()
         if args.acbs_tree:
             self.tree = args.acbs_tree[0]
         self.init()

acbs/parser.py

@@ -8,11 +8,21 @@
 from acbs import bashvar
 from acbs.base import ACBSPackageInfo, ACBSSourceInfo
 from acbs.pm import filter_dependencies
-from acbs.utils import get_arch_name, tarball_pattern, fail_arch_regex, get_defines_file_path
+from acbs.utils import get_arch_name, tarball_pattern, fail_arch_regex
 
 generate_mode = False
 
 
+def get_defines_file_path(location: str, stage2: bool=False) -> str:
+    '''
+    Return ${location}/defines or ${location}/defines.stage2 depending on the value of stage2 and whether the .stage2 file exists.
+    '''
+    if stage2 and os.path.exists(os.path.join(location, 'defines.stage2')):
+        return os.path.join(location, 'defines.stage2')
+    else:
+        return os.path.join(location, 'defines')
+
+
 def parse_url_schema(url: str, checksum: str) -> ACBSSourceInfo:
     acbs_source_info = ACBSSourceInfo('none', '', '')
     url_split = url.split('::', 2)

acbs/utils.py

@@ -326,12 +326,3 @@ def format(self, record):
                               logging.INFO, logging.DEBUG):
             record.msg = f'[{lvl_map[record.levelname]}]: \033[1m{record.msg}\033[0m'
         return super(ACBSLogFormatter, self).format(record)
-
-def get_defines_file_path(location, stage2=False) -> str:
-    '''
-    Return ${location}/defines or ${location}/defines.stage2 on various conditions.
-    '''
-    if stage2 == False:
-        return os.path.join(location, 'defines')
-    if os.path.exists(os.path.join(location, 'defines.stage2')):
-        return os.path.join(location, 'defines.stage2')