mbirth/tcl_ota_check
1
0
Fork 0
mirror of https://github.com/mbirth/tcl_ota_check.git synced 2024-11-12 23:36:46 +00:00
Code Issues Releases Wiki Activity

pylint, autopep8, isort runthroughs

Browse Source
This commit is contained in:
thurask 2018-02-03 15:24:36 -05:00
parent 42566d1195
commit da3663486a
No known key found for this signature in database
GPG Key ID: A6CCCDEA29795048
22 changed files with 148 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tclcheck.py
View File

@ -6,9 +6,11 @@
import os
import random
import sys
import tcllib
import tcllib.argparser
fc = tcllib.FotaCheck()
fc.serid = "3531510"
#fc.osvs = "7.1.1"
@ -27,6 +29,7 @@ dp.add_argument("--rawmode", help="override --mode with raw value (2=OTA, 4=FULL
dp.add_argument("--rawcltp", help="override --type with raw value (10=MOBILE, 2010=DESKTOP)", metavar="CLTP")
args = dp.parse_args(sys.argv[1:])
def sel_mode(txtmode, autoval, rawval):
if rawval:
enum = tcllib.default_enum("MODE", {"RAW": rawval})
@ -37,6 +40,7 @@ def sel_mode(txtmode, autoval, rawval):
return fc.MODE.OTA
return fc.MODE.FULL
def sel_cltp(txtmode, autoval, rawval):
if rawval:
enum = tcllib.default_enum("CLTP", {"RAW": rawval})
@ -47,6 +51,7 @@ def sel_cltp(txtmode, autoval, rawval):
return fc.CLTP.DESKTOP
return fc.CLTP.MOBILE
if args.imei:
print("Use specified IMEI: {}".format(args.imei))
fc.serid = args.imei
@ -71,7 +76,7 @@ req_xml = fc.do_request(curef, fv, tv, fw_id)
print(fc.pretty_xml(req_xml))
fileid, fileurl, slaves, encslaves, s3_fileurl, s3_slaves = fc.parse_request(req_xml)
if len(encslaves) > 0:
if encslaves:
chksum_xml = fc.do_checksum(random.choice(encslaves), fileurl, fileurl)
print(fc.pretty_xml(chksum_xml))
file_addr, sha1_body, sha1_enc_footer, sha1_footer = fc.parse_checksum(chksum_xml)

5
tclcheck_allfull.py
View File

@ -4,10 +4,13 @@
# pylint: disable=C0111,C0326,C0103
import sys
from requests.exceptions import RequestException
import tcllib
import tcllib.argparser
from tcllib import ansi
from requests.exceptions import RequestException, Timeout
fc = tcllib.FotaCheck()
fc.serid = "3531510"

9
tclcheck_allota.py
View File

@ -3,13 +3,14 @@
# pylint: disable=C0111,C0326,C0103
import json
import requests
import sys
from requests.exceptions import RequestException
import tcllib
import tcllib.argparser
from tcllib import ansi
from requests.exceptions import RequestException
fc = tcllib.FotaCheck()
fc.serid = "3531510"
@ -41,7 +42,7 @@ print("List of latest OTA firmware{} by PRD:".format(force_ver_text))
for prd, variant in prds.items():
model = variant["variant"]
lastver = variant["last_ota"]
if lastver is None: lastver = variant["last_full"]
lastver = variant["last_full"] if lastver is None else lastver
if args.forcever is not None:
lastver = args.forcever
if prdcheck in prd:

5
tclcheck_findprd.py
View File

@ -5,10 +5,13 @@
import collections
import sys
from requests.exceptions import RequestException, Timeout
import tcllib
import tcllib.argparser
from tcllib import ansi
from requests.exceptions import RequestException, Timeout
fc = tcllib.FotaCheck()
fc.serid = "3531510"

6
tclcheck_findprd2.py
View File

@ -3,12 +3,14 @@
# pylint: disable=C0111,C0326,C0103
import collections
import sys
from requests.exceptions import RequestException, Timeout
import tcllib
import tcllib.argparser
from tcllib import ansi
from requests.exceptions import RequestException, Timeout
# Variants to scan for
SCAN_VARIANTS = ["001", "003", "009", "010", "700"]

5
tclcheck_findver.py
View File

@ -4,10 +4,13 @@
# pylint: disable=C0111,C0326,C0103
import sys
from requests.exceptions import RequestException, Timeout
import tcllib
import tcllib.argparser
from tcllib import ansi
from requests.exceptions import RequestException, Timeout
fc = tcllib.FotaCheck()
fc.serid = "3531510"

6
tclcheck_gapfill.py
View File

@ -4,11 +4,13 @@
# pylint: disable=C0111,C0326,C0103
import json
import requests
import sys
import tcllib
from requests.exceptions import RequestException
import tcllib
# 1. Fetch list of missing OTAs (e.g. from ancient versions to current)
# 2. Query updates from FOTA servers (and store XML)
# (3. Upload will be done manually with upload_logs.py)

3
tclchksum.py
View File

@ -3,12 +3,13 @@
# pylint: disable=C0111,C0326,C0103
import os
import random
import sys
import tcllib
import tcllib.argparser
fc = tcllib.FotaCheck()
encslaves = [

5
tcldown.py
View File

@ -6,9 +6,11 @@
import os
import random
import sys
import tcllib
import tcllib.argparser
fc = tcllib.FotaCheck()
fc.serid = "3531510"
#fc.osvs = "7.1.1"
@ -27,12 +29,14 @@ dp.add_argument("--rawmode", help="override --mode with raw value (2=OTA, 4=FULL
dp.add_argument("--rawcltp", help="override --type with raw value (10=MOBILE, 2010=DESKTOP)", metavar="CLTP")
args = dp.parse_args(sys.argv[1:])
def sel_mode(defaultmode, rawval):
if rawval:
enum = tcllib.default_enum("MODE", {"RAW": rawval})
return enum.RAW
return defaultmode
def sel_cltp(txtmode, rawval):
if rawval:
enum = tcllib.default_enum("CLTP", {"RAW": rawval})
@ -41,6 +45,7 @@ def sel_cltp(txtmode, rawval):
return fc.CLTP.MOBILE
return fc.CLTP.DESKTOP
if args.imei:
print("Use specified IMEI: {}".format(args.imei))
fc.serid = args.imei

21
tcllib/__init__.py
View File

@ -3,19 +3,16 @@
# pylint: disable=C0111,C0326
import enum
import requests
from . import credentials
from . import devlist
from . import dumpmgr
from . import servervote
from . import tclcheck
from . import tclrequest
from . import tclchecksum
from . import tclencheader
from . import xmltools
def default_enum(enumname, vardict):
return enum.IntEnum(enumname, vardict, module=__name__, qualname="tcllib.FotaCheck.{}".format(enumname))
import requests
from . import (credentials, devlist, dumpmgr, servervote, tclcheck,
tclchecksum, tclencheader, tclrequest, xmltools)
def default_enum(enumname, vardict, qualroot="tcllib.FotaCheck"):
return enum.IntEnum(enumname, vardict, module=__name__, qualname="{}.{}".format(qualroot, enumname))
class FotaCheck(
tclcheck.TclCheckMixin,

4
tcllib/ansi.py
View File

@ -3,8 +3,8 @@
import platform
# Needed to make ANSI escape sequences work in Windows
system = platform.system()
if system == "Windows":
SYSTEM = platform.system()
if SYSTEM == "Windows":
try:
import colorama
colorama.init()

1
tcllib/argparser.py
View File

@ -5,6 +5,7 @@
import argparse
import webbrowser
class DefaultParser(argparse.ArgumentParser):
def __init__(self, appname, desc=None):
super().__init__(prog=appname, description=desc, epilog="https://github.com/mbirth/tcl_ota_check")

1
tcllib/credentials.py
View File

@ -2,6 +2,7 @@
import base64
class CredentialsMixin:
@staticmethod
def get_creds():

18
tcllib/devlist.py
View File

@ -2,14 +2,18 @@
import json
import os
import requests
import time
import requests
from . import ansi
DEVICELIST_URL = "https://tclota.birth-online.de/json_lastupdates.php"
DEVICELIST_FILE = "prds.json"
DEVICELIST_CACHE_SECONDS = 86400
class DevListMixin:
@staticmethod
def get_devicelist(force=False, output_diff=True):
@ -21,18 +25,18 @@ class DevListMixin:
filemtime = filestat.st_mtime
if filemtime > time.time() - DEVICELIST_CACHE_SECONDS:
need_download = False
with open(DEVICELIST_FILE, "rt") as df:
old_prds = json.load(df)
with open(DEVICELIST_FILE, "rt") as dlfile:
old_prds = json.load(dlfile)
except FileNotFoundError:
pass
if need_download or force:
prds_json = requests.get(DEVICELIST_URL).text
with open(DEVICELIST_FILE, "wt") as df:
df.write(prds_json)
with open(DEVICELIST_FILE, "wt") as dlfile:
dlfile.write(prds_json)
with open(DEVICELIST_FILE, "rt") as df:
prds = json.load(df)
with open(DEVICELIST_FILE, "rt") as dlfile:
prds = json.load(dlfile)
if old_prds and output_diff:
DevListMixin.print_prd_diff(old_prds, prds)

12
tcllib/dumpmgr.py
View File

@ -3,8 +3,10 @@
import errno
import glob
import os
from . import ansi
class DumpMgrMixin:
def __init__(self):
self.last_dump_filename = None
@ -14,11 +16,11 @@ class DumpMgrMixin:
if not os.path.exists(os.path.dirname(outfile)):
try:
os.makedirs(os.path.dirname(outfile))
except OSError as e:
if e.errno != errno.EEXIST:
except OSError as err:
if err.errno != errno.EEXIST:
raise
with open(outfile, "w", encoding="utf-8") as f:
f.write(data)
with open(outfile, "w", encoding="utf-8") as fhandle:
fhandle.write(data)
self.last_dump_filename = outfile
def delete_last_dump(self):
@ -31,7 +33,7 @@ class DumpMgrMixin:
# To disable this info, uncomment the following line.
# return
files = glob.glob(os.path.normpath("logs/*.xml"))
if len(files) > 0:
if files:
print()
print("{}There are {} logs collected in the logs/ directory.{} Please consider uploading".format(ansi.YELLOW, len(files), ansi.RESET))
print("them to https://tclota.birth-online.de/ by running {}./upload_logs.py{}.".format(ansi.CYAN, ansi.RESET))

3
tcllib/servervote.py
View File

@ -2,6 +2,7 @@
import numpy
class ServerVoteMixin:
def __init__(self):
self.g2master = None
@ -41,7 +42,7 @@ class ServerVoteMixin:
self.check_time_count += 1
def check_time_avg(self):
return (self.check_time_sum / self.check_time_count)
return self.check_time_sum / self.check_time_count
def master_server_vote_on_time(self, last_duration, avg_duration):
if last_duration < avg_duration - 0.5:

12
tcllib/tclcheck.py
View File

@ -2,9 +2,11 @@
import time
from collections import OrderedDict
import requests
from defusedxml import ElementTree
class TclCheckMixin:
def do_check(self, https=True, timeout=10, max_tries=5):
protocol = "https://" if https else "http://"
@ -12,7 +14,7 @@ class TclCheckMixin:
params = OrderedDict()
params["id"] = self.serid
params["curef"] = self.curef
params["fv"] = self.fv
params["fv"] = self.fvver
params["mode"] = self.mode.value
params["type"] = self.ftype
params["cltp"] = self.cltp.value
@ -23,7 +25,7 @@ class TclCheckMixin:
#params["ckot"] = self.ckot.value
last_response = None
for num_try in range(0, max_tries):
for _ in range(0, max_tries):
try:
reqtime_start = time.perf_counter()
req = self.sess.get(url, params=params, timeout=timeout)
@ -59,12 +61,12 @@ class TclCheckMixin:
def parse_check(xmlstr):
root = ElementTree.fromstring(xmlstr)
curef = root.find("CUREF").text
fv = root.find("VERSION").find("FV").text
tv = root.find("VERSION").find("TV").text
fvver = root.find("VERSION").find("FV").text
tvver = root.find("VERSION").find("TV").text
fw_id = root.find("FIRMWARE").find("FW_ID").text
fileinfo = root.find("FIRMWARE").find("FILESET").find("FILE")
fileid = fileinfo.find("FILE_ID").text
filename = fileinfo.find("FILENAME").text
filesize = fileinfo.find("SIZE").text
filehash = fileinfo.find("CHECKSUM").text
return curef, fv, tv, fw_id, fileid, filename, filesize, filehash
return curef, fvver, tvver, fw_id, fileid, filename, filesize, filehash

2
tcllib/tclchecksum.py
View File

@ -1,8 +1,10 @@
# -*- coding: utf-8 -*-
import json
from defusedxml import ElementTree
class TclChecksumMixin:
def do_checksum(self, encslave, address, uri):
url = "http://" + encslave + "/checksum.php"

1
tcllib/tclencheader.py
View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
class TclEncHeaderMixin:
def do_encrypt_header(self, encslave, address):
params = self.get_creds2()

17
tcllib/tclrequest.py
View File

@ -4,11 +4,13 @@ import binascii
import hashlib
import random
import time
from math import floor
import zlib
from collections import OrderedDict
from math import floor
from defusedxml import ElementTree
'''
private HashMap<String, String> buildDownloadUrisParams(UpdatePackageInfo updatePackageInfo) {
FotaLog.m28v(TAG, "doAfterCheck");
@ -31,6 +33,7 @@ from defusedxml import ElementTree
}
'''
class TclRequestMixin:
@staticmethod
def get_salt():
@ -41,10 +44,10 @@ class TclRequestMixin:
def get_vk2(self, params_dict, cltp):
params_dict["cltp"] = cltp
query = ""
for k, v in params_dict.items():
if len(query) > 0:
for key, val in params_dict.items():
if query:
query += "&"
query += k + "=" + str(v)
query += key + "=" + str(val)
vdk = zlib.decompress(binascii.a2b_base64(self.VDKEY))
query += vdk.decode("utf-8")
engine = hashlib.sha1()
@ -52,14 +55,14 @@ class TclRequestMixin:
hexhash = engine.hexdigest()
return hexhash
def do_request(self, curef, fv, tv, fw_id):
def do_request(self, curef, fvver, tvver, fw_id):
url = "https://" + self.g2master + "/download_request.php"
params = OrderedDict()
params["id"] = self.serid
params["salt"] = self.get_salt()
params["curef"] = curef
params["fv"] = fv
params["tv"] = tv
params["fv"] = fvver
params["tv"] = tvver
params["type"] = self.ftype
params["fw_id"] = fw_id
params["mode"] = self.mode.value

1
tcllib/xmltools.py
View File

@ -2,6 +2,7 @@
import xml.dom.minidom
class XmlToolsMixin:
@staticmethod
def pretty_xml(xmlstr):

3
upload_logs.py
View File

@ -7,8 +7,10 @@
import glob
import os
import requests
# This is the URL to an installation of https://github.com/mbirth/tcl_update_db
UPLOAD_URL = "https://tclota.birth-online.de/"
LOGS_GLOB = os.path.normpath("logs/*.xml")
@ -39,4 +41,3 @@ try:
print(" OK")
except OSError as e:
print(" FAILED")