Restructure code, prepare new exploit support

bkerler · Aug 31, 2023 · a6405f2 · a6405f2
1 parent f5535fb
commit a6405f2
Show file tree

Hide file tree

Showing 50 changed files with 1,897 additions and 1,625 deletions.
diff --git a/mtk_gui b/mtk_gui
@@ -5,19 +5,18 @@ import sys
 import time
 import mock
 import threading
-import traceback
 import math
 import logging
 import ctypes
 from functools import partial
 from PySide6.QtCore import Qt, QVariantAnimation, Signal, QObject, QSize, QTranslator, QLocale, QLibraryInfo, \
  Slot, QCoreApplication
-from PySide6.QtGui import QTextOption, QPixmap, QTransform, QIcon, QAction
+from PySide6.QtGui import QTextOption, QPixmap, QTransform, QIcon
 from PySide6.QtWidgets import QMainWindow, QApplication, QWidget, QCheckBox, QVBoxLayout, QHBoxLayout, QLineEdit, \
  QPushButton
 
 from mtkclient.Library.mtk_class import Mtk
-from mtkclient.Library.mtk_da_cmd import DA_handler
+from mtkclient.Library.DA.mtk_da_handler import DA_handler
 from mtkclient.Library.gpt import gpt_settings
 from mtkclient.Library.mtk_main import Main, Mtk_Config
 

diff --git a/mtkclient/Library/Connection/devicehandler.py b/mtkclient/Library/Connection/devicehandler.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
-# (c) B.Kerler 2018-2021
+# (c) B.Kerler 2018-2023
 import inspect
 import traceback
 from binascii import hexlify

diff --git a/mtkclient/Library/Connection/usblib.py b/mtkclient/Library/Connection/usblib.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
-# (c) B.Kerler 2018-2021 GPLv3 License
+# (c) B.Kerler 2018-2023 GPLv3 License
 import logging
 
 import usb.core # pyusb
@@ -254,7 +254,8 @@ def connect(self, EP_IN=-1, EP_OUT=-1):
  self.device = None
  self.EP_OUT = None
  self.EP_IN = None
- devices = usb.core.find(find_all=True, bDeviceClass=0x2, backend=self.backend)
+ devclass = 0x2
+ devices = usb.core.find(find_all=True, bDeviceClass=devclass, backend=self.backend)
  for dev in devices:
  for usbid in self.portconfig:
  if dev.idProduct == usbid[1] and dev.idVendor == usbid[0]:

diff --git a/mtkclient/Library/Connection/usbscsi.py b/mtkclient/Library/Connection/usbscsi.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
-# (c) B.Kerler 2018-2021
+# (c) B.Kerler 2018-2023
 import argparse
 from edlclient.Library.Connection.usblib import *
 

diff --git a/mtkclient/Library/DA/__init__.py b/mtkclient/Library/DA/__init__.py
diff --git a/mtkclient/Library/daconfig.py → mtkclient/Library/DA/daconfig.py b/mtkclient/Library/daconfig.py → mtkclient/Library/DA/daconfig.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
-# (c) B.Kerler 2018-2021 GPLv3 License
+# (c) B.Kerler 2018-2023 GPLv3 License
 import logging
 import os
 from struct import unpack

diff --git a/mtkclient/Library/DA/legacy/__init__.py b/mtkclient/Library/DA/legacy/__init__.py