From c51b6fa4e0974a5d82cc40fde2c90537a5097fe7 Mon Sep 17 00:00:00 2001
From: Jasur Sadikov <jasur@sadikoff.com>
Date: Sat, 7 Sep 2024 20:52:48 +0200
Subject: [PATCH 1/4] Multilabel and not-label support added

---
 README.md |  3 ++-
 config.py | 47 +++++++++++++++++++++++------------------------
 mud.py    | 17 +++++++++++++----
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index d432fbf..66e6bc5 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,8 @@ All entries are stored in `.mudconfig` in XML format. After making your first en
 - `mud update` - check for available updates.
 
 ### Arguments
-- `-l=<label>` or `--label=<label>` - filters out repositories by mud labels.
+- `-l=<label>` or `--label=<label>` - filters out repositories with provided label.
+- `-nl=<label>` or `--not-label=<label>` - filters out repositories excluding provided label.
 - `-b=<branch>` or `--branch=<branch>` - filters out repositories by current branch name.
 - `-m` or `--modified` - filters out modified repositories.
 - `-d` or `--diverged` - filters repositories with diverged branches.
diff --git a/config.py b/config.py
index 1872c1a..a686f59 100644
--- a/config.py
+++ b/config.py
@@ -5,7 +5,6 @@
 
 from styles import *
 from typing import List, Dict
-from xml.dom import minidom
 
 
 class Config:
@@ -37,6 +36,23 @@ def _filter_labels(label: str):
 		with open(file_path, 'w') as file:
 			file.write(pretty_xml)
 
+	def load(self, file_path: str) -> None:
+		self.data = {}
+		tree = ElementTree.parse(file_path)
+		root = tree.getroot()
+		for dir_element in root.findall('dir'):
+			path = dir_element.get('path')
+			if not os.path.isdir(path):
+				utils.print_error(f'Invalid path {BOLD}{path}{RESET}.')
+				continue
+
+			if not os.path.isdir(os.path.join(path, '.git')):
+				utils.print_error(f'{BOLD}.git{RESET} directory not found at target "{path}".')
+				continue
+
+			labels = [label.strip() for label in dir_element.get('label', '').split(',') if label.strip()]
+			self.data[path] = labels
+
 	def find(self) -> None:
 		if os.path.exists(utils.CONFIG_FILE_NAME):
 			self.load(utils.CONFIG_FILE_NAME)
@@ -63,35 +79,18 @@ def find(self) -> None:
 		utils.print_error(f'{BOLD}.mudconfig{RESET} file was not found. Type `mud init` to create configuration file.')
 		return
 
-	def load(self, file_path: str) -> None:
-		self.data = {}
-		tree = ElementTree.parse(file_path)
-		root = tree.getroot()
-		for dir_element in root.findall('dir'):
-			path = dir_element.get('path')
-			if not os.path.isdir(path):
-				utils.print_error(f'Invalid path {BOLD}{path}{RESET}.')
-				continue
-
-			if not os.path.isdir(os.path.join(path, '.git')):
-				utils.print_error(f'{BOLD}.git{RESET} directory not found at target "{path}".')
-				continue
-
-			labels = [label.strip() for label in dir_element.get('label', '').split(',') if label.strip()]
-			self.data[path] = labels
-
-	def all(self) -> Dict[str, List[str]]:
-		return self.data
 
 	def paths(self) -> List[str]:
 		return list(self.data.keys())
 
-	def with_label(self, label: str) -> Dict[str, List[str]]:
+	def filter_label(self, label: str, repos: Dict[str, List[str]] = None, include: bool = True) -> Dict[str, List[str]]:
+		if repos is None:
+			repos = self.data
 		if label == '':
-			return self.all()
+			return repos
 		result = {}
-		for path, labels in self.data.items():
-			if label in labels:
+		for path, labels in repos.items():
+			if (include and label in labels) or (not include and label not in labels):
 				result[path] = labels
 		return result
 
diff --git a/mud.py b/mud.py
index 246d6b0..5b1c810 100644
--- a/mud.py
+++ b/mud.py
@@ -13,6 +13,7 @@
 # Filters
 TABLE_ATTR = '-t', '--table'
 LABEL_PREFIX = '-l=', '--label='
