From 40d060628fa0015758be9339d77fe073eb12013c Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:04:58 +0800 Subject: [PATCH] Coding style --- Whatsapp_Chat_Exporter/__init__.py | 2 ++ Whatsapp_Chat_Exporter/__main__.py | 22 ++++++++++--------- Whatsapp_Chat_Exporter/data_model.py | 2 ++ Whatsapp_Chat_Exporter/extract_exported.py | 4 +++- Whatsapp_Chat_Exporter/extract_iphone.py | 6 +---- .../extract_iphone_media.py | 3 ++- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Whatsapp_Chat_Exporter/__init__.py b/Whatsapp_Chat_Exporter/__init__.py index f8c6ac7..cf3f3d2 100644 --- a/Whatsapp_Chat_Exporter/__init__.py +++ b/Whatsapp_Chat_Exporter/__init__.py @@ -1 +1,3 @@ +#!/usr/bin/python3 + __version__ = "0.9.5" diff --git a/Whatsapp_Chat_Exporter/__main__.py b/Whatsapp_Chat_Exporter/__main__.py index 1162530..14e1f6d 100644 --- a/Whatsapp_Chat_Exporter/__main__.py +++ b/Whatsapp_Chat_Exporter/__main__.py @@ -1,19 +1,21 @@ -try: - from .__init__ import __version__ -except ImportError: - from Whatsapp_Chat_Exporter.__init__ import __version__ -import glob -from Whatsapp_Chat_Exporter import extract, extract_exported, extract_iphone -from Whatsapp_Chat_Exporter import extract_iphone_media -from Whatsapp_Chat_Exporter.data_model import ChatStore -from Whatsapp_Chat_Exporter.utility import Crypt, check_update, import_from_json -from argparse import ArgumentParser, SUPPRESS +#!/usr/bin/python3 + import os import sqlite3 import shutil import json import string +import glob +from Whatsapp_Chat_Exporter import extract_exported, extract_iphone +from Whatsapp_Chat_Exporter import extract, extract_iphone_media +from Whatsapp_Chat_Exporter.data_model import ChatStore +from Whatsapp_Chat_Exporter.utility import Crypt, check_update, import_from_json +from argparse import ArgumentParser, SUPPRESS from sys import exit +try: + from .__init__ import __version__ +except ImportError: + from Whatsapp_Chat_Exporter.__init__ import __version__ def main(): diff --git a/Whatsapp_Chat_Exporter/data_model.py b/Whatsapp_Chat_Exporter/data_model.py index 07c95cc..57ec271 100644 --- a/Whatsapp_Chat_Exporter/data_model.py +++ b/Whatsapp_Chat_Exporter/data_model.py @@ -1,3 +1,5 @@ +#!/usr/bin/python3 + import os from datetime import datetime from typing import Union diff --git a/Whatsapp_Chat_Exporter/extract_exported.py b/Whatsapp_Chat_Exporter/extract_exported.py index 6fb5319..0aae498 100644 --- a/Whatsapp_Chat_Exporter/extract_exported.py +++ b/Whatsapp_Chat_Exporter/extract_exported.py @@ -1,6 +1,8 @@ +#!/usr/bin/python3 + +import os from datetime import datetime from mimetypes import MimeTypes -import os from Whatsapp_Chat_Exporter.data_model import ChatStore, Message from Whatsapp_Chat_Exporter.utility import Device diff --git a/Whatsapp_Chat_Exporter/extract_iphone.py b/Whatsapp_Chat_Exporter/extract_iphone.py index bfeba79..822ad24 100644 --- a/Whatsapp_Chat_Exporter/extract_iphone.py +++ b/Whatsapp_Chat_Exporter/extract_iphone.py @@ -1,11 +1,7 @@ #!/usr/bin/python3 -from glob import glob -import sqlite3 -import json -import jinja2 import os -import shutil +from glob import glob from pathlib import Path from mimetypes import MimeTypes from Whatsapp_Chat_Exporter.data_model import ChatStore, Message diff --git a/Whatsapp_Chat_Exporter/extract_iphone_media.py b/Whatsapp_Chat_Exporter/extract_iphone_media.py index 1a5bcdc..b293ea7 100644 --- a/Whatsapp_Chat_Exporter/extract_iphone_media.py +++ b/Whatsapp_Chat_Exporter/extract_iphone_media.py @@ -7,7 +7,8 @@ import time import getpass import threading try: - from iphone_backup_decrypt import EncryptedBackup, RelativePath, FailedToDecryptError, Domain + from iphone_backup_decrypt import EncryptedBackup, RelativePath + from iphone_backup_decrypt import FailedToDecryptError, Domain except ModuleNotFoundError: support_encrypted = False else: