From e21190133041ecb39dffb8929563398d01a72e66 Mon Sep 17 00:00:00 2001
From: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
Date: Sun, 25 Dec 2022 22:26:51 +0200
Subject: [PATCH] Updated for flags

---
 slpkg/main.py | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/slpkg/main.py b/slpkg/main.py
index d230c87a..50376f24 100644
--- a/slpkg/main.py
+++ b/slpkg/main.py
@@ -37,12 +37,21 @@ class Argparse:
 
         self.check.blacklist(self.args)
 
-        self.options = ['--yes',
-                        '--jobs',
-                        '--resolve-off',
-                        '--reinstall',
-                        '--skip-installed',
-                        '--full-reverse']
+        self.flag_yes = '--yes'
+        self.flag_jobs = '--jobs'
+        self.flag_resolve_off = '--resolve-off'
+        self.flag_reinstall = '--reinstall'
+        self.flag_skip_installed = '--skip-installed'
+        self.flag_full_reverse = '--full-reverse'
+        self.flag_search = '--search'
+
+        self.options = [self.flag_yes,
+                        self.flag_jobs,
+                        self.flag_resolve_off,
+                        self.flag_reinstall,
+                        self.flag_skip_installed,
+                        self.flag_full_reverse,
+                        self.flag_search]
 
         # Check for correct flag
         for opt in self.args:
@@ -76,7 +85,10 @@ class Argparse:
         self.usage.help(1)
 
     def upgrade(self):
-        if [f for f in self.flags if f not in self.options[:-2]]:
+        if [f for f in self.flags if f not in [self.flag_yes,
+                                               self.flag_jobs,
+                                               self.flag_resolve_off,
+                                               self.flag_reinstall]]:
             self.usage.help(1)
 
         if len(self.args) == 1:
@@ -104,7 +116,10 @@ class Argparse:
         self.usage.help(1)
 
     def build(self):
-        if [f for f in self.flags if f not in self.options[:-3]]:
+        if [f for f in self.flags if f not in [self.flag_yes,
+                                               self.flag_jobs,
+                                               self.flag_resolve_off,
+                                               self.flag_search]]:
             self.usage.help(1)
 
         if len(self.args) >= 2:
@@ -120,7 +135,12 @@ class Argparse:
         self.usage.help(1)
 
     def install(self):
-        if [f for f in self.flags if f not in self.options[:-1]]:
+        if [f for f in self.flags if f not in [self.flag_yes,
+                                               self.flag_jobs,
+                                               self.flag_resolve_off,
+                                               self.flag_reinstall,
+                                               self.flag_skip_installed,
+                                               self.flag_search]]:
             self.usage.help(1)
 
         if len(self.args) >= 2:
@@ -136,7 +156,7 @@ class Argparse:
         self.usage.help(1)
 
     def download(self):
-        if [f for f in self.flags if f in self.options[1:]]:
+        if [f for f in self.flags if f not in [self.flag_yes]]:
             self.usage.help(1)
 
         if len(self.args) >= 2:
@@ -150,7 +170,8 @@ class Argparse:
         self.usage.help(1)
 
     def remove(self):
-        if [f for f in self.flags if f in [self.options[1], self.options[3], self.options[4]]]:
+        if [f for f in self.flags if f not in [self.flag_yes,
+                                               self.flag_resolve_off]]:
             self.usage.help(1)
 
         if len(self.args) >= 2:
@@ -199,7 +220,7 @@ class Argparse:
         self.usage.help(1)
 
     def dependees(self):
-        if [f for f in self.flags if f in self.options[:-1]]:
+        if [f for f in self.flags if f not in [self.flag_full_reverse]]:
             self.usage.help(1)
 
         if len(self.args) >= 2:
@@ -226,7 +247,7 @@ class Argparse:
         self.usage.help(1)
 
     def clean_logs(self):
-        if [f for f in self.flags if f in self.options[1:]]:
+        if [f for f in self.flags if f not in [self.flag_yes]]:
             self.usage.help(1)
 
         if len(self.args) == 1: