From 25004cd83b01c43cf46ac08f285d8e603482afdf Mon Sep 17 00:00:00 2001 From: AustrianToast Date: Wed, 21 Jun 2023 21:40:17 +0200 Subject: [PATCH] Refactor readPacmanConfig removed one indentation --- src/Pacserver/Pacserver.cs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/Pacserver/Pacserver.cs b/src/Pacserver/Pacserver.cs index d2b61e1..1ed2f5d 100644 --- a/src/Pacserver/Pacserver.cs +++ b/src/Pacserver/Pacserver.cs @@ -36,19 +36,21 @@ public partial class PacserverUtils { string cachePath = pathsToDetermine[0]; string dbPath = pathsToDetermine[1]; - if (line.Contains(cachePath) || line.Contains(dbPath)) { - Match match = CacheDirOrDBPathRegex().Match(line); + if (!line.Contains(cachePath) && !line.Contains(dbPath)) { + continue; + } + + Match match = CacheDirOrDBPathRegex().Match(line); - if(!match.Success) { - string pathsToDetermineString = string.Join(",", pathsToDetermine); - throw new DirectoryNotFoundException("Could not determine the necessary file paths: " + pathsToDetermineString); - } - - if (line.Contains(cachePath)) { - pacmanCacheDirectory = match.ToString(); - } else if (line.Contains(dbPath)) { - pacmanDatabaseDirectory = match.ToString(); - } + if(!match.Success) { + string pathsToDetermineString = string.Join(",", pathsToDetermine); + throw new DirectoryNotFoundException("Could not determine the necessary file paths: " + pathsToDetermineString); + } + + if (line.Contains(cachePath)) { + pacmanCacheDirectory = match.ToString(); + } else if (line.Contains(dbPath)) { + pacmanDatabaseDirectory = match.ToString(); } } }