【修改信息】 repo 内容路由

ExistOrLive · ExistOrLive · commit 879763441f0f · 2025-05-29T02:04:51.000+08:00
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/Router/ZLUIRouter+Github.swift b/ZLGitHubClient/ZLGitHubClient/Class/Router/ZLUIRouter+Github.swift
@@ -17,6 +17,8 @@ enum ZLGithubPathType {
     case release(login: String, repoName: String, tagName: String)
     case commit(login: String, repoName: String, ref: String)
     case compare(login: String, repoName: String, baseRef: String, headRef: String)
+    case tree(login: String, repoName: String, ref: String, path: String)
+    case blob(login: String, repoName: String, ref: String, path: String)
     
     func routerParams() -> (SYDCentralRouterModelType, ZLRouterKey, [String:Any]) {
         switch self {
@@ -73,6 +75,20 @@ enum ZLGithubPathType {
                      "repoName": repoName,
                      "baseRef": baseRef,
                      "headRef": headRef])
+            
+        case .tree(let login, let repoName,let ref, let path):
+            return (.uiViewController,
+                    .RepoContentController,
+                    ["repoFullName": "\(login)/\(repoName)",
+                     "branch": ref,
+                     "path": path])
+            
+        case .blob(let login, let repoName, let ref, let path):
+            return (.uiViewController,
+                    .RepoCodePreview3Controller,
+                    ["repoFullName": "\(login)/\(repoName)",
+                     "branch": ref,
+                     "path": path])
         }
     }
     
@@ -86,6 +102,8 @@ extension ZLGithubKeyWord {
     static let releases: ZLGithubKeyWord = "releases"
     static let commit: ZLGithubKeyWord = "commit"
     static let compare: ZLGithubKeyWord = "compare"
+    static let tree: ZLGithubKeyWord = "tree"
+    static let blob: ZLGithubKeyWord = "blob"
 }
 
 
@@ -188,6 +206,27 @@ extension ZLUIRouter {
                                             headRef: String(refs[1]))
                     }
                 }
