Merge pull request #12 from rofle100lvl/SmallImprovements

Small improvements

Author: rofle100lvl

Sources/UseGraph/UseGraphCommand.swift

@@ -11,6 +11,7 @@ public struct UseGraphCommand: AsyncParsableCommand {
         version: "0.0.1",
         subcommands: [
             UseGraphFrontendCommand.self,
-        ]
+        ],
+        defaultSubcommand: UseGraphFrontendCommand.self
     )
 }

Sources/UseGraphFrontend/UseGraph.swift

@@ -11,8 +11,6 @@ public struct UseGraphFrontendCommand: AsyncParsableCommand {
         abstract: "Swift CLI to work with Use Graph tool",
         version: "0.0.1",
         subcommands: [
-            UseGraphBuildCommand.self,
-            UseGraphAnalyzeCommand.self,
             UseGraphPeripheryAnalyzeCommand.self,
             UseGraphPeripheryBuildCommand.self
         ]

Sources/UseGraphPeriphery/GraphBuilder.swift

@@ -7,6 +7,7 @@ enum OutputFormat {
     case svg
     case png
     case gv
+    case csv
 
     public static func parse(format: String) throws -> OutputFormat {
         switch format.lowercased() {
@@ -16,6 +17,8 @@ enum OutputFormat {
                 .png
         case "gv":
                 .gv
+        case "csv":
+                .csv
         default:
             throw FormatError.formatIsNotCorrect
         }
@@ -48,8 +51,6 @@ final class GraphBuilder {
 
         guard let edgesData = edgesCSV.data(using: .utf8),
               let nodesData = nodesCSV.data(using: .utf8) else { fatalError() }
-        print(FileManager.default.createFile(atPath: edgesUrl.path(), contents: edgesData))
-        print(FileManager.default.createFile(atPath: nodesUrl.path(), contents: nodesData))
     }
 
     func buildGraph(edges: [Edge], format: OutputFormat) async throws {
@@ -60,10 +61,11 @@ final class GraphBuilder {
             let url = URL(fileURLWithPath: #file).deletingLastPathComponent().appending(path: "Graph.\(format.rawValue)")
             guard let fileContents = String(data: data, encoding: .utf8) else { fatalError() }
 
-            print(FileManager.default.createFile(atPath: url.path(), contents: fileContents.data(using: .utf8)))
             Task {
                 System.shared.run("open \(url.path())")
             }
+        case .csv:
+            csvBuildGraph(edges: edges)
         }
     }
 
@@ -92,6 +94,8 @@ extension GraphBuilder {
                 .png
         case .gv:
                 .gv
+        case .csv:
+            nil
         }
     }
 }

Sources/UseGraphPeriphery/UseGraphPeripheryBuildCommand.swift

@@ -47,7 +47,7 @@ public struct UseGraphPeripheryBuildCommand: AsyncParsableCommand {
     public init() {}
 
     public static let configuration = CommandConfiguration(
-        commandName: "usage_graph_dynamic",
+        commandName: "usage_graph",
         abstract: "Command to build graph of usage.",
         version: "0.0.1"
     )
@@ -60,6 +60,9 @@ public struct UseGraphPeripheryBuildCommand: AsyncParsableCommand {
 
     @Option(help: "Paths to index store")
     var indexStore: String? = nil
+    
+    @Option(help: "Output file format. Now available: CSV, SVG, PNG, GV")
+    var format: String = "csv"
 
     public func run() async throws {
         let configuration = Configuration()
@@ -114,7 +117,7 @@ public struct UseGraphPeripheryBuildCommand: AsyncParsableCommand {
         let edges = edgeDict.compactMap {
             Edge(from: $0.key.from, to: $0.key.to, references: $0.value)
         }
-        GraphBuilder.shared.csvBuildGraph(edges: edges)
+        try await GraphBuilder.shared.buildGraph(edges: edges, format: OutputFormat.parse(format: format))
     }
 }
 

Sources/UseGraphPeriphery/UseGraphPeripheryCommand.swift

@@ -13,16 +13,16 @@ public struct UseGraphPeripheryAnalyzeCommand: AsyncParsableCommand {
     public init() {}
 
     public static let configuration = CommandConfiguration(
-        commandName: "usage_graph_dynamic_analyze",
+        commandName: "monolith_destroyer",
         abstract: "Command to build graph of usage.",
         version: "0.0.1"
     )
 
     @Option(help: "Path to project (.xcodeproj)")
     var projectPath: String? = nil
-
-    @Option(help: "Paths to folder with sources - \"path1,path2,path3\"")
-    var folderPaths: String
+    
+    @Option(help: "Paths to your monolith")
+    var monolithPath: String
 
     @Option(help: "Paths to index store")
     var indexStore: String? = nil
@@ -32,10 +32,8 @@ public struct UseGraphPeripheryAnalyzeCommand: AsyncParsableCommand {
 
     public func run() async throws {
         var projectURL: URL?
-        let folderURLs: [String] = try folderPaths.split(separator: ",").map {
-            guard let folderURL = URL(string: String($0)) else { throw PathError.pathIsNotCorrect }
-            return folderURL.path()
-        }
+    
+        let folderURLs: [String] = findSubdirectories(atPath: monolithPath)
 
         if let projectPath {
             projectURL = URL(string: projectPath)
@@ -136,6 +134,27 @@ public struct UseGraphPeripheryAnalyzeCommand: AsyncParsableCommand {
             print(folderPath + " - " + String(edgesInFolder.count))
         }
     }
+    
+    
+    func findSubdirectories(atPath path: String) -> [String] {
+        let fileManager = FileManager.default
+        var subdirectories: [String] = []
+
+        do {
+            let contents = try fileManager.contentsOfDirectory(atPath: path)
+            for item in contents {
+                let fullPath = (path as NSString).appendingPathComponent(item)
+                var isDirectory: ObjCBool = false
+                if fileManager.fileExists(atPath: fullPath, isDirectory: &isDirectory), isDirectory.boolValue {
+                    subdirectories.append(fullPath)
+                }
+            }
+        } catch {
+            print("Error while reading the document: \(error)")
+        }
+
+        return subdirectories
+    }
 }
 
 extension String {

Sources/Utils/HTMLBuilder.swift

@@ -21,7 +21,22 @@ public final class HTMLGenerator {
             <meta charset="UTF-8">
             <style>
                 svg {
-                  border: 1px solid blue;
+                }
+                .svg-container {
+                    resize: horizontal;
+                    overflow: hidden;
+                    width: auto;
+                    height: auto;
+                }
+                .overlay-image {
+                    position: fixed;
+                    bottom: 20px;
+                    right: 20px;
+                    width: 150px;
+                    height: 150px;
+                    z-index: 9999;
+                    box-shadow: 0 0 10px rgba(0,0,0,0.5);
+                    border-radius: 10px;
                 }
             </style>
         </head>
@@ -46,21 +61,17 @@ public final class HTMLGenerator {
 
         htmlString += """
             </table>
-            <div style={{
-                backgroundColor: 'lightpink',
-                resize: 'horizontal',
-                overflow: 'hidden',
-                width: '1000px',
-                height: 'auto',
-              }}>
+            <div class="svg-container">
                 <svg viewBox="0 0 3000 3000">
                     \(svgString)
                 </svg>
             </div>
+            <img class="overlay-image" src="https://storage.yandexcloud.net/swift-ui-course/MonolithDestroyer.png" alt="Overlay Image">
         </body>
         </html>
         """
 
         return htmlString
     }
+
 }