Merge pull request #1 from iseebi/start_adb_devices

起動時に adb devices を実行する
iseebi · Jan 3, 2018 · 40a7ec3 · 40a7ec3
2 parents a82b906 + 89d4d05
commit 40a7ec3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/TransporterPad/Info.plist b/TransporterPad/Info.plist
@@ -22,9 +22,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>200</string>
+	<string>201</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/TransporterPad/Services/CommandExecutor/CommandExecutor.swift b/TransporterPad/Services/CommandExecutor/CommandExecutor.swift
@@ -134,4 +134,10 @@ extension CommandExecutor {
         }
         return CommandExecutor(environment: environment, launchPath: launchPath, arguments: arguments)
     }
+
+    class func startAdbServerIfNeeded(environment: Environment) -> CommandExecutor {
+        let launchPath = environment.adbToolPath
+        let arguments = ["devices"]
+        return CommandExecutor(environment: environment, launchPath: launchPath, arguments: arguments)
+    }
 }
diff --git a/TransporterPad/Services/CommandExecutor/Transporter.swift b/TransporterPad/Services/CommandExecutor/Transporter.swift
@@ -30,6 +30,10 @@ class Transporter: NSObject {
         super.init()
     }
 
+    func setup() {
+        CommandExecutor.startAdbServerIfNeeded(environment: environment).run()
+    }
+
     func transport(package: AppPackage, targetDevices: [Device], reInstall: Bool) {
         if working { return }
         let devices = targetDevices.filter { d in d.platform == package.platform }

diff --git a/TransporterPad/ViewModels/MainViewModel.swift b/TransporterPad/ViewModels/MainViewModel.swift
@@ -84,6 +84,7 @@ class MainViewModel: NSObject {
         deviceWatcher.delegate = self
         deviceWatcher.start()
         transporter.delegate = self
+        transporter.setup()
     }
 
     func startTransporter(reInstall: Bool) {