v4.0.3

alienator88 · Dec 16, 2024 · 1e8c6dc · 1e8c6dc
1 parent f5e8253
commit 1e8c6dc
Show file tree

Hide file tree

Showing 6 changed files with 1,415 additions and 128 deletions.
diff --git a/Pearcleaner.xcodeproj/project.pbxproj b/Pearcleaner.xcodeproj/project.pbxproj
@@ -51,7 +51,6 @@
 		C7F8436C2CBF066F00E3E30A /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = C7F8436A2CBF066F00E3E30A /* Localizable.xcstrings */; };
 		C7FB173B2B96321300B96F9A /* AppsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7FB173A2B96321300B96F9A /* AppsListView.swift */; };
 		C7FEBA112BDC422200AE195F /* AppSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7FEBA102BDC422200AE195F /* AppSearchView.swift */; };
-		CE0934E32CFE9B9C00073AEB /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = CE0934E22CFE9B9C00073AEB /* InfoPlist.xcstrings */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -144,7 +143,6 @@
 		C7F8436A2CBF066F00E3E30A /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
 		C7FB173A2B96321300B96F9A /* AppsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppsListView.swift; sourceTree = "<group>"; };
 		C7FEBA102BDC422200AE195F /* AppSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSearchView.swift; sourceTree = "<group>"; };
-		CE0934E22CFE9B9C00073AEB /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -235,7 +233,6 @@
 				C77B90242AF2D796009CC655 /* Pearcleaner.entitlements */,
 				C77B90072AF18E2F009CC655 /* Assets.xcassets */,
 				C7F8436A2CBF066F00E3E30A /* Localizable.xcstrings */,
-				CE0934E22CFE9B9C00073AEB /* InfoPlist.xcstrings */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -428,7 +425,6 @@
 			files = (
 				C77B90082AF18E2F009CC655 /* Assets.xcassets in Resources */,
 				C7A27E812AFD7C4600166168 /* com.alienator88.PearcleanerSentinel.plist in Resources */,
-				CE0934E32CFE9B9C00073AEB /* InfoPlist.xcstrings in Resources */,
 				C7F8436B2CBF066F00E3E30A /* Localizable.xcstrings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -560,8 +556,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APP_BUILD = 68;
-				APP_VERSION = 4.0.2;
+				APP_BUILD = 69;
+				APP_VERSION = 4.0.3;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -632,8 +628,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APP_BUILD = 68;
-				APP_VERSION = 4.0.2;
+				APP_BUILD = 69;
+				APP_VERSION = 4.0.3;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;

diff --git a/Pearcleaner/Logic/AppPathsFetch.swift b/Pearcleaner/Logic/AppPathsFetch.swift
@@ -283,12 +283,16 @@ class AppPathFinder {
         for condition in conditions {
             if useBundleIdentifier && bundleIdentifierL.contains(condition.bundle_id) {
                 // Exclude keywords
-                let hasExcludeKeyword = condition.exclude.contains(where: itemL.contains)
+                let hasExcludeKeyword = condition.exclude.contains { keyword in
+                    itemL.pearFormat().contains(keyword.pearFormat())
+                }
                 if hasExcludeKeyword {
                     return false
                 }
                 // Include keywords
-                let hasIncludeKeyword = condition.include.contains(where: itemL.contains)
+                let hasIncludeKeyword = condition.include.contains { keyword in
+                    itemL.pearFormat().contains(keyword.pearFormat())
+                }
                 if hasIncludeKeyword {
                     return true
                 }

diff --git a/Pearcleaner/Logic/Conditions.swift b/Pearcleaner/Logic/Conditions.swift
@@ -145,6 +145,12 @@ var conditions: [Condition] = [
         exclude: [],
         includeForce: nil
     ),
+    Condition(
+        bundle_id: "com.now.gg.BlueStacks",
+        include: ["bst_boost_interprocess"],
+        exclude: [],
+        includeForce: nil
+    ),
 ]
 
 

diff --git a/Pearcleaner/Logic/Locations.swift b/Pearcleaner/Logic/Locations.swift
@@ -27,6 +27,7 @@ class Locations: ObservableObject {
 
         self.apps = Category(name: "Apps", paths: [
             "\(home)",
+            "\(home)/Documents",
             "\(home)/Library",
             "\(home)/Library/Application Scripts",
             "\(home)/Library/Application Support",
@@ -45,6 +46,7 @@ class Locations: ObservableObject {
             "\(home)/Library/WebKit",
             "/Users/Shared",
             "/Users/Library",
+            "/Users/Shared/Library/Application Support",
             "/Library",
             "/Library/Application Support",
             "/Library/Application Support/CrashReporter",
@@ -93,6 +95,7 @@ class Locations: ObservableObject {
             "\(home)/Library/Preferences/ByHost",
             "\(home)/Library/Saved Application State",
             "\(home)/Library/WebKit",
+            "/Users/Shared/Library/Application Support",
             "/Library/Application Support",
             "/Library/Application Support/CrashReporter",
             "/Library/Internet Plug-Ins",

diff --git a/Pearcleaner/Resources/InfoPlist.xcstrings b/Pearcleaner/Resources/InfoPlist.xcstrings