Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-02-11 20:48:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated utils

Browse source 
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
Dimitris Zlatanidis 2020-02-16 17:49:41 +01:00
parent 254d19314c
commit 6c705d9717
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
slpkg/repoinfo.py
View file

@ -31,7 +31,7 @@ from slpkg.repolist import RepoList
from slpkg.__metadata__ import MetaData as _meta_ from slpkg.__metadata__ import MetaData as _meta_
class RepoInfo: class RepoInfo(Utils):
"""Repository information """Repository information
""" """
def __init__(self): def __init__(self):
@ -39,7 +39,6 @@ class RepoInfo:
self.red = _meta_.color["RED"] self.red = _meta_.color["RED"]
self.endc = _meta_.color["ENDC"] self.endc = _meta_.color["ENDC"]
self.repo = Repo() self.repo = Repo()
self.utils = Utils()
self.form = { self.form = {
"Last updated:": "", "Last updated:": "",
"Number of packages:": "", "Number of packages:": "",
@ -89,13 +88,13 @@ class RepoInfo:
status = f"{self.green}enabled{self.endc}" status = f"{self.green}enabled{self.endc}"
sum_sbo_pkgs = 0 sum_sbo_pkgs = 0
for line in (self.utils.read_file( for line in (self.read_file(
f"{self.meta.lib_path}sbo_repo/SLACKBUILDS." f"{self.meta.lib_path}sbo_repo/SLACKBUILDS."
"TXT").splitlines()): "TXT").splitlines()):
if line.startswith("SLACKBUILD NAME: "): if line.startswith("SLACKBUILD NAME: "):
sum_sbo_pkgs += 1 sum_sbo_pkgs += 1
changelog_txt = self.utils.read_file( changelog_txt = self.read_file(
f"{self.meta.log_path}sbo/ChangeLog.txt") f"{self.meta.log_path}sbo/ChangeLog.txt")
last_upd = changelog_txt.split("\n", 1)[0] last_upd = changelog_txt.split("\n", 1)[0]
@ -116,7 +115,7 @@ class RepoInfo:
sum_pkgs, size, unsize, last_upd = 0, [], [], "" sum_pkgs, size, unsize, last_upd = 0, [], [], ""
f = f"{self.meta.lib_path}{repo}_repo/PACKAGES.TXT" f = f"{self.meta.lib_path}{repo}_repo/PACKAGES.TXT"
for line in self.utils.read_file(f).splitlines(): for line in self.read_file(f).splitlines():
if line.startswith("PACKAGES.TXT;"): if line.startswith("PACKAGES.TXT;"):
last_upd = line[14:].strip() last_upd = line[14:].strip()
if line.startswith("PACKAGE NAME:"): if line.startswith("PACKAGE NAME:"):
@ -127,7 +126,7 @@ class RepoInfo:
unsize.append(line[30:-2].strip()) unsize.append(line[30:-2].strip())
if repo in ["salix", "slackl"]: if repo in ["salix", "slackl"]:
log = self.utils.read_file( log = self.read_file(
f"{self.meta.log_path}{repo}/ChangeLog.txt") f"{self.meta.log_path}{repo}/ChangeLog.txt")
last_upd = log.split("\n", 1)[0] last_upd = log.split("\n", 1)[0]

8
slpkg/repositories.py
View file

@ -28,7 +28,7 @@ from slpkg.utils import Utils
from slpkg.__metadata__ import MetaData as _meta_ from slpkg.__metadata__ import MetaData as _meta_
class Repo: class Repo(Utils):
"""Manage repositories configuration files """Manage repositories configuration files
""" """
def __init__(self): def __init__(self):
@ -36,9 +36,9 @@ class Repo:
self.DEFAULT_REPOS_NAMES = self.meta.default_repositories self.DEFAULT_REPOS_NAMES = self.meta.default_repositories
self.custom_repo_file = "/etc/slpkg/custom-repositories" self.custom_repo_file = "/etc/slpkg/custom-repositories"
self.default_repo_file = "/etc/slpkg/default-repositories" self.default_repo_file = "/etc/slpkg/default-repositories"
self.custom_repositories_list = Utils().read_file( self.custom_repositories_list = self.read_file(
self.custom_repo_file) self.custom_repo_file)
self.default_repositories_list = Utils().read_file( self.default_repositories_list = self.read_file(
self.default_repo_file) self.default_repo_file)
self.default_repository() self.default_repository()
@ -116,7 +116,7 @@ class Repo:
if self.meta.arch.startswith("arm"): if self.meta.arch.startswith("arm"):
default = "http://ftp.arm.slackware.com/slackwarearm/" default = "http://ftp.arm.slackware.com/slackwarearm/"
if os.path.isfile("/etc/slpkg/slackware-mirrors"): if os.path.isfile("/etc/slpkg/slackware-mirrors"):
mirrors = Utils().read_file( mirrors = self.read_file(
f"{self.meta.conf_path}slackware-mirrors") f"{self.meta.conf_path}slackware-mirrors")
for line in mirrors.splitlines(): for line in mirrors.splitlines():
line = line.rstrip() line = line.rstrip()