Merge pull request #37 from Muddyblack/31-new-project-structure

31 new project structure
Muddyblack · Jan 12, 2024 · 5defccd · 5defccd
2 parents 9386b21 + 7288d38
commit 5defccd
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -19,6 +19,8 @@ jobs:
         python -m pip install --upgrade pip
         pip install -r requirements.txt
         pip install pylint
+    - name: Set PYTHONPATH
+      run: echo "PYTHONPATH=$PYTHONPATH:$(pwd)" >> $GITHUB_ENV
     - name: Run pylint
       run: |
         pylint **/*.py
diff --git a/.github/workflows/run_unittests.yml b/.github/workflows/run_unittests.yml
@@ -20,6 +20,10 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y libimage-exiftool-perl
+    - name: Set PYTHONPATH
+      run: echo "PYTHONPATH=$PYTHONPATH:$(pwd)" >> $GITHUB_ENV
     - name: Run tests
+      # GOAL: python -m unittest discover -s . -p 'test*.py' -> Problem not fiinding setup file
+      # ALSO bad with MetaDataEditor cant load Qt and exiftool: python -m unittest discover -s MetaDataEditor/unittests
       run: |
-        python -m unittest discover unittests
+        python -m unittest discover -s file_manager/unittests
diff --git a/MetaDataEditor/unittests/test_image_metadata_handler.py b/MetaDataEditor/unittests/test_image_metadata_handler.py
@@ -12,7 +12,7 @@ def setUpClass(cls):
         cls.file_format = "JPEG"
 
     def setUp(self):
-        self.mock_open = patch("image_metadata_handler.Image.open").start()
+        self.mock_open = patch("PIL.Image.open").start()
         self.mock_image = self.create_mock_image()
         self.mock_open.return_value = self.mock_image
 

diff --git a/drive_change_detector.py → file_manager/drive_change_detector.py b/drive_change_detector.py → file_manager/drive_change_detector.py
diff --git a/drive_connector.py → file_manager/drive_connector.py b/drive_connector.py → file_manager/drive_connector.py
diff --git a/drive_downloader.py → file_manager/drive_downloader.py b/drive_downloader.py → file_manager/drive_downloader.py
@@ -9,6 +9,7 @@
 
 
 # pylint: disable=too-many-arguments
+#pylint: disable=too-many-locals
 def download_file(service, file_item, target_directory="./temp"):
     """Download an item from Google Drive. (file or entire folder)"""
     file_name = file_item["name"]

diff --git a/drive_local_file_manager.py → file_manager/drive_local_file_manager.py b/drive_local_file_manager.py → file_manager/drive_local_file_manager.py
diff --git a/show_file_checker.py → file_manager/show_file_checker.py b/show_file_checker.py → file_manager/show_file_checker.py
@@ -2,10 +2,16 @@
 This module checks if a file is supposed to be displayed at the current time. 
 It does this by checking the filename or metadata
 """
+import os
+import sys
 import re
 import logging
 from datetime import datetime
 from pathlib import Path
+
+#pylint: disable=wrong-import-position
+PARENT_DIRECTORY_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.append(PARENT_DIRECTORY_PATH)
 from MetaDataEditor.image_metadata_handler import read_metadata
 
 SUPPORTED_DATE_FORMATS = [

diff --git a/unittests/setup.py → file_manager/unittests/setup.py b/unittests/setup.py → file_manager/unittests/setup.py
diff --git a/unittests/test_drive_change_detector.py → ...r/unittests/test_drive_change_detector.py b/unittests/test_drive_change_detector.py → ...r/unittests/test_drive_change_detector.py
diff --git a/unittests/test_drive_connector.py → ...manager/unittests/test_drive_connector.py b/unittests/test_drive_connector.py → ...manager/unittests/test_drive_connector.py
diff --git a/unittests/test_drive_downloader.py → ...anager/unittests/test_drive_downloader.py b/unittests/test_drive_downloader.py → ...anager/unittests/test_drive_downloader.py
diff --git a/unittests/test_show_file_checker.py → ...nager/unittests/test_show_file_checker.py b/unittests/test_show_file_checker.py → ...nager/unittests/test_show_file_checker.py
diff --git a/images_slide_show.sh b/images_slide_show.sh
@@ -13,7 +13,7 @@ trap cleanup EXIT
 SCRIPT_PATH="$(realpath "$(dirname "$0")")"
 CONFIG_FILE="$SCRIPT_PATH/app_config.json"
 LOGO_PATH="$SCRIPT_PATH/LOGO.png"
-UPDATE_CHECK_SCRIPT="$SCRIPT_PATH/drive_local_file_manager.py"
+UPDATE_CHECK_SCRIPT="$SCRIPT_PATH/file_manager/drive_local_file_manager.py"
 CURRENT_FILES_FILE="$SCRIPT_PATH/app_data/current_files.json"
 BLACK_IMAGE_FILE="$SCRIPT_PATH/black.png"