1
0
mirror of https://github.com/mbirth/tcl_ota_check.git synced 2024-11-09 22:06:47 +00:00

add new syntax support to findprd

This commit is contained in:
thurask 2018-06-11 19:57:29 -04:00
parent 6866732133
commit acf55d8e23
No known key found for this signature in database
GPG Key ID: A6CCCDEA29795048

View File

@ -24,6 +24,7 @@ dp.add_argument("-f", "--floor", help="Beginning of scan range", dest="floor", n
dp.add_argument("-c", "--ceiling", help="End of scan range", dest="ceiling", nargs="?", type=int, default=999) dp.add_argument("-c", "--ceiling", help="End of scan range", dest="ceiling", nargs="?", type=int, default=999)
dp.add_argument("-l", "--local", help="Force using local database", dest="local", action="store_true", default=False) dp.add_argument("-l", "--local", help="Force using local database", dest="local", action="store_true", default=False)
dp.add_argument("-np", "--no-prefix", help="Skip 'PRD-' prefix", dest="noprefix", action="store_true", default=False) dp.add_argument("-np", "--no-prefix", help="Skip 'PRD-' prefix", dest="noprefix", action="store_true", default=False)
dp.add_argument("-k2", "--key2", help="V2 syntax", dest="key2mode", action="store_true", default=False)
args = dp.parse_args(sys.argv[1:]) args = dp.parse_args(sys.argv[1:])
floor = args.floor floor = args.floor
@ -38,6 +39,10 @@ print(" OK")
print("Valid PRDs not already in database:") print("Valid PRDs not already in database:")
if args.key2mode:
prds = [x.replace("APBI-PRD", "")for x in prd_db]
prdx = list({x[0:5]: x[5:]} for x in prds)
else:
prds = [x.replace("PRD-", "").split("-") for x in prd_db] prds = [x.replace("PRD-", "").split("-") for x in prd_db]
prdx = list({x[0]: x[1]} for x in prds) prdx = list({x[0]: x[1]} for x in prds)
prddict = collections.defaultdict(list) prddict = collections.defaultdict(list)
@ -46,7 +51,7 @@ for prdc in prdx:
prddict[key].append(value) prddict[key].append(value)
if args.tocheck is not None: if args.tocheck is not None:
args.tocheck = args.tocheck.replace("PRD-", "") args.tocheck = args.tocheck.replace("PRD-", "").replace("APBI-PRD", "")
prdkeys = list(prddict.keys()) prdkeys = list(prddict.keys())
for k in prdkeys: for k in prdkeys:
if k != args.tocheck: if k != args.tocheck:
@ -59,7 +64,12 @@ dev = DesktopDevice()
runner = RequestRunner(ServerVoteSelector(), https=False) runner = RequestRunner(ServerVoteSelector(), https=False)
runner.max_tries = 20 runner.max_tries = 20
if args.key2mode:
prefix = "APBI-PRD"
suffix = ""
else:
prefix = "" if args.noprefix else "PRD-" prefix = "" if args.noprefix else "PRD-"
suffix = "-"
for center in sorted(prddict.keys()): for center in sorted(prddict.keys()):
tails = [int(i) for i in prddict[center]] tails = [int(i) for i in prddict[center]]
@ -68,7 +78,7 @@ for center in sorted(prddict.keys()):
done_count = 0 done_count = 0
print("Checking {} variant codes for model {}.".format(total_count, center)) print("Checking {} variant codes for model {}.".format(total_count, center))
for j in safes: for j in safes:
curef = "{}{}-{:03}".format(prefix, center, j) curef = "{}{}{}{:03}".format(prefix, center, suffix, j)
done_count += 1 done_count += 1
print("Checking {} ({}/{})".format(curef, done_count, total_count)) print("Checking {} ({}/{})".format(curef, done_count, total_count))
print(ansi.UP_DEL, end="") print(ansi.UP_DEL, end="")