modifications

Author: LordAmit

image_in_window_screensaver/argument_handler.py

@@ -4,6 +4,7 @@
 _file_path: str = None
 _ignore_keyword: str = None
 _backup_path: str = None
+_start_image_path: str = None
 
 def get_path() -> str:
     global _file_path
@@ -29,19 +30,28 @@ def get_backup()->str:
         _get_arguments()
     return _backup_path
 
+def get_start_image_path()->str:
+    global _start_image_path
+    if not _start_image_path:
+        _get_arguments()
+    return _start_image_path
 
 def _get_arguments():
     l.log("parsing arguments")
     global _file_path
     global _ignore_keyword
     global _backup_path
+    global _start_image_path
 
     parser = argparse.ArgumentParser()
     parser.add_argument('--ignore', type=str, help='keywords to be ignored while parsing files')
     parser.add_argument('--path', type=str, help='address from where images will be pursed', required=True)
     parser.add_argument('--backup', type=str, help='directory path for backing up non-compressed images')
+    parser.add_argument('--start_image', type=str, help='start image path')
     args = parser.parse_args()
     _file_path = args.path
     _backup_path = args.backup
+    if args.start_image:
+        _start_image_path = args.start_image
     if args.ignore:
         _ignore_keyword = args.ignore

image_in_window_screensaver/bad_practise_global.py

@@ -11,4 +11,5 @@
 max_pause_secs = 1500
 pause_secs = 300
 
+shuffle_from_start = True
 autoplay = True

image_in_window_screensaver/image_widget.py

@@ -8,7 +8,7 @@
     QKeySequence
 from qtpy.QtWidgets import QWidget, QLabel, QSizePolicy, QVBoxLayout
 from send2trash import send2trash
-
+import argument_handler as argh
 import bad_practise_global as bpg
 import custom_log as l
 import file_walker
@@ -48,6 +48,19 @@ def __init__(self):
         self._layout.addWidget(self._image_label)
         self.setLayout(self._layout)
         self.initialize_images()
+        if bpg.shuffle_from_start:
+            self.image_shuffle()
+        self._set_start_image()
+
+    def _set_start_image(self):
+        self.start_image = argh.get_start_image_path()
+        if self.start_image:
+            l.log("setting start image: "+self.start_image)
+            index = self.get_index_from_image_path(
+                    self.start_image)
+            self._set_image(index)
+            self._current_index = index
+
 
     def initialize_images(self, mode=None, current_image_path=None,
                           to_sort: bool = False,
@@ -60,7 +73,6 @@ def initialize_images(self, mode=None, current_image_path=None,
             self._current_index = self.get_index_from_image_path(
                 current_image_path)
             self._shuffle_start_index = self._current_index
-        self.image_shuffle()
         self._set_image(self._current_index)
 
     def is_image_landscape(self, image: QPixmap):
@@ -73,7 +85,12 @@ def get_index_from_image_path(self, image_path: str):
         # for i in range(0, len(self._all_images)):
         #     if self._all_images[i] is image_path:
         #         return i
-        return self._all_images.index(image_path)
+
+        try:
+            return self._all_images.index(image_path)
+        except ValueError:
+            l.log("requested image {} not found. returning 0.".format(image_path))
+            return 0
 
     def image_shuffle(self):
         l.log("shuffle")
@@ -89,15 +106,15 @@ def image_shuffle(self):
         # self._set_image(self._current_index)
 
     def reverse_sort(self):
-        l.log("reverse sort")
+        l.log("reversing current sort")
         print(self._current_index)
         current_image_path = self._all_images[self._current_index]
         self._all_images.reverse()
         self._current_index = self.get_index_from_image_path(current_image_path)
 
 
     def sort_by_date(self, reverse_sort: bool = False):
-        l.log("sorting images")
+        l.log("sorting images by date")
         print(self._current_index)
         current_image_path = self._all_images[self._current_index]
         self.initialize_images(mode=file_walker.get_mode(),
@@ -201,10 +218,14 @@ def keyReleaseEvent(self, event: QKeyEvent):
             self._shuffle_start_index = self._current_index
         elif key == Qt.Key_1:
             l.log("Key 1 --> landscape mode")
-            self.initialize_images("landscape/")
+            self.initialize_images("landscape/", current_image_path=self.start_image)
+            if bpg.shuffle_from_start:
+                self.image_shuffle()
         elif key == Qt.Key_2:
             l.log("Key 2 --> Portrait mode")
-            self.initialize_images("portrait/")
+            self.initialize_images("portrait/", current_image_path=self.start_image)
+            if bpg.shuffle_from_start:
+                self.image_shuffle()
         elif key == Qt.Key_0:
             l.log("Key 0 --> go to index 0")
             if self._shuffle_start_index != 0:

image_in_window_screensaver/runme.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-/Users/amitseal/git/automating-boring-tasks-using-python/image_in_window_screensaver/venv/bin/python /Users/amitseal/git/automating-boring-tasks-using-python/image_in_window_screensaver/main_window.py --path /Users/amitseal/Pictures/x/
+/Users/amitseal/git/automating-boring-tasks-using-python/image_in_window_screensaver/venv/bin/python /Users/amitseal/git/automating-boring-tasks-using-python/image_in_window_screensaver/main_window.py --path /Users/amitseal/Pictures/x/ --start_image /Users/amitseal/Pictures/x/landscape/11736680_036_5fe3.jpg