+NOT_LABEL_PREFIX = '-nl=', '--not-label='
 BRANCH_PREFIX = '-b=', '--branch='
 MODIFIED_ATTR = '-m', '--modified'
 DIVERGED_ATTR = '-d', '--diverged'
@@ -65,7 +66,8 @@ def _create_parser() -> ArgumentParser:
 		remove_parser.add_argument('path', help='Repository to remove (optional).', nargs='?', type=str)
 
 		parser.add_argument(*TABLE_ATTR, metavar='TABLE', nargs='?', default='', type=str, help=f'Switches table view, runs in table view it is disabled in {BOLD}.mudsettings{RESET}.')
-		parser.add_argument(*LABEL_PREFIX, metavar='LABEL', nargs='?', default='', type=str, help='Filters repositories by provided label.')
+		parser.add_argument(*LABEL_PREFIX, metavar='LABEL', nargs='?', default='', type=str, help='Selects repositories with provided label.')
+		parser.add_argument(*NOT_LABEL_PREFIX, metavar='NOT_LABEL', nargs='?', default='', type=str, help='Selects repositories without provided label.')
 		parser.add_argument(*BRANCH_PREFIX, metavar='BRANCH', nargs='?', default='', type=str, help='Filter repositories by provided branch.')
 		parser.add_argument(*MODIFIED_ATTR, action='store_true', help='Filters modified repositories.')
 		parser.add_argument(*DIVERGED_ATTR, action='store_true', help='Filters repositories with diverged branches.')
@@ -158,7 +160,8 @@ def run(self) -> None:
 
 	# Filter out repositories if user provided filters
 	def _filter_repos(self) -> None:
-		self.repos = self.config.all()
+		self.repos = self.config.filter_label('ignore', self.config.data, False)
+		filtered = {}
 		branch = None
 		modified = False
 		diverged = False
@@ -168,9 +171,14 @@ def _filter_repos(self) -> None:
 			arg = sys.argv[index]
 			if arg.startswith('-'):
 				arg = sys.argv[1:][index - 1]
-				if any(arg.startswith(prefix) for prefix in LABEL_PREFIX):
+				if any(arg.startswith(prefix) for prefix in LABEL_PREFIX) or (arg.startswith(prefix) for prefix in NOT_LABEL_PREFIX):
 					label = arg.split('=', 1)[1]
-					self.repos = self.config.with_label(label)
+					include = any(arg.startswith(prefix) for prefix in LABEL_PREFIX)
+					for path, labels in self.config.filter_label(label, self.repos).items():
+						if include:
+							filtered[path] = labels
+						elif path in filtered:
+							del filtered[path]
 				elif any(arg.startswith(prefix) for prefix in BRANCH_PREFIX):
 					branch = arg.split('=', 1)[1]
 				elif arg in TABLE_ATTR:
@@ -185,6 +193,7 @@ def _filter_repos(self) -> None:
 				del sys.argv[index]
 				continue
 			break
+		self.repos = filtered
 		directory = os.getcwd()
 		to_delete = []
 		for repo in self.repos:

From 8c4c32a9fbbe6219c636227a18a7d5d1b8bbb0a8 Mon Sep 17 00:00:00 2001
From: Jasur Sadikov <jasur@sadikoff.com>
Date: Sat, 7 Sep 2024 20:53:51 +0200
Subject: [PATCH 2/4] WIP

---
 config.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/config.py b/config.py
index a686f59..af3165a 100644
--- a/config.py
+++ b/config.py
@@ -5,6 +5,7 @@
 
 from styles import *
 from typing import List, Dict
+from xml.dom import minidom
 
 
 class Config:
@@ -36,23 +37,6 @@ def _filter_labels(label: str):
 		with open(file_path, 'w') as file:
 			file.write(pretty_xml)
 
-	def load(self, file_path: str) -> None:
-		self.data = {}
-		tree = ElementTree.parse(file_path)
-		root = tree.getroot()
-		for dir_element in root.findall('dir'):
-			path = dir_element.get('path')
-			if not os.path.isdir(path):
-				utils.print_error(f'Invalid path {BOLD}{path}{RESET}.')
-				continue
-
-			if not os.path.isdir(os.path.join(path, '.git')):
-				utils.print_error(f'{BOLD}.git{RESET} directory not found at target "{path}".')
-				continue
-
-			labels = [label.strip() for label in dir_element.get('label', '').split(',') if label.strip()]
-			self.data[path] = labels
-
 	def find(self) -> None:
 		if os.path.exists(utils.CONFIG_FILE_NAME):
 			self.load(utils.CONFIG_FILE_NAME)
