firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid crashing when an iOS device isn’t connected.

Browse Source
This commit is contained in:
Ian Fischer 2015-08-31 10:41:52 -07:00
parent 5fb3176951
commit 17d89f3dbb
1 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
packages/flutter/lib/sky_tool
View File

@ -465,50 +465,59 @@ class IOSDevice(object):
return False
if cls._is_connected:
return True
cmd = [
'ios-deploy',
'--detect',
'--timeout',
'1'
]
logging.info(' '.join(cmd))
out = subprocess.check_output(cmd)
match = re.search(r'\[\.\.\.\.\] Found [^\)]*\) connected', out)
cls._is_connected = match is not None
try:
cmd = [
'ios-deploy',
'--detect',
'--timeout',
'1'
]
logging.info(' '.join(cmd))
out = subprocess.check_output(cmd)
match = re.search(r'\[\.\.\.\.\] Found [^\)]*\) connected', out)
cls._is_connected = match is not None
except subprocess.CalledProcessError:
cls._is_connected = False
return cls._is_connected
@classmethod
def install_app(cls, ios_app_path):
if not cls.has_ios_deploy():
return
cmd = [
'ios-deploy',
'--justlaunch',
'--timeout',
'10', # Smaller timeouts cause it to exit before having launched the app
'--bundle',
ios_app_path
]
logging.info(' '.join(cmd))
subprocess.check_call(cmd)
try:
cmd = [
'ios-deploy',
'--justlaunch',
'--timeout',
'10', # Smaller timeouts cause it to exit before having launched the app
'--bundle',
ios_app_path
]
logging.info(' '.join(cmd))
subprocess.check_call(cmd)
except subprocess.CalledProcessError:
pass
@classmethod
def copy_file(cls, bundle_id, local_path, device_path):
if not cls.has_ios_deploy():
return
cmd = [
'ios-deploy',
'-t',
'1',
'--bundle_id',
bundle_id,
'--upload',
local_path,
'--to',
device_path
]
logging.info(' '.join(cmd))
subprocess.check_call(cmd)
try:
cmd = [
'ios-deploy',
'-t',
'1',
'--bundle_id',
bundle_id,
'--upload',
local_path,
'--to',
device_path
]
logging.info(' '.join(cmd))
subprocess.check_call(cmd)
except subprocess.CalledProcessError:
pass
class IOSSimulator(object):