Skip to content

Commit

Permalink
Addded device disconnect call; which was missing
Browse files Browse the repository at this point in the history
  • Loading branch information
Cooper committed May 27, 2013
1 parent 61cbb09 commit 6ae7ccc
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 2 deletions.
9 changes: 8 additions & 1 deletion afcmediadirectory.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,19 @@ def cmd_ls(args, dev):
afc = get_afc(args, dev)
printdir(afc, args.path.decode(u'utf-8'), args.r)
afc.disconnect()
dev.disconnect()

def cmd_mkdir(args, dev):
afc = get_afc(args, dev)
afc.mkdir(args.path)
afc.disconnect()
dev.disconnect()

def cmd_rm(args, dev):
afc = get_afc(args, dev)
afc.remove(args.path)
afc.disconnect()
dev.disconnect()

def cmd_ln(args, dev):
# XXX unable to make linking work?
Expand All @@ -170,6 +173,7 @@ def cmd_ln(args, dev):
else:
afc.link(args.path, args.link)
afc.disconnect()
dev.disconnect()

def cmd_get(args, dev):
dest = args.dest
Expand All @@ -184,6 +188,7 @@ def cmd_get(args, dev):
d.close()
s.close()
afc.disconnect()
dev.disconnect()

def cmd_put(args, dev):
if args.path[-1] == os.sep:
Expand All @@ -197,6 +202,7 @@ def cmd_put(args, dev):
s.close()
d.close()
afc.disconnect()
dev.disconnect()

def preview_file(afc, path):
s = afc.open(path, u'r')
Expand All @@ -222,7 +228,8 @@ def cmd_view(args, dev):

for f in files:
preview_file(afc, f)
afc.disconnect()
afc.disconnect()
dev.disconnect()

# afc command
afcparser = cmdargs.add_parser(
Expand Down
7 changes: 7 additions & 0 deletions amdevice.py
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ def cmd_info(args, dev):
print(u' location: 0x%x' % dev.get_location())
print(u' usb device id: 0x%x' % dev.get_usb_deviceid())
print(u' usb product id: 0x%x' % dev.get_usb_productid())
dev.disconnect()

def cmd_get(args, dev):
if args.domain is not None or args.key is not None:
Expand All @@ -663,22 +664,26 @@ def cmd_get(args, dev):
for domain in AMDevice.value_domains:
output[domain] = dev.get_value(domain)
pprint.pprint(output)
dev.disconnect()

def cmd_set(args, dev):
domain = None
if args.domain is not None:
domain = args.domain.decode(u'utf-8')
# XXX add support for non-string types; bool next
dev.set_value(domain, args.key.decode(u'utf-8'), args.value.decode(u'utf-8'))
dev.disconnect()

def cmd_del(args, dev):
domain = None
if args.domain is not None:
domain = args.domain.decode(u'utf-8')
dev.remove_value(domain, args.key.decode(u'utf-8'))
dev.disconnect()

def cmd_unpair(args, dev):
dev.unpair()
dev.disconnect()

def cmd_buddy(args, dev):
if args.wifi is not None or args.setid is not None:
Expand All @@ -694,6 +699,7 @@ def cmd_buddy(args, dev):
s += u'BUDDY_SETID'
s += u' (0x%x)' % flags
print(u' wireless buddy flags: %s' % s)
dev.disconnect()

def cmd_relay(args, dev):
class Relay(object):
Expand Down Expand Up @@ -822,6 +828,7 @@ def close_connection(endpoints, ins, outs, errs, s):

for relay in relays:
relay.close()
dev.disconnect()


# standard dev commands
Expand Down
1 change: 1 addition & 0 deletions assertionagent.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def cmd_assert(args, dev):
)
time.sleep(timeout)
ass.disconnect()
dev.disconnect()