@@ -79,6 +63,22 @@ def find(self) -> None:
 		utils.print_error(f'{BOLD}.mudconfig{RESET} file was not found. Type `mud init` to create configuration file.')
 		return
 
+	def load(self, file_path: str) -> None:
+		self.data = {}
+		tree = ElementTree.parse(file_path)
+		root = tree.getroot()
+		for dir_element in root.findall('dir'):
+			path = dir_element.get('path')
+			if not os.path.isdir(path):
+				utils.print_error(f'Invalid path {BOLD}{path}{RESET}.')
+				continue
+
+			if not os.path.isdir(os.path.join(path, '.git')):
+				utils.print_error(f'{BOLD}.git{RESET} directory not found at target "{path}".')
+				continue
+
+			labels = [label.strip() for label in dir_element.get('label', '').split(',') if label.strip()]
+			self.data[path] = labels
 
 	def paths(self) -> List[str]:
 		return list(self.data.keys())

From 65e08dbd1733d0470c1a6bf49f57dd1881672a5c Mon Sep 17 00:00:00 2001
From: Jasur Sadikov <jasur@sadikoff.com>
Date: Sat, 7 Sep 2024 21:01:30 +0200
Subject: [PATCH 3/4] WIP

---
 mud.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mud.py b/mud.py
index 5b1c810..8762958 100644
--- a/mud.py
+++ b/mud.py
@@ -161,6 +161,7 @@ def run(self) -> None:
 	# Filter out repositories if user provided filters
 	def _filter_repos(self) -> None:
 		self.repos = self.config.filter_label('ignore', self.config.data, False)
+		any_filters = False
 		filtered = {}
 		branch = None
 		modified = False
@@ -172,6 +173,7 @@ def _filter_repos(self) -> None:
 			if arg.startswith('-'):
 				arg = sys.argv[1:][index - 1]
 				if any(arg.startswith(prefix) for prefix in LABEL_PREFIX) or (arg.startswith(prefix) for prefix in NOT_LABEL_PREFIX):
+					any_filters = True
 					label = arg.split('=', 1)[1]
 					include = any(arg.startswith(prefix) for prefix in LABEL_PREFIX)
 					for path, labels in self.config.filter_label(label, self.repos).items():
@@ -193,7 +195,7 @@ def _filter_repos(self) -> None:
 				del sys.argv[index]
 				continue
 			break
-		self.repos = filtered
+		self.repos = filtered if any_filters else self.repos
 		directory = os.getcwd()
 		to_delete = []
 		for repo in self.repos:

From 09da5ad553070d601c6066739a65435988bb0923 Mon Sep 17 00:00:00 2001
From: Jasur Sadikov <jasur@sadikoff.com>
Date: Sat, 7 Sep 2024 21:02:57 +0200
Subject: [PATCH 4/4] WIP

---
 config.py | 4 ++--
 mud.py    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config.py b/config.py
index af3165a..a9fa5d9 100644
--- a/config.py
+++ b/config.py
@@ -83,14 +83,14 @@ def load(self, file_path: str) -> None:
 	def paths(self) -> List[str]:
 		return list(self.data.keys())
 
-	def filter_label(self, label: str, repos: Dict[str, List[str]] = None, include: bool = True) -> Dict[str, List[str]]:
+	def filter_label(self, label: str, repos: Dict[str, List[str]] = None) -> Dict[str, List[str]]:
 		if repos is None:
 			repos = self.data
 		if label == '':
 			return repos
 		result = {}
 		for path, labels in repos.items():
-			if (include and label in labels) or (not include and label not in labels):
+			if label in labels:
 				result[path] = labels
 		return result
 
diff --git a/mud.py b/mud.py
index 8762958..1e72991 100644
--- a/mud.py
+++ b/mud.py
@@ -160,7 +160,9 @@ def run(self) -> None:
 
 	# Filter out repositories if user provided filters
 	def _filter_repos(self) -> None:
-		self.repos = self.config.filter_label('ignore', self.config.data, False)
+		self.repos = self.config.data
+		for path, labels in self.config.filter_label('ignore', self.config.data).items():
+			del self.repos[path]
 		any_filters = False
 		filtered = {}
 		branch = None