+            case .tree:
+                // https://github.com/ExistOrLive/GithubClient/tree/master/Document
+                if pathCount >= 5 {
+                    let ref = pathComponents[4]
+                    let paths = Array(pathComponents[5...])
+                    pathType = .tree(login: pathComponents[1],
+                                     repoName: pathComponents[2],
+                                     ref: pathComponents[4],
+                                     path: paths.joined(separator: "/"))
+                }
+                
+            case .blob:
+                // https://github.com/ExistOrLive/GithubClient/blob/master/Document/GithubAction/DailyCI%E8%AF%B4%E6%98%8E.md
+                if pathCount >= 5 {
+                    let ref = pathComponents[4]
+                    let paths = Array(pathComponents[5...])
+                    pathType = .blob(login: pathComponents[1],
+                                     repoName: pathComponents[2],
+                                     ref: pathComponents[4],
+                                     path: paths.joined(separator: "/"))
+                }
                 
             default:
                 break
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/Router/ZLUIRouter.swift b/ZLGitHubClient/ZLGitHubClient/Class/Router/ZLUIRouter.swift
@@ -89,6 +89,9 @@ extension ZLRouterKey {
     static let ReleaseInfoController: ZLRouterKey = "ZLReleaseInfoController"
     static let CommitInfoController: ZLRouterKey = "ZLCommitInfoController"
     static let CompareInfoController: ZLRouterKey = "ZLRepoCompareCommitController"
+    static let RepoContentController: ZLRouterKey = "ZLRepoContentController"
+    static let RepoCodePreview3Controller: ZLRouterKey = "ZLRepoCodePreview3Controller"
+    
     
     static let WebContentController: ZLRouterKey = "ZLWebContentController"
 
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/repo/ZLRepoContentController/viewcontroller/ZLRepoCodePreview3Controller.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/repo/ZLRepoContentController/viewcontroller/ZLRepoCodePreview3Controller.swift
@@ -21,17 +21,14 @@ import ZMMVVM
 class ZLRepoCodePreview3Controller: ZMViewController {
 
     // model
-    let contentModel: ZLGithubContentModel
-    let repoFullName: String
-    let branch: String
+    @objc var repoFullName: String = ""
+    @objc var branch: String = ""
+    @objc var path: String = ""
 
     var htmlStr: String?
    
 
-    init(repoFullName: String, contentModel: ZLGithubContentModel, branch: String) {
-        self.repoFullName = repoFullName
-        self.contentModel = contentModel
-        self.branch = branch
+    @objc init() {
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -48,7 +45,8 @@ class ZLRepoCodePreview3Controller: ZMViewController {
 
         NotificationCenter.default.addObserver(self, selector: #selector(onNotificationArrived(notification:)), name: ZLUserInterfaceStyleChange_Notification, object: nil)
         
-        let fileExtension = (URL.init(string: self.contentModel.name.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlPathAllowed) ?? "") as NSURL?)?.pathExtension ?? ""
+
+        let fileExtension = pathExtension()
         if fileExtension.lowercased() == "md" || fileExtension.lowercased() == "markdown" {
             self.sendQueryContentRequest()
         } else {
@@ -99,7 +97,7 @@ class ZLRepoCodePreview3Controller: ZMViewController {
 
     override func setupUI() {
         super.setupUI()
-        self.title = self.contentModel.path
+        self.title = path
 
         self.zmNavigationBar.backButton.isHidden = false
         self.zmNavigationBar.addRightView(moreButton)
@@ -110,9 +108,23 @@ class ZLRepoCodePreview3Controller: ZMViewController {
         })
     }
 
+    func html_url() -> String {
+        let html_url = "https://github.com/\(repoFullName.urlPathEncoding)/blob/\(branch.urlPathEncoding)/\(path.urlPathEncoding)"
+        return html_url
+    }
+    
+    func download_url() -> String {
+        let download_url = "https://raw.githubusercontent.com/\(repoFullName.urlPathEncoding)/\(branch.urlPathEncoding)/\(path.urlPathEncoding)"
+        return download_url
+    }
+    
+    func pathExtension() -> String {
+        String(path.split(separator: ".").last ?? "")
+    }
+    
     func switchToWebVC() {
-
-        if let url = URL.init(string: self.contentModel.html_url),
+        
+        if let url = URL.init(string: html_url()),
            let vc = ZLUIRouter.getVC(key: .WebContentController, params: ["requestURL": url]) {
             if var viewControllers = self.navigationController?.viewControllers,
                !viewControllers.isEmpty {
@@ -163,7 +175,7 @@ extension ZLRepoCodePreview3Controller {
     
     @objc func onMoreButtonClick(button: UIButton) {
 
-        guard let url = URL(string: self.contentModel.html_url) else {
+        guard let url = URL(string: html_url()) else {
             return
         }
         button.showShareMenu(title: url.absoluteString, url: url, sourceViewController: self )
@@ -178,7 +190,7 @@ extension ZLRepoCodePreview3Controller {
         ZLProgressHUD.show()
 
         ZLServiceManager.sharedInstance.repoServiceModel?.getRepositoryFileHTMLInfo(withFullName: self.repoFullName,
-                                                                                    path: self.contentModel.path,
+                                                                                    path: self.path,
                                                                                     branch: self.branch,
                                                                                     serialNumber: NSString.generateSerialNumber()) { [weak self] (resultModel: ZLOperationResultModel) in
 
@@ -205,7 +217,7 @@ extension ZLRepoCodePreview3Controller {
 
         ZLProgressHUD.show()
         ZLServiceManager.sharedInstance.repoServiceModel?.getRepositoryFileRawInfo(withFullName: self.repoFullName,
-                                                                                   path: self.contentModel.path,
+                                                                                   path: self.path,
                                                                                    branch: self.branch,
                                                                                    serialNumber: NSString.generateSerialNumber()) {[weak self] (resultModel: ZLOperationResultModel) in
 
@@ -223,7 +235,7 @@ extension ZLRepoCodePreview3Controller {
                 return
             }
 
-            let code = "```\(self.getFileType(fileExtension: URL.init(string: self.contentModel.path)?.pathExtension ?? ""))\n\(data)\n```"
+            let code = "```\(self.getFileType(fileExtension: self.pathExtension()))\n\(data)\n```"
 
             ZLServiceManager.sharedInstance.additionServiceModel?.renderCodeToMarkdown(withCode: code, serialNumber: NSString.generateSerialNumber(), completeHandle: {[weak self](resultModel: ZLOperationResultModel) in
 
@@ -339,7 +351,7 @@ extension ZLRepoCodePreview3Controller: WKUIDelegate, WKNavigationDelegate {
 
             var url = URL(string: urlStr)
             if url?.host == nil {               // 如果是相对路径，组装baseurl
-                url = (URL.init(string: self.contentModel.html_url) as NSURL?)?.deletingLastPathComponent
+                url = (URL.init(string: html_url()) as NSURL?)?.deletingLastPathComponent
                 url = URL(string: "\(url?.absoluteString ?? "" )\(urlStr)")
             }
         
@@ -355,13 +367,13 @@ extension ZLRepoCodePreview3Controller: WKUIDelegate, WKNavigationDelegate {
     }
 
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        if let download_url = self.contentModel.download_url {
-            let baseURLStr = (URL.init(string: download_url) as NSURL?)?.deletingLastPathComponent?.absoluteString
+        
+            let baseURLStr = (URL.init(string: download_url()) as NSURL?)?.deletingLastPathComponent?.absoluteString
             let addBaseScript = "let a = '\(baseURLStr ?? "")';let array = document.getElementsByTagName('img');for(i=0;i<array.length;i++){let item=array[i];if(item.getAttribute('src').indexOf('http') == -1){item.src = a + item.getAttribute('src');}}"
 
             webView.evaluateJavaScript(addBaseScript) { (_: Any?, _: Error?) in
 
-            }
+            
         }
 
     }
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/repo/ZLRepoContentController/viewcontroller/ZLRepoContentController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/repo/ZLRepoContentController/viewcontroller/ZLRepoContentController.swift
@@ -23,15 +23,23 @@ class ZLRepoContentNode: ZLBaseObject {
 class ZLRepoContentController: ZMViewController, ZLRefreshProtocol {
     
     // model
-    var repoFullName: String?
-    var path: String?
-    var branch: String?
+    @objc var repoFullName: String?
+    @objc var path: String?
+    @objc var branch: String?
     
     /// 根节点
     var rootContentNode: ZLRepoContentNode?
     /// 当前节点
     var currentContentNode: ZLRepoContentNode?
 
+    @objc init() {
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    @MainActor required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
 
     lazy var closeButton: UIButton = {
         let button = UIButton.init(type: .custom)
@@ -263,9 +271,10 @@ extension ZLRepoContentController: UITableViewDelegate, UITableViewDataSource {
             self.currentContentNode = self.currentContentNode?.subNodes?[indexPath.row]
             self.reloadData()
         } else if "file" == contentModel.type {
-            let controller = ZLRepoCodePreview3Controller(repoFullName: repoFullName ?? "",
-                                                          contentModel: contentModel,
-                                                          branch: branch ?? "")
+            let controller = ZLRepoCodePreview3Controller()
+            controller.repoFullName = repoFullName ?? ""
+            controller.path = contentModel.path
+            controller.branch = branch ?? ""
             self.navigationController?.pushViewController(controller, animated: true)
         }
     }
diff --git a/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/SYDCenteralFactoryConfig.plist b/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/SYDCenteralFactoryConfig.plist
@@ -308,9 +308,31 @@
 		<key>claStr</key>
 		<string>ZLRepoCompareCommitController</string>
 		<key>type</key>
-		<string>0</string>
+		<integer>0</integer>
+		<key>isSingle</key>
+		<false/>
+		<key>moduleName</key>
+		<string>ZLGitHubClient</string>
+	</dict>
+	<key>ZLRepoContentController</key>
+	<dict>
+		<key>claStr</key>
+		<string>ZLRepoContentController</string>
+		<key>type</key>
+		<integer>0</integer>
 		<key>isSingle</key>
-		<string>NO</string>
+		<false/>
+		<key>moduleName</key>
+		<string>ZLGitHubClient</string>
+	</dict>
+	<key>ZLRepoCodePreview3Controller</key>
+	<dict>
+		<key>claStr</key>
+		<string>ZLRepoCodePreview3Controller</string>
+		<key>type</key>
+		<integer>0</integer>
+		<key>isSingle</key>
+		<false/>
 		<key>moduleName</key>
 		<string>ZLGitHubClient</string>
 	</dict>
