ProfessionalUwU/pacserver
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

WIP: Road to v1.0.0 #6

Draft
ProfessionalUwU wants to merge 5 commits from fix/Pacserver into dev
pull from: fix/Pacserver
merge into: ProfessionalUwU:dev
Conversation 0 Commits 5 Files Changed 6 +14 -12
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25004cd83b - Show all commits

26
src/Pacserver/Pacserver.cs
View File

@ -36,19 +36,21 @@ public partial class PacserverUtils {
string cachePath = pathsToDetermine[0]; string cachePath = pathsToDetermine[0];
string dbPath = pathsToDetermine[1]; string dbPath = pathsToDetermine[1];
if (line.Contains(cachePath) || line.Contains(dbPath)) { if (!line.Contains(cachePath) && !line.Contains(dbPath)) {
Match match = CacheDirOrDBPathRegex().Match(line); continue;
}
Match match = CacheDirOrDBPathRegex().Match(line);
if(!match.Success) { if(!match.Success) {
string pathsToDetermineString = string.Join(",", pathsToDetermine); string pathsToDetermineString = string.Join(",", pathsToDetermine);
throw new DirectoryNotFoundException("Could not determine the necessary file paths: " + pathsToDetermineString); throw new DirectoryNotFoundException("Could not determine the necessary file paths: " + pathsToDetermineString);
} }
if (line.Contains(cachePath)) { if (line.Contains(cachePath)) {
pacmanCacheDirectory = match.ToString(); pacmanCacheDirectory = match.ToString();
} else if (line.Contains(dbPath)) { } else if (line.Contains(dbPath)) {
pacmanDatabaseDirectory = match.ToString(); pacmanDatabaseDirectory = match.ToString();
}
} }
} }
} }