Introduce DataManager to the Core

Author: unnamedd

Tools/Toolkit/Sources/Toolkit/SubCommands/GenerateDocumentation.swift

@@ -5,7 +5,6 @@
 
 import ArgumentParser
 import ToolkitLibrary
-import TSCBasic
 
 extension ToolkitCommand {
   struct GenerateDocumentation: ParsableCommand {
@@ -23,13 +22,16 @@ extension ToolkitCommand {
     var outputJSONFilename: String = "extensions.json"
 
     func run() throws {
-      let fileSystem = TSCBasic.localFileSystem
-
       do {
+        let dataManager = try DataManager(
+          extensionsPath: path,
+          extensionsFilename: outputJSONFilename
+        )
+        
         let toolkit = Toolkit(
-          path: fileSystem.absolutePath(for: path)
+          dataManager: dataManager
         )
-
+        
         try toolkit.generateDocumentation(
           outputJSONFilename: outputJSONFilename,
           outputMarkdownFilename: outputMarkdownFilename

Tools/Toolkit/Sources/Toolkit/SubCommands/Report.swift

@@ -6,7 +6,6 @@
 import ArgumentParser
 import SwiftUI
 import ToolkitLibrary
-import TSCBasic
 
 extension ToolkitCommand {
   struct Report: ParsableCommand {
@@ -32,11 +31,13 @@ extension ToolkitCommand {
     var noColor: Bool = false
 
     func run() throws {
-      let fileSystem = TSCBasic.localFileSystem
-
       do {
+        let dataManager = try DataManager(
+          extensionsPath: path
+        )
+        
         let toolkit = Toolkit(
-          path: fileSystem.absolutePath(for: path)
+          dataManager: dataManager
         )
 
         try toolkit.report(

Tools/Toolkit/Sources/Toolkit/SubCommands/SetExecutable.swift

@@ -5,7 +5,6 @@
 
 import ArgumentParser
 import ToolkitLibrary
-import TSCBasic
 
 extension ToolkitCommand {
   struct SetExecutable: ParsableCommand {
@@ -17,11 +16,13 @@ extension ToolkitCommand {
     var path: String = "./commands"
 
     func run() throws {
-      let fileSystem = TSCBasic.localFileSystem
-
       do {
+        let dataManager = try DataManager(
+          extensionsPath: path
+        )
+        
         let toolkit = Toolkit(
-          path: fileSystem.absolutePath(for: path)
+          dataManager: dataManager
         )
 
         try toolkit.setScriptCommandsAsExecutable()

Tools/Toolkit/Sources/ToolkitLibrary/Core/Toolkit/Toolkit+GenerateDocumentation.swift

@@ -7,29 +7,23 @@ import Foundation
 import TSCBasic
 
 extension Toolkit {
-  public func generateDocumentation(outputJSONFilename: String, outputMarkdownFilename: String) throws {
-    guard fileSystem.exists(extensionsAbsolutePath) else {
-      throw Error.extensionsFolderNotFound(extensionsAbsolutePath.pathString)
-    }
-
-    var data = RaycastData()
-
+  public func generateDocumentation(outputJSONFilename: String, outputMarkdownFilename: String) throws {    
+    dataManager.loadContent()
+    
     try readFolderContent(
-      path: extensionsAbsolutePath,
-      parentGroups: &data.groups,
+      path: dataManager.extensionsPath,
+      parentGroups: &dataManager.data.groups,
       ignoreFilesInDir: true
     )
 
-    data.totalScriptCommands = totalScriptCommands
-
     let documentation = Documentation(
-      path: extensionsAbsolutePath,
+      path: dataManager.extensionsPath,
       jsonFilename: outputJSONFilename,
       markdownFilename: outputMarkdownFilename
     )
 
     try documentation.generateDocuments(
-      for: data
+      for: dataManager.data
     )
   }
 }

Tools/Toolkit/Sources/ToolkitLibrary/Core/Toolkit/Toolkit+Mode.swift

@@ -8,14 +8,10 @@ import TSCBasic
 
 extension Toolkit {
   public func setScriptCommandsAsExecutable() throws {
-    guard fileSystem.exists(extensionsAbsolutePath) else {
-      throw Error.extensionsFolderNotFound(extensionsAbsolutePath.pathString)
-    }
-
     var data = RaycastData()
 
     try readFolderContent(
-      path: extensionsAbsolutePath,
+      path: dataManager.extensionsPath,
       parentGroups: &data.groups,
       ignoreFilesInDir: true
     )
@@ -34,7 +30,7 @@ extension Toolkit {
     var newModeCount = 0
 
     scriptCommands.sorted().forEach { scriptCommand in
-      let filePath = extensionsAbsolutePath.appending(RelativePath(scriptCommand.fullPath))
+      let filePath = dataManager.extensionsPath.appending(RelativePath(scriptCommand.fullPath))
 
       if let _ = try? fileSystem.chmod(.executable, path: filePath) {
         newModeCount += 1

Tools/Toolkit/Sources/ToolkitLibrary/Core/Toolkit/Toolkit+Report.swift

@@ -8,20 +8,15 @@ import TSCBasic
 
 extension Toolkit {
   public func report(type: ReportType, noColor: Bool) throws {
-    guard fileSystem.exists(extensionsAbsolutePath) else {
-      throw Error.extensionsFolderNotFound(extensionsAbsolutePath.pathString)
-    }
-
-    var data = RaycastData()
 
     try readFolderContent(
-      path: extensionsAbsolutePath,
-      parentGroups: &data.groups,
+      path: dataManager.extensionsPath,
+      parentGroups: &dataManager.data.groups,
       ignoreFilesInDir: true
     )
 
     let report = Report(
-      data: data,
+      data: dataManager.data,
       type: type,
       noColor: noColor
     )

Tools/Toolkit/Sources/ToolkitLibrary/Core/Toolkit/Toolkit.swift

@@ -9,13 +9,11 @@ import TSCBasic
 public final class Toolkit {
   lazy var fileSystem = TSCBasic.localFileSystem
 
-  var extensionsAbsolutePath: AbsolutePath
-
-  var totalScriptCommands: Int = 0
+  var dataManager: DataManager
 
   let git = GitShell()
-
-  public init(path: AbsolutePath) {
-    extensionsAbsolutePath = path
+  
+  public init(dataManager: DataManager) {
+    self.dataManager = dataManager
   }
 }