From ec7deec5b851d582f7ada4803033d5044673ecf3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Mar 2023 20:10:34 +0000 Subject: remoteTable -> rmt_tbl; localTable -> lcl_tbl; remoteCSV -> rmt_csv; localCSV -> lcl_csv --- src/backend/autoremove.py | 4 ++-- src/backend/install.py | 10 +++++----- src/backend/recoverdb.py | 4 ++-- src/backend/syncdb.py | 12 ++++++------ src/backend/syncspm.py | 2 +- src/backend/uninstall.py | 6 +++--- src/backend/update.py | 2 +- src/backend/upgrade.py | 10 +++++----- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py index 4dd56d2..7ea7fb4 100644 --- a/src/backend/autoremove.py +++ b/src/backend/autoremove.py @@ -15,7 +15,7 @@ def start(): p_exe = subprocess.Popen( ['emerge', '--quiet', '--depclean', '--ask']) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() else: print(sisyphus.getcolor.bright_red + "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset) @@ -32,4 +32,4 @@ def xstart(): print(p_out.rstrip()) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() diff --git a/src/backend/install.py b/src/backend/install.py index a9cec1b..f4639eb 100644 --- a/src/backend/install.py +++ b/src/backend/install.py @@ -37,7 +37,7 @@ def start(pkgname): p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -92,7 +92,7 @@ def estart(pkgname): p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -122,7 +122,7 @@ def estart(pkgname): p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -143,7 +143,7 @@ def estart(pkgname): p_exe = subprocess.Popen( ['emerge', '--quiet', '--verbose', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -187,4 +187,4 @@ def xstart(pkgname): print(p_out.rstrip()) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() diff --git a/src/backend/recoverdb.py b/src/backend/recoverdb.py index 59675ad..7509052 100644 --- a/src/backend/recoverdb.py +++ b/src/backend/recoverdb.py @@ -17,5 +17,5 @@ def start(): if os.path.exists(sisyphus.getfs.lcl_db): os.remove(sisyphus.getfs.lcl_db) - sisyphus.syncdb.remoteTable() - sisyphus.syncdb.localTable() + sisyphus.syncdb.rmt_tbl() + sisyphus.syncdb.lcl_tbl() diff --git a/src/backend/syncdb.py b/src/backend/syncdb.py index 308ca8a..b942a12 100644 --- a/src/backend/syncdb.py +++ b/src/backend/syncdb.py @@ -9,7 +9,7 @@ import sisyphus.getenv import sisyphus.getfs -def remoteCSV(): +def rmt_csv(): pcsv_addr, dcsv_addr = sisyphus.getenv.csv_addr() http = urllib3.PoolManager() @@ -20,12 +20,12 @@ def remoteCSV(): shutil.copyfileobj(tmp_buffer, output_file) -def localCSV(): +def lcl_csv(): subprocess.call(['/usr/share/sisyphus/helpers/make_local_csv']) -def remoteTable(): - remoteCSV() +def rmt_tbl(): + rmt_csv() sisyphusdb = sqlite3.connect(sisyphus.getfs.lcl_db) sisyphusdb.cursor().execute('''drop table if exists remote_packages''') @@ -49,8 +49,8 @@ def remoteTable(): sisyphusdb.close() -def localTable(): - localCSV() +def lcl_tbl(): + lcl_csv() sisyphusdb = sqlite3.connect(sisyphus.getfs.lcl_db) sisyphusdb.cursor().execute('''drop table if exists local_packages''') diff --git a/src/backend/syncspm.py b/src/backend/syncspm.py index abe6f90..c93b4fb 100644 --- a/src/backend/syncspm.py +++ b/src/backend/syncspm.py @@ -6,4 +6,4 @@ import sisyphus.syncdb @animation.wait('syncing spm changes') def start(): - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() diff --git a/src/backend/uninstall.py b/src/backend/uninstall.py index de58fa3..4c54d7b 100644 --- a/src/backend/uninstall.py +++ b/src/backend/uninstall.py @@ -15,7 +15,7 @@ def start(pkgname): p_exe = subprocess.Popen( ['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname)) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() else: print(sisyphus.getcolor.bright_red + "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset) @@ -27,7 +27,7 @@ def fstart(pkgname): p_exe = subprocess.Popen( ['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname)) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() else: print(sisyphus.getcolor.bright_red + "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset) @@ -44,4 +44,4 @@ def xstart(pkgname): print(p_out.rstrip()) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() diff --git a/src/backend/update.py b/src/backend/update.py index 57b05b6..2bd11b0 100644 --- a/src/backend/update.py +++ b/src/backend/update.py @@ -15,7 +15,7 @@ def syncAll(): sisyphus.syncenv.gentooRepo() sisyphus.syncenv.redcoreRepo() sisyphus.syncenv.portageConfigRepo() - sisyphus.syncdb.remoteTable() + sisyphus.syncdb.rmt_tbl() @animation.wait('fetching updates') diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py index dacfcd7..da51ee4 100644 --- a/src/backend/upgrade.py +++ b/src/backend/upgrade.py @@ -37,7 +37,7 @@ def start(): p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -92,7 +92,7 @@ def estart(): p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -122,7 +122,7 @@ def estart(): p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -143,7 +143,7 @@ def estart(): p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() break elif user_input.lower() in ['no', 'n']: print(sisyphus.getcolor.bright_green + @@ -192,6 +192,6 @@ def xstart(): print(p_out.rstrip()) p_exe.wait() - sisyphus.syncdb.localTable() + sisyphus.syncdb.lcl_tbl() else: print("\nNo package upgrades found!\n") -- cgit v1.2.3