Browse Source

code cleanup

master
Wesley Kerfoot 5 years ago
parent
commit
900cc656fa
  1. 13
      adb.nim

13
adb.nim

@ -33,8 +33,8 @@ proc parseAdb(resp : string) : Option[string] =
var msg_len : int var msg_len : int
var offset : int var offset : int
var status = resp[0..3] let status = resp[0..3]
var loc = parseHex(resp, msg_len, 4, 4) let loc = parseHex(resp, msg_len, 4, 4)
if msg_len > 0: if msg_len > 0:
offset = loc + 4 + msg_len - 1 offset = loc + 4 + msg_len - 1
@ -52,7 +52,7 @@ proc makeMsg(msg : string) : string =
fmt"{msg.len:04x}{msg}" fmt"{msg.len:04x}{msg}"
proc adbConnect() : Socket = proc adbConnect() : Socket =
var socket = newSocket(buffered=false) let socket = newSocket(buffered=false)
socket.connect("127.0.0.1", Port(5037)) socket.connect("127.0.0.1", Port(5037))
socket socket
@ -227,7 +227,7 @@ proc adbPull(filename : string) : Option[AndroidFile] =
androidFile: fileBlob)) androidFile: fileBlob))
proc runCommand(payload : string) : string = proc runCommand(payload : string) : string =
var socket = adbConnect() let socket = adbConnect()
socket.send("host:transport-usb".makeMsg) socket.send("host:transport-usb".makeMsg)
discard socket.recvExactly(4) discard socket.recvExactly(4)
@ -254,5 +254,6 @@ proc devices() : Option[string] =
discard execCmd("adb start-server") discard execCmd("adb start-server")
echo adbSend("This\nIs\nA\nTest\n", "/storage/7AFD-17E3/testmyshit", "777") discard adbSend("./test.opus".readFile, "/storage/7AFD-17E3/cakerave.opus", "777")
echo adbPull("/storage/7AFD-17E3/testmyshit").get.androidFile
"./cakerave.opus".writeFile(adbPull("/storage/7AFD-17E3/testmyshit").get.androidFile)

Loading…
Cancel
Save