From 6c705d9717a5ece1c950acf43e45a1e1245681fa Mon Sep 17 00:00:00 2001
From: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
Date: Sun, 16 Feb 2020 17:49:41 +0100
Subject: [PATCH] Updated utils

Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
---
 slpkg/repoinfo.py     | 11 +++++------
 slpkg/repositories.py |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/slpkg/repoinfo.py b/slpkg/repoinfo.py
index f64dd1ac..018abf81 100644
--- a/slpkg/repoinfo.py
+++ b/slpkg/repoinfo.py
@@ -31,7 +31,7 @@ from slpkg.repolist import RepoList
 from slpkg.__metadata__ import MetaData as _meta_
 
 
-class RepoInfo:
+class RepoInfo(Utils):
     """Repository information
     """
     def __init__(self):
@@ -39,7 +39,6 @@ class RepoInfo:
         self.red = _meta_.color["RED"]
         self.endc = _meta_.color["ENDC"]
         self.repo = Repo()
-        self.utils = Utils()
         self.form = {
             "Last updated:": "",
             "Number of packages:": "",
@@ -89,13 +88,13 @@ class RepoInfo:
             status = f"{self.green}enabled{self.endc}"
             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."
                     "TXT").splitlines()):
                 if line.startswith("SLACKBUILD NAME: "):
                     sum_sbo_pkgs += 1
 
-            changelog_txt = self.utils.read_file(
+            changelog_txt = self.read_file(
                 f"{self.meta.log_path}sbo/ChangeLog.txt")
             last_upd = changelog_txt.split("\n", 1)[0]
 
@@ -116,7 +115,7 @@ class RepoInfo:
         sum_pkgs, size, unsize, last_upd = 0, [], [], ""
         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;"):
                 last_upd = line[14:].strip()
             if line.startswith("PACKAGE NAME:"):
@@ -127,7 +126,7 @@ class RepoInfo:
                 unsize.append(line[30:-2].strip())
 
         if repo in ["salix", "slackl"]:
-            log = self.utils.read_file(
+            log = self.read_file(
                 f"{self.meta.log_path}{repo}/ChangeLog.txt")
             last_upd = log.split("\n", 1)[0]
 
diff --git a/slpkg/repositories.py b/slpkg/repositories.py
index b8058886..5b74dcdc 100644
--- a/slpkg/repositories.py
+++ b/slpkg/repositories.py
@@ -28,7 +28,7 @@ from slpkg.utils import Utils
 from slpkg.__metadata__ import MetaData as _meta_
 
 
-class Repo:
+class Repo(Utils):
     """Manage repositories configuration files
     """
     def __init__(self):
@@ -36,9 +36,9 @@ class Repo:
         self.DEFAULT_REPOS_NAMES = self.meta.default_repositories
         self.custom_repo_file = "/etc/slpkg/custom-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.default_repositories_list = Utils().read_file(
+        self.default_repositories_list = self.read_file(
             self.default_repo_file)
         self.default_repository()
 
@@ -116,7 +116,7 @@ class Repo:
         if self.meta.arch.startswith("arm"):
             default = "http://ftp.arm.slackware.com/slackwarearm/"
         if os.path.isfile("/etc/slpkg/slackware-mirrors"):
-            mirrors = Utils().read_file(
+            mirrors = self.read_file(
                 f"{self.meta.conf_path}slackware-mirrors")
             for line in mirrors.splitlines():
                 line = line.rstrip()