Add watchOS Device Support directory, close #11

IrelDev · IrelDev · commit e935fdfad703 · 2020-10-03T23:05:29.000+05:00
diff --git a/XcodeCleaner/DirectoryManager.swift b/XcodeCleaner/DirectoryManager.swift
@@ -30,11 +30,16 @@ struct DirectoryManager {
         let derivedDataPath = "DerivedData/"
         return "\(xcodePath + derivedDataPath)"
     }
-    func getDeviceSupportPath() -> String {
+    func getIOSDeviceSupportPath() -> String {
         let xcodePath = getXcodeDefaultPath()
         let deviceSupportPath = "iOS DeviceSupport/"
         return "\(xcodePath + deviceSupportPath)"
     }
+    func getWatchOSDeviceSupportPath() -> String {
+        let xcodePath = getXcodeDefaultPath()
+        let watchOSDeviceSupport = "watchOS DeviceSupport/"
+        return "\(xcodePath + watchOSDeviceSupport)"
+    }
     func getArchivesPath() -> String {
         let xcodePath = getXcodeDefaultPath()
         let archivesPath = "Archives/"
@@ -125,8 +130,10 @@ struct DirectoryManager {
         switch type {
         case .derivedData:
             path = getDerivedDataPath()
-        case .deviceSupport:
-            path = getDeviceSupportPath()
+        case .iOSDeviceSupport:
+            path = getIOSDeviceSupportPath()
+        case .watchOSDeviceSupport:
+            path = getWatchOSDeviceSupportPath()
         case .archives:
             path = getArchivesPath()
         case .iOSDeviceLogs:
diff --git a/XcodeCleaner/Enums/DirectoryType.swift b/XcodeCleaner/Enums/DirectoryType.swift
@@ -9,10 +9,10 @@
 import SwiftUI
 
 public enum DirectoryType: String, CaseIterable {
-   
     case derivedData
-    case deviceSupport
+    case iOSDeviceSupport
+    case watchOSDeviceSupport
+    case documentationCache
     case archives
     case iOSDeviceLogs
-    case documentationCache
 }
diff --git a/XcodeCleaner/Protocols/PieChartViewModelProtocol.swift b/XcodeCleaner/Protocols/PieChartViewModelProtocol.swift
@@ -11,6 +11,6 @@ import Foundation
 protocol PieChartViewModelProtocol {
     var items: [PieChartItemModel] { get set }
     
-    mutating func createItems(derivedData: [DirectoryModel], deviceSupport: [DirectoryModel], archives: [DirectoryModel], iOSDeviceLogs: [DirectoryModel], documentationCache: [DirectoryModel])
+    mutating func createItems(derivedData: [DirectoryModel], iOSDeviceSupport: [DirectoryModel], watchOSDeviceSupport: [DirectoryModel], archives: [DirectoryModel], iOSDeviceLogs: [DirectoryModel], documentationCache: [DirectoryModel])
     func getPCItems() -> PCItems
 }
diff --git a/XcodeCleaner/Protocols/ViewModelProtocol.swift b/XcodeCleaner/Protocols/ViewModelProtocol.swift
@@ -16,7 +16,7 @@ protocol ViewModelProtocol {
     var totalSize: Int64 { get set }
     
     var derivedData: [DirectoryModel] { get set }
-    var deviceSupport: [DirectoryModel] { get set }
+    var iOSDeviceSupport: [DirectoryModel] { get set }
     var archives: [DirectoryModel] { get set }
     
     var scanProgress: Double { get }
diff --git a/XcodeCleaner/ViewModels/PieChartViewModel.swift b/XcodeCleaner/ViewModels/PieChartViewModel.swift
@@ -11,15 +11,20 @@ import SwiftUI
 struct PieChartViewModel: PieChartViewModelProtocol {
     var items: [PieChartItemModel] = []
     
-    mutating func createItems(derivedData: [DirectoryModel], deviceSupport: [DirectoryModel], archives: [DirectoryModel], iOSDeviceLogs: [DirectoryModel], documentationCache: [DirectoryModel]) {
+    mutating func createItems(derivedData: [DirectoryModel], iOSDeviceSupport: [DirectoryModel], watchOSDeviceSupport: [DirectoryModel], archives: [DirectoryModel], iOSDeviceLogs: [DirectoryModel], documentationCache: [DirectoryModel]) {
         var derivedDataSize: Int64 = 0
         derivedData.forEach {
             derivedDataSize += $0.size
         }
         
-        var deviceSupportSize: Int64 = 0
-        deviceSupport.forEach {
-            deviceSupportSize += $0.size
+        var iOSDeviceSupportSize: Int64 = 0
+        iOSDeviceSupport.forEach {
+            iOSDeviceSupportSize += $0.size
+        }
+        
+        var watchOSDeviceSupportSize: Int64 = 0
+        watchOSDeviceSupport.forEach {
+            watchOSDeviceSupportSize += $0.size
         }
         
         var archivesSize: Int64 = 0
@@ -38,28 +43,30 @@ struct PieChartViewModel: PieChartViewModelProtocol {
         }
         
         var derivedData: PieChartItemModel
-        var deviceSupport: PieChartItemModel
+        var iOSDeviceSupport: PieChartItemModel
+        var watchOSDeviceSupport: PieChartItemModel
         var archives: PieChartItemModel
         var iOSDeviceLogs: PieChartItemModel
         var documentationCache: PieChartItemModel
         
-        if derivedDataSize == 0 && deviceSupportSize == 0 && archivesSize == 0 && iOSDeviceLogsSize == 0 && documentationCacheSize == 0 {
+        if derivedDataSize == 0 && iOSDeviceSupportSize == 0 && archivesSize == 0 && iOSDeviceLogsSize == 0 && watchOSDeviceSupportSize == 0 && documentationCacheSize == 0 {
             let defaultValue = 1.0
             
             derivedData = PieChartItemModel(value: defaultValue, color: .pink)
-            deviceSupport = PieChartItemModel(value: defaultValue, color: Color(.cyan))
+            iOSDeviceSupport = PieChartItemModel(value: defaultValue, color: Color(.cyan))
             archives = PieChartItemModel(value: defaultValue, color: .orange)
             
-            let items = [archives, deviceSupport, derivedData]
+            let items = [archives, iOSDeviceSupport, derivedData]
             self.items = items
         } else {
             derivedData = PieChartItemModel(value: Double(derivedDataSize), color: .pink)
-            deviceSupport = PieChartItemModel(value: Double(deviceSupportSize), color: Color(.cyan))
+            iOSDeviceSupport = PieChartItemModel(value: Double(iOSDeviceSupportSize), color: Color(.cyan))
+            watchOSDeviceSupport = PieChartItemModel(value: Double(watchOSDeviceSupportSize), color: .green)
             archives = PieChartItemModel(value: Double(archivesSize), color: .orange)
             iOSDeviceLogs = PieChartItemModel(value: Double(iOSDeviceLogsSize), color: .purple)
             documentationCache = PieChartItemModel(value: Double(documentationCacheSize), color: .gray)
 
-            let items = [archives, deviceSupport, derivedData, iOSDeviceLogs, documentationCache]
+            let items = [archives, iOSDeviceSupport, watchOSDeviceSupport, derivedData, iOSDeviceLogs, documentationCache]
             
             var normalizedItems: [PieChartItemModel] = []
             
diff --git a/XcodeCleaner/ViewModels/ViewModel.swift b/XcodeCleaner/ViewModels/ViewModel.swift
@@ -19,7 +19,8 @@ class ViewModel: ObservableObject, ViewModelProtocol {
     var totalSize: Int64 = 0
     
     var derivedData: [DirectoryModel] = []
-    var deviceSupport: [DirectoryModel] = []
+    var iOSDeviceSupport: [DirectoryModel] = []
+    var watchOSDeviceSupport: [DirectoryModel] = []
     var archives: [DirectoryModel] = []
     var iOSDeviceLogs: [DirectoryModel] = []
     var documentationCache: [DirectoryModel] = []
@@ -40,26 +41,41 @@ class ViewModel: ObservableObject, ViewModelProtocol {
         
         let derivedDataDirectories = directoryManager.getSubDirectoriesForPath(path: directoryManager.getDerivedDataPath())
         directoriesCount += derivedDataDirectories.count
+        DispatchQueue.global(qos: .utility).async {
+            self.calculateSize(ofDirectory: &self.derivedData, subDirectories: derivedDataDirectories, type: .derivedData)
+        }
         
-        let deviceSupportDirectories = directoryManager.getSubDirectoriesForPath(path: directoryManager.getDeviceSupportPath())
-        directoriesCount += deviceSupportDirectories.count
+        let iOSDeviceSupportDirectories = directoryManager.getSubDirectoriesForPath(path: directoryManager.getIOSDeviceSupportPath())
+        directoriesCount += iOSDeviceSupportDirectories.count
+        DispatchQueue.global(qos: .utility).async {
+            self.calculateSize(ofDirectory: &self.iOSDeviceSupport, subDirectories: iOSDeviceSupportDirectories, type: .iOSDeviceSupport)
+        }
+        
+        let watchOSDeviceSupportDirectories = directoryManager.getSubDirectoriesForPath(path: directoryManager.getWatchOSDeviceSupportPath())
+        directoriesCount += watchOSDeviceSupportDirectories.count
+        DispatchQueue.global(qos: .utility).async {
+            self.calculateSize(ofDirectory: &self.watchOSDeviceSupport, subDirectories: watchOSDeviceSupportDirectories, type: .watchOSDeviceSupport)
+        }
         
         let archivesDirectories = directoryManager.getSubDirectoriesForPath(path: directoryManager.getArchivesPath())
         directoriesCount += archivesDirectories.count
+        DispatchQueue.global(qos: .utility).async {
+            self.calculateSize(ofDirectory: &self.archives, subDirectories: archivesDirectories, type: .archives)
+        }
         
         let iOSDeviceLogsDirectories = directoryManager.getSubDirectoriesForPath(path: directoryManager.getIOSDeviceLogsPath())
         directoriesCount += iOSDeviceLogsDirectories.count
+        DispatchQueue.global(qos: .utility).async {
+            self.calculateSize(ofDirectory: &self.iOSDeviceLogs, subDirectories: iOSDeviceLogsDirectories, type: .iOSDeviceLogs)
+        }
         
         let documentationCacheDirectories = directoryManager.getSubDirectoriesForPath(path: directoryManager.getDocumentationCachePath())
         directoriesCount += documentationCacheDirectories.count
-        
         DispatchQueue.global(qos: .utility).async {
-            self.calculateSize(ofDirectory: &self.derivedData, subDirectories: derivedDataDirectories, type: .derivedData)
-            self.calculateSize(ofDirectory: &self.deviceSupport, subDirectories: deviceSupportDirectories, type: .deviceSupport)
-            self.calculateSize(ofDirectory: &self.archives, subDirectories: archivesDirectories, type: .archives)
-            self.calculateSize(ofDirectory: &self.iOSDeviceLogs, subDirectories: iOSDeviceLogsDirectories, type: .iOSDeviceLogs)
             self.calculateSize(ofDirectory: &self.documentationCache, subDirectories: documentationCacheDirectories, type: .documentationCache)
-            
+        }
+        
+        DispatchQueue.global(qos: .utility).async {
             self.isScanStarted.toggle()
             self.isReadyToBeCleaned.toggle()
             
@@ -93,10 +109,14 @@ class ViewModel: ObservableObject, ViewModelProtocol {
             directories = derivedData
             directoryName = "Derived Data"
             circleColor = .pink
-        case .deviceSupport:
-            directories = deviceSupport
-            directoryName = "Device Support"
+        case .iOSDeviceSupport:
+            directories = iOSDeviceSupport
+            directoryName = "iOS Device Support"
             circleColor = Color(.cyan)
+        case .watchOSDeviceSupport:
+            directories = watchOSDeviceSupport
+            directoryName = "watchOS Device Support"
+            circleColor = .green
         case .archives:
             directories = archives
             directoryName = "Archives"
@@ -107,7 +127,7 @@ class ViewModel: ObservableObject, ViewModelProtocol {
             circleColor = .purple
         case .documentationCache:
             directories = documentationCache
-            directoryName = "Doc. Cache"
+            directoryName = "Documentation Cache"
             circleColor = .gray
         }
         
@@ -122,7 +142,8 @@ class ViewModel: ObservableObject, ViewModelProtocol {
         totalSize = 0
         
         derivedData.removeAll()
-        deviceSupport.removeAll()
+        iOSDeviceSupport.removeAll()
+        watchOSDeviceSupport.removeAll()
         archives.removeAll()
         iOSDeviceLogs.removeAll()
         documentationCache.removeAll()
@@ -131,7 +152,7 @@ class ViewModel: ObservableObject, ViewModelProtocol {
     }
     func getViewModelForPieChart() -> PieChartViewModelProtocol {
         var viewModel = PieChartViewModel()
-        viewModel.createItems(derivedData: derivedData, deviceSupport: deviceSupport, archives: archives, iOSDeviceLogs: iOSDeviceLogs, documentationCache: documentationCache)
+        viewModel.createItems(derivedData: derivedData, iOSDeviceSupport: iOSDeviceSupport, watchOSDeviceSupport: watchOSDeviceSupport, archives: archives, iOSDeviceLogs: iOSDeviceLogs, documentationCache: documentationCache)
         
         return viewModel
     }
@@ -143,7 +164,8 @@ class ViewModel: ObservableObject, ViewModelProtocol {
         
         DispatchQueue.global(qos: .userInitiated).async {
             self.directoryManager.cleanDirectory(forType: .derivedData)
-            self.directoryManager.cleanDirectory(forType: .deviceSupport)
+            self.directoryManager.cleanDirectory(forType: .iOSDeviceSupport)
+            self.directoryManager.cleanDirectory(forType: .watchOSDeviceSupport)
             self.directoryManager.cleanDirectory(forType: .archives)
             self.directoryManager.cleanDirectory(forType: .iOSDeviceLogs)
             self.directoryManager.cleanDirectory(forType: .documentationCache)

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ import Foundation`
`11`	`11`	`protocol PieChartViewModelProtocol {`
`12`	`12`	`var items: [PieChartItemModel] { get set }`
`13`	`13`
`14`		`- mutating func createItems(derivedData: [DirectoryModel], deviceSupport: [DirectoryModel], archives: [DirectoryModel], iOSDeviceLogs: [DirectoryModel], documentationCache: [DirectoryModel])`
	`14`	`+ mutating func createItems(derivedData: [DirectoryModel], iOSDeviceSupport: [DirectoryModel], watchOSDeviceSupport: [DirectoryModel], archives: [DirectoryModel], iOSDeviceLogs: [DirectoryModel], documentationCache: [DirectoryModel])`
`15`	`15`	`func getPCItems() -> PCItems`
`16`	`16`	`}`