Merge pull request #187 from rowingdude/debug-updates

Updated logging, validation, and general code aethetics.

Author: rowingdude

analyzeMFT.py

@@ -1,10 +1,22 @@
-#!/usr/bin/env python3
-import os
-import sys
-import asyncio
-from src.analyzeMFT.cli import mainsys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'src')))
-
-if __name__ == "__main__":
-    if sys.platform == "win32":
-        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-    asyncio.run(main())
+#!/usr/bin/env python3
+
+import os
+import sys
+import asyncio
+
+def setup_path():
+    src_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))
+    if src_path not in sys.path:
+        sys.path.insert(0, src_path)
+
+def main():
+    setup_path()
+    from analyzeMFT.cli import main as cli_main
+    
+    if sys.platform == "win32":
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+    
+    asyncio.run(cli_main())
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -1,41 +1,41 @@
-from setuptools import setup, find_packages
-
-with open("README.md", "r", encoding="utf-8") as fh:
-    long_description = fh.read()
-
-setup(
-    name='analyzeMFT',
-    version='3.1.0',
-    author='Benjamin Cance',
-    author_email='[email protected]',
-    package_dir={'': 'src'},
-    packages=find_packages(where='src'),
-    package_data={
-        'analyzeMFT': ['sql/*.sql'],
-    },
-    url='http://github.com/rowingdude/analyzeMFT',
-    license='LICENSE.txt',
-    description='Analyze the $MFT from a NTFS filesystem.',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-    ],
-    python_requires=">=3.7",
-    install_requires=[
-        "pywin32;platform_system=='Windows'",
-        "openpyxl==3.0.10",
-    ],
-    entry_points={
-        'console_scripts': [
-            'analyzemft=analyzeMFT:main',
-        ],
-    },
+from setuptools import setup, find_packages
+
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
+
+setup(
+    name='analyzeMFT',
+    version='3.1.0',
+    author='Benjamin Cance',
+    author_email='[email protected]',
+    package_dir={'': 'src'},
+    packages=find_packages(where='src'),
+    package_data={
+        'analyzeMFT': ['sql/*.sql'],
+    },
+    url='http://github.com/rowingdude/analyzeMFT',
+    license='LICENSE.txt',
+    description='Analyze the $MFT from a NTFS filesystem.',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+    ],
+    python_requires=">=3.7",
+    install_requires=[
+        "pywin32;platform_system=='Windows'",
+        "openpyxl==3.0.10",
+    ],
+    entry_points={
+        'console_scripts': [
+            'analyzemft=analyzeMFT:main',
+        ],
+    },
 )

src/analyzeMFT/__init__.py

@@ -1,22 +1,22 @@
-import asyncio
-from .windows_time import WindowsTime
-from .mft_record import MftRecord
-from .mft_analyzer import MftAnalyzer
-from .file_writers import FileWriters
-from .constants import VERSION, CSV_HEADER
-from .cli import main as cli_main
-
-def main():
-    asyncio.run(cli_main())
-
-__all__ = [
-    'WindowsTime',
-    'MftRecord',
-    'MftAnalyzer',
-    'FileWriters',
-    'VERSION',
-    'CSV_HEADER',
-    'main'
-]
-
+import asyncio
+from .windows_time import WindowsTime
+from .mft_record import MftRecord
+from .mft_analyzer import MftAnalyzer
+from .file_writers import FileWriters
+from .constants import VERSION, CSV_HEADER
+from .cli import main as cli_main
+
+def main():
+    asyncio.run(cli_main())
+
+__all__ = [
+    'WindowsTime',
+    'MftRecord',
+    'MftAnalyzer',
+    'FileWriters',
+    'VERSION',
+    'CSV_HEADER',
+    'main'
+]
+
 __version__ = VERSION