Skip to content

Commit

Permalink
deprecated kill-running for launch
Browse files Browse the repository at this point in the history
  • Loading branch information
codeskyblue committed Nov 22, 2023
1 parent 1d9d038 commit 077920b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
13 changes: 8 additions & 5 deletions tidevice/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,13 @@ def cmd_applist(args: argparse.Namespace):
# info.get('Version', ''), info['Type'])))

def cmd_energy(args: argparse.Namespace):
if args.kill:
logger.warning("kill is deprecated, kill is always True now")

d = _udid2device(args.udid)
ts = d.connect_instruments()
try:
pid = ts.app_launch(args.bundle_id,
args=args.arguments,
kill_running=args.kill)
pid = ts.app_launch(args.bundle_id, args=args.arguments)
ts.start_energy_sampling(pid)
while True:
ret = ts.get_process_energy_stats(pid)
Expand All @@ -350,6 +351,9 @@ def cmd_energy(args: argparse.Namespace):
sys.exit(e)

def cmd_launch(args: argparse.Namespace):
if args.skip_running:
logger.warning("skip_running is deprecated, always kill app now")

d = _udid2device(args.udid)

env = {}
Expand All @@ -363,8 +367,7 @@ def cmd_launch(args: argparse.Namespace):
with d.connect_instruments() as ts:
pid = ts.app_launch(args.bundle_id,
app_env=env,
args=args.arguments,
kill_running=not args.skip_running)
args=args.arguments)
print("PID:", pid)
except ServiceError as e:
sys.exit(e)
Expand Down
14 changes: 9 additions & 5 deletions tidevice/_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -700,17 +700,21 @@ def app_kill(self, *args, **kwargs) -> int:

def app_start(self,
bundle_id: str,
args: Optional[list] = [],
kill_running: bool = True) -> int:
args: Optional[list] = []) -> int:
"""
start application
return pid
Args:
bundle_id: com.apple.Preferences
args: ['-AppleLanguages', '(en)']
Note: kill_running better to True, if set to False, launch 60 times will trigger instruments service stop
Returns:
pid
"""
if args is None:
args = []
with self.connect_instruments() as ts:
return ts.app_launch(bundle_id, args=args, kill_running=kill_running)
return ts.app_launch(bundle_id, args=args)

def app_install(self, file_or_url: Union[str, typing.IO]) -> str:
"""
Expand Down
4 changes: 1 addition & 3 deletions tidevice/_instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -688,16 +688,14 @@ def prepare(self):
def app_launch(self,
bundle_id: str,
app_env: typing.Dict[str, str] = {},
args: typing.List[str] = [],
kill_running: bool = True) -> int:
args: typing.List[str] = []) -> int:
"""
Launch an app with bundle id
Args:
bundle_id: bundle id of the app
app_env: environment variables
args: arguments
kill_running: deprecated argument, useless now
Returns:
pid of the app
Expand Down

0 comments on commit 077920b

Please sign in to comment.