mirror of
https://gitlab.com/dslackw/slpkg.git
synced 2025-01-18 10:26:29 +01:00
Removed status bar
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
parent
90a5649ad5
commit
7ff99c075f
11 changed files with 3 additions and 37 deletions
|
@ -115,10 +115,6 @@ SLACKPKG_LOG=on
|
|||
# packages required for distribution.
|
||||
ONLY_INSTALLED=off
|
||||
|
||||
# Enable or disable the progress bar. Status bar progress delays the search
|
||||
# process in package lists. Default is "off".
|
||||
PRG_BAR=off
|
||||
|
||||
# Register a text editor that uses the slpkg in a few options.
|
||||
# Default is "nano".
|
||||
EDITOR=nano
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
from pkg_resources import parse_version
|
||||
|
||||
from slpkg.messages import Msg
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.splitting import split_package
|
||||
from slpkg.upgrade_checklist import choose_upg
|
||||
from slpkg.__metadata__ import MetaData as _meta_
|
||||
|
@ -48,7 +47,6 @@ def pkg_upgrade(repo, skip, flag):
|
|||
# unsize = data[3]
|
||||
data = repo_data(PACKAGES_TXT, repo, flag="")
|
||||
for pkg in installed():
|
||||
status(0.0005)
|
||||
inst_pkg = split_package(pkg)
|
||||
for name in data[0]:
|
||||
if name: # this tips because some pkg_name is empty
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
import sys
|
||||
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.__metadata__ import MetaData as _meta_
|
||||
|
||||
from slpkg.binary.greps import Requires
|
||||
|
@ -48,7 +47,6 @@ class Dependencies:
|
|||
requires = Requires(name, self.repo).get_deps()
|
||||
if requires:
|
||||
for req in requires:
|
||||
status(0)
|
||||
if req and req not in self.black:
|
||||
dependencies.append(req)
|
||||
if dependencies:
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
|
||||
from slpkg.utils import Utils
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.splitting import split_package
|
||||
from slpkg.__metadata__ import MetaData as _meta_
|
||||
|
||||
|
@ -36,9 +35,6 @@ def repo_data(PACKAGES_TXT, repo, flag):
|
|||
(name, location, size, unsize,
|
||||
rname, rlocation, rsize, runsize) = ([] for i in range(8))
|
||||
for line in PACKAGES_TXT.splitlines():
|
||||
if _meta_.rsl_deps in ["on", "ON"] and "--resolve-off" not in flag:
|
||||
status(0.000005)
|
||||
|
||||
if line.startswith("PACKAGE NAME:"):
|
||||
name.append(line[15:].strip())
|
||||
if line.startswith("PACKAGE LOCATION:"):
|
||||
|
|
|
@ -28,7 +28,6 @@ from pkg_resources import parse_version
|
|||
from slpkg.utils import Utils
|
||||
from slpkg.sizes import units
|
||||
from slpkg.messages import Msg
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.checksum import check_md5
|
||||
from slpkg.blacklist import BlackList
|
||||
from slpkg.downloader import Download
|
||||
|
@ -266,7 +265,6 @@ class BinaryInstall:
|
|||
self.flag != "--resolve-off"):
|
||||
self.msg.resolving()
|
||||
for dep in self.packages:
|
||||
status(0.05)
|
||||
dependencies = []
|
||||
dependencies = Utils().dimensional_list(Dependencies(
|
||||
self.repo, self.blacklist).binary(dep, self.flag))
|
||||
|
|
|
@ -123,8 +123,6 @@ class Initialization:
|
|||
CHECKSUMS_MD5 = mirrors(md5_file, "")
|
||||
self.EXTRA = mirrors(lib_file, dirs[1])
|
||||
self.EXT_CHECKSUMS = mirrors(md5_file, dirs[1])
|
||||
# self.PASTURE = mirrors(lib_file, dirs[2])
|
||||
# self.PAS_CHECKSUMS = mirrors(md5_file, dirs[2])
|
||||
self.PATCHES = mirrors(lib_file, dirs[2])
|
||||
self.PAT_CHECKSUMS = mirrors(md5_file, dirs[2])
|
||||
ChangeLog_txt = mirrors(log_file, "")
|
||||
|
@ -134,9 +132,6 @@ class Initialization:
|
|||
self.down(lib + dirs[0], CHECKSUMS_MD5, repo_name)
|
||||
self.down(lib + dirs[1], self.EXTRA, repo_name)
|
||||
self.down(lib + dirs[1], self.EXT_CHECKSUMS, repo_name)
|
||||
# if slack_ver() != "14.0": # no pasture/ folder for 14.0 version
|
||||
# self.down(lib + dirs[2], self.PASTURE, repo_name)
|
||||
# self.down(lib + dirs[2], self.PAS_CHECKSUMS, repo_name)
|
||||
self.down(lib + dirs[2], self.PATCHES, repo_name)
|
||||
self.down(lib + dirs[2], self.PAT_CHECKSUMS, repo_name)
|
||||
self.down(log, ChangeLog_txt, repo_name)
|
||||
|
@ -675,9 +670,6 @@ class Initialization:
|
|||
self.down(lib_path + "core/", CHECKSUMS_MD5, repo)
|
||||
self.down(lib_path + "extra/", self.EXTRA, repo)
|
||||
self.down(lib_path + "extra/", self.EXT_CHECKSUMS, repo)
|
||||
# if slack_ver() != "14.0": # no pasture/ folder for 14.0 version
|
||||
# self.down(lib_path + "pasture/", self.PASTURE, repo)
|
||||
# self.down(lib_path + "pasture/", self.PAS_CHECKSUMS, repo)
|
||||
# download new files
|
||||
if repo != "slack":
|
||||
self.down(lib_path, PACKAGES_TXT, repo)
|
||||
|
|
|
@ -26,7 +26,6 @@ import os
|
|||
from pkg_resources import parse_version
|
||||
|
||||
from slpkg.messages import Msg
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.blacklist import BlackList
|
||||
from slpkg.splitting import split_package
|
||||
from slpkg.upgrade_checklist import choose_upg
|
||||
|
@ -43,7 +42,6 @@ def sbo_upgrade(skip, flag):
|
|||
data = SBoGrep(name="").names()
|
||||
blacklist = BlackList().packages(pkgs=data, repo="sbo")
|
||||
for pkg in sbo_list():
|
||||
status(0.02)
|
||||
name = split_package(pkg)[0]
|
||||
ver = split_package(pkg)[1]
|
||||
if (name in data and name not in skip and name not in blacklist):
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
import sys
|
||||
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.blacklist import BlackList
|
||||
from slpkg.__metadata__ import MetaData as _meta_
|
||||
|
||||
|
@ -52,8 +51,6 @@ class Requires:
|
|||
requires = SBoGrep(name).requires()
|
||||
if requires:
|
||||
for req in requires:
|
||||
status(0.03)
|
||||
# toolbar_width = status(index, toolbar_width, 1)
|
||||
# avoid to add %README% as dependency and
|
||||
# if require in blacklist
|
||||
if "%README%" not in req and req not in self.blacklist:
|
||||
|
|
|
@ -28,7 +28,6 @@ from pkg_resources import parse_version
|
|||
|
||||
from slpkg.utils import Utils
|
||||
from slpkg.messages import Msg
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.log_deps import write_deps
|
||||
from slpkg.blacklist import BlackList
|
||||
from slpkg.downloader import Download
|
||||
|
@ -99,7 +98,6 @@ class SBoInstall:
|
|||
self.is_upgrade = is_upgrade
|
||||
self.case_insensitive()
|
||||
for _sbo in self.slackbuilds:
|
||||
status(0.03)
|
||||
if _sbo in self.data and _sbo not in self.blacklist:
|
||||
sbo_deps = Requires(self.flag).sbo(_sbo)
|
||||
self.deps += sbo_deps
|
||||
|
@ -233,7 +231,6 @@ class SBoInstall:
|
|||
"""
|
||||
sbo_versions, sources = [], []
|
||||
for sbo in slackbuilds:
|
||||
status(0.02)
|
||||
sbo_ver = f"{sbo}-{SBoGrep(sbo).version()}"
|
||||
sbo_versions.append(sbo_ver)
|
||||
sources.append(SBoGrep(sbo).source())
|
||||
|
|
|
@ -31,7 +31,6 @@ from slpkg.utils import Utils
|
|||
from slpkg.sizes import units
|
||||
from slpkg.messages import Msg
|
||||
from slpkg.url_read import URL
|
||||
from slpkg.toolbar import status
|
||||
from slpkg.checksum import check_md5
|
||||
from slpkg.blacklist import BlackList
|
||||
from slpkg.downloader import Download
|
||||
|
@ -138,7 +137,6 @@ class Patches:
|
|||
data = repo_data(self.PACKAGES_TXT, "slack", self.flag)
|
||||
black = BlackList().packages(pkgs=data[0], repo="slack")
|
||||
for name, loc, comp, uncomp in zip(data[0], data[1], data[2], data[3]):
|
||||
status(0.0003)
|
||||
repo_pkg_name = split_package(name)[0]
|
||||
if (not os.path.isfile(self.meta.pkg_path + name[:-4]) and
|
||||
repo_pkg_name not in black and
|
||||
|
@ -163,9 +161,8 @@ class Patches:
|
|||
text = "Press 'spacebar' to unchoose packages from upgrade"
|
||||
title = " Upgrade "
|
||||
backtitle = f"{self.meta.__all__} {self.meta.__version__}"
|
||||
status = True
|
||||
pkgs = DialogUtil(data, text, title, backtitle,
|
||||
status).checklist()
|
||||
status=True).checklist()
|
||||
index = 0
|
||||
for pkg, comp, uncomp in zip(self.upgrade_all, self.comp_sum,
|
||||
self.uncomp_sum):
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
import sys
|
||||
import time
|
||||
|
||||
from slpkg.__metadata__ import MetaData as _meta_
|
||||
|
|
Loading…
Reference in a new issue