Merge pull request #72 from shichimitoucarshi/refactor/Reviewed-the-c…

…ode-of-the-sample-app Reviewed the code of the sample app
shichimitoucarshi · Aug 3, 2024 · 151633b · 151633b
2 parents 7b91e72 + a8e4c91
commit 151633b
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 46 deletions.
diff --git a/HttpSessionSample/ViewController/Detail/DetailViewController.swift b/HttpSessionSample/ViewController/Detail/DetailViewController.swift
@@ -26,7 +26,7 @@ final class DetailViewController: UIViewController {
             viewModel.input.download()
             viewModel.output.progress { [weak self] total, expectedToWrite, progress in
                 guard let self = self else { return }
-                self.status.text = "\(total)byte/\(expectedToWrite)byte"
+                status.text = "\(total)byte/\(expectedToWrite)byte"
                 self.progress.setProgress(progress, animated: true)
             }
         } else {

diff --git a/HttpSessionSample/ViewController/Detail/DetailViewModel.swift b/HttpSessionSample/ViewController/Detail/DetailViewModel.swift
@@ -58,9 +58,9 @@ extension DetailViewModel: DetailViewModelInput {
     func stopDownload() {
         provider
             .cancel { [weak self] data in
-                self?.data = data
-                print("data")
-                self?.isCancel = true
+                guard let self = self else { return }
+                self.data = data
+                isCancel = true
             }
     }
 
@@ -70,7 +70,7 @@ extension DetailViewModel: DetailViewModelInput {
                           progress: { [weak self] _, total, expectedToWrite in
                               guard let self = self else { return }
                               let progress = Float(total) / Float(expectedToWrite)
-                              self.progressClosure?(total, expectedToWrite, progress)
+                              progressClosure?(total, expectedToWrite, progress)
                           }, download: { url in
                               print("location: \(String(describing: url))")
                           }) { _, _, _ in

diff --git a/HttpSessionSample/ViewController/View/ViewController.swift b/HttpSessionSample/ViewController/View/ViewController.swift
@@ -41,18 +41,24 @@ extension ViewController: UITableViewDelegate {
     func tableView(_: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         progressView.progress = 0.0
-        viewModel.output.detail { result in
-            self.detailViewController(text: result)
-        }
-
-        viewModel.output.transition { [unowned self] in
-            self.detailViewController(isDL: true)
-        }
-
-        viewModel.output.progress { percentage in
-            self.progressView.progress = percentage
-            print("\(Int(percentage * 100))%")
-        }
+        viewModel
+            .output
+            .detail { [unowned self] result in
+                detailViewController(text: result)
+            }
+
+        viewModel
+            .output
+            .transition { [unowned self] in
+                detailViewController(isDL: true)
+            }
+
+        viewModel
+            .output
+            .progress { [unowned self] percentage in
+                progressView.progress = percentage
+                print("\(Int(percentage * 100))%")
+            }
 
         viewModel.input.callApi(indexPath)
     }

diff --git a/HttpSessionSample/ViewController/View/ViewModel.swift b/HttpSessionSample/ViewController/View/ViewModel.swift
@@ -39,19 +39,18 @@ extension ViewModel: ViewModelInput {
         switch indexPath.row {
         case 0:
             provider.send(api: .zen) { [unowned self] data, responce, error in
-                self.buildData(data: data,
-                               parameter: [:],
-                               responce: responce,
-                               error: error)
+                buildData(data: data,
+                          parameter: [:],
+                          responce: responce,
+                          error: error)
             }
         case 1:
             let val = Tapul(value: ("http_post", value: "Http Request POST 😄"))
             provider.send(api: .post(param: val)) { [unowned self] data, responce, error in
-
-                self.buildData(data: data,
-                               parameter: [val.value.0: val.value.1],
-                               responce: responce,
-                               error: error)
+                buildData(data: data,
+                          parameter: [val.value.0: val.value.1],
+                          responce: responce,
+                          error: error)
             }
         case 2:
 
@@ -62,19 +61,19 @@ extension ViewModel: ViewModelInput {
 
             Http.request(url: url, method: .post, params: param)
                 .session(completion: { [unowned self] data, responce, error in
-                    self.buildData(data: data,
-                                   parameter: param,
-                                   responce: responce,
-                                   error: error)
+                    buildData(data: data,
+                              parameter: param,
+                              responce: responce,
+                              error: error)
                 })
         case 3:
 
             Http.request(url: "https://sevens-api.herokuapp.com/signIned.json", method: .get, cookie: true)
                 .session(completion: { [unowned self] data, responce, error in
-                    self.buildData(data: data,
-                                   parameter: [:],
-                                   responce: responce,
-                                   error: error)
+                    buildData(data: data,
+                              parameter: [:],
+                              responce: responce,
+                              error: error)
                 })
         case 4:
 
@@ -84,32 +83,32 @@ extension ViewModel: ViewModelInput {
                 self.uploadProgress?(percentage)
 
             } completion: { [self] data, responce, error in
-                self.buildData(data: data,
-                               parameter: [:],
-                               responce: responce,
-                               error: error)
+                buildData(data: data,
+                          parameter: [:],
+                          responce: responce,
+                          error: error)
             }
         case 5:
             let basicAuth: [String: String] = [Auth.user: "httpSession",
                                                Auth.password: "githubHttpsession"]
             Http.request(url: "https://sevens-api.herokuapp.com/basicauth.json",
                          method: .get,
                          basic: basicAuth).session(completion: { [unowned self] data, responce, error in
-                self.buildData(data: data,
-                               parameter: [:],
-                               responce: responce,
-                               error: error)
+                buildData(data: data,
+                          parameter: [:],
+                          responce: responce,
+                          error: error)
             })
         case 6:
             pushDetailClosure?()
         case 7:
             let parameter = ["Swift-Http-Client-lib": "HttpSession",
                              "Lang": "Swift"]
             provider.send(api: .jsonPost(param: parameter)) { [unowned self] data, responce, error in
-                self.buildData(data: data,
-                               parameter: parameter,
-                               responce: responce,
-                               error: error)
+                buildData(data: data,
+                          parameter: parameter,
+                          responce: responce,
+                          error: error)
             }
         default:
             print("Default")