assertcmd = cmdargs.add_parser(
u'assert',
Expand Down
2 changes: 2 additions & 0 deletions debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ def cmd_applist(args, dev):
applist = DebugAppList(dev)
al = applist.get_applist()
applist.disconnect()
dev.disconnect()

rows = []
colmax = [0, 0, 0]
Expand Down Expand Up @@ -319,6 +320,7 @@ def cmd_gdb(args, dev):
else:
gdb.set_run() # spawn
gdb.run()
dev.disconnect()

debugparser = cmdargs.add_parser(
u'debug',
Expand Down
6 changes: 6 additions & 0 deletions diagnostics.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,13 @@ def cmd_gestalt(args, dev):
else:
print(diag.mobilegestalt(Diagnostics.gestalt_names))
diag.disconnect()
dev.disconnect()

def cmd_all(args, dev):
diag = Diagnostics(dev)
pprint.pprint(diag.diagnostics(Diagnostics.TYPE_ALL))
diag.disconnect()
dev.disconnect()

def cmd_ioreg(args, dev):
diag = Diagnostics(dev)
Expand All @@ -235,11 +237,13 @@ def cmd_ioreg(args, dev):
cls = args.cls.decode(u'utf-8')
ioreg_dmp(diag.ioregistry(plane, name, cls)[u'IORegistry'])
diag.disconnect()
dev.disconnect()

def cmd_sleep(args, dev):
diag = Diagnostics(dev)
diag.sleep()
diag.disconnect()
dev.disconnect()

def cmd_restart(args, dev):
diag = Diagnostics(dev)
Expand All @@ -248,6 +252,7 @@ def cmd_restart(args, dev):
else:
diag.restart([Diagnostics.ACTION_DISPLAY_PASS])
diag.disconnect()
dev.disconnect()

def cmd_shutdown(args, dev):
diag = Diagnostics(dev)
Expand All @@ -257,6 +262,7 @@ def cmd_shutdown(args, dev):
else:
diag.shutdown([Diagnostics.ACTION_DISPLAY_PASS])
diag.disconnect()
dev.disconnect()

# diag command
diagparser = cmdargs.add_parser(
Expand Down
2 changes: 1 addition & 1 deletion filerelay.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ def cmd_filerelay(args, dev):
f = open(args.dest.decode(u'utf-8'), 'wb')
f.write(fr.get_filesets(sets))
f.close()

fr.disconnect()
dev.disconnect()

# filerelay command
filerelaycmd = cmdargs.add_parser(
Expand Down
2 changes: 2 additions & 0 deletions imagemounter.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,13 @@ def cmd_mountdev(args, dev):
im = ImageMounter(dev)
im.mount()
im.disconnect()
dev.disconnect()

def cmd_mountcustom(args, dev):
im = ImageMounter(dev)
im.mount(args.path.decode(u'utf-8'))
im.disconnect()
dev.disconnect()

mountparser = cmdargs.add_parser(
u'mount',
Expand Down
1 change: 1 addition & 0 deletions installationproxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def cmd_browse(args, dev):
pxy = InstallationProxy(dev)
pprint.pprint(pxy.lookup_applications())
pxy.disconnect()
dev.disconnect()

installparser = cmdargs.add_parser(
u'install',
Expand Down
3 changes: 3 additions & 0 deletions notificationproxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ def cmd_post(args, dev):
notify = NotificationProxy(dev)
notify.post_notificaiton(args.name.decode(u'utf-8'))
notify.disconnect()
dev.disconnect()

def cmd_shutdown(args, dev):
notify = NotificationProxy(dev)
notify.shutdown()
notify.disconnect()
dev.disconnect()

def cmd_observe(args, dev):
notify = NotificationProxy(dev)
Expand All @@ -91,6 +93,7 @@ def cmd_observe(args, dev):
except:
pass
notify.disconnect()
dev.disconnect()


notifyparser = cmdargs.add_parser(
Expand Down
1 change: 1 addition & 0 deletions pcap.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ def cmd_pcap(args, dev):
pass
pcap.close()
pcapd.disconnect()
dev.disconnect()

pcapcmd = cmdargs.add_parser(
u'pcap',
Expand Down
5 changes: 5 additions & 0 deletions springboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def cmd_icon(args, dev):
sb = Springboard(dev)
data = sb.get_iconpngdata(args.appid.decode(u'utf-8'))
sb.disconnect()
dev.disconnect()
f = open(args.path.decode(u'utf-8'), u'wb')
f.write(data)
f.close()
Expand All @@ -90,6 +91,8 @@ def cmd_orient(args, dev):
sb = Springboard(dev)
orient = sb.get_interface_orientation()
sb.disconnect()
dev.disconnect()

orient_str = {
Springboard.PORTRAIT: u'↑',
Springboard.PORTRAIT_UPSIDE_DOWN: u'↓',
Expand All @@ -102,6 +105,7 @@ def cmd_wallpaper(args, dev):
sb = Springboard(dev)
data = sb.get_wallpaper_pngdata()
sb.disconnect()
dev.disconnect()
f = open(args.path.decode(u'utf-8'), u'wb')
f.write(data)
f.close()
Expand Down Expand Up @@ -173,6 +177,7 @@ def cmd_getstate(args, dev):
sb = Springboard(dev)
state = sb.get_iconstate()
sb.disconnect()
dev.disconnect()
print print_icons(state)

springboardparser = cmdargs.add_parser(
Expand Down
1 change: 1 addition & 0 deletions syslog.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def cmd_syslog(args, dev):
break
sys.stdout.write(msg)
sl.disconnect()
dev.disconnect()

# syslog command
syslogcmd = cmdargs.add_parser(
Expand Down
1 change: 1 addition & 0 deletions webkitinspector.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ def cmd_navigate(args, dev):

print wi.forwardSocketData(conn, app, ident, session, json.dumps(data))
wi.disconnect()
dev.disconnect()

webparser = cmdargs.add_parser(
u'web',
Expand Down

0 comments on commit 6ae7ccc

Please sign in to comment.