diff --git a/ImportPhotos.py b/ImportPhotos.py index b66b36e..b86ab6d 100644 --- a/ImportPhotos.py +++ b/ImportPhotos.py @@ -34,10 +34,6 @@ import os import uuid import json -try: - import subprocess -except: - pass # Import python module CHECK_MODULE = '' @@ -46,22 +42,15 @@ CHECK_MODULE = 'exifread' except: - try: - subprocess.call(['pip', 'install', 'exifread']) - CHECK_MODULE = '' - except ModuleNotFoundError: - pass + CHECK_MODULE = '' + try: if CHECK_MODULE == '': from PIL import Image from PIL.ExifTags import TAGS CHECK_MODULE = 'PIL' except: - try: - subprocess.call(['pip', 'install', 'pillow']) - CHECK_MODULE = '' - except ModuleNotFoundError: - pass + CHECK_MODULE = '' FORM_CLASS, _ = uic.loadUiType(os.path.join( os.path.dirname(__file__), 'ui/impphotos.ui')) diff --git a/code/PhotosViewer.py b/code/PhotosViewer.py index d6cb949..7de8c85 100644 --- a/code/PhotosViewer.py +++ b/code/PhotosViewer.py @@ -35,11 +35,6 @@ opencv = True except: opencv = False - try: - subprocess.call(['pip', 'install', 'opencv-python']) - opencv = True - except ModuleNotFoundError: - pass class PhotosViewer(QGraphicsView): diff --git a/metadata.txt b/metadata.txt index 1ae7795..3c8dc4d 100644 --- a/metadata.txt +++ b/metadata.txt @@ -24,8 +24,8 @@ repository=https://github.com/KIOS-Research/ImportPhotos/ # Recommended items: # Uncomment the following line and add your changelog: changelog=2023-01-04 ImportPhotos 3.0.5: - Automatically install some modules (exifread, pillow, opencv-python) - Add label space in the window of the photo + Show the photo in the tooltip window + Add label space in the window of the photo (show the title/name of the file more clearly) Fix some issues with empty fields (Thanks @gaspermeister) Fix python type error on photos viewer setGeometry (Thanks @faebebin) Fix the error if the file in the Path field doesn't exist (Thanks @KrisRadowski, @turzik-x)