mavpicviewer: startup includes mosaic

MAVProxy/tools/mavpicviewer/mavpicviewer.py

@@ -12,7 +12,9 @@
 from argparse import ArgumentParser
 from pathlib import Path
 from MAVProxy.modules.lib import multiproc
+import mavpicviewer_shared as mpv
 import mavpicviewer_image
+import mavpicviewer_mosaic
 
 prefix_str = "mavpicviewer: "
 
@@ -41,33 +43,24 @@ def cmd_openfile(self, filepath):
         filelist.append(filepath)
         self.mavpicviewer_image = mavpicviewer_image.mavpicviewer_image(filelist)
 
-    # return an array of files for a given directory and extension
-    def file_list(self, directory, extensions):
-        '''return file list for a directory'''
-        flist = []
-        for filename in os.listdir(directory):
-            extension = filename.split('.')[-1]
-            if extension.lower() in extensions:
-                flist.append(os.path.join(directory, filename))
-        sorted_list = sorted(flist, key=str.lower)
-        return sorted_list
-
 
 # main function
 if __name__ == "__main__":
     multiproc.freeze_support()
     parser = ArgumentParser(description=__doc__)
-    parser.add_argument("filepath", default=".", help="filename or directory holding images")
+    parser.add_argument("filepath", nargs='?', default=".", help="filename or directory holding images")
     args = parser.parse_args()
 
     # check destination directory exists
     if not os.path.exists(args.filepath):
         exit(prefix_str + "invalid destination directory")
 
-    # check if file or directory
-    if os.path.isfile(args.filepath):
-        mavpicviewer = mavpicviewer()
-        mavpicviewer.cmd_openfile(args.filepath)
-    else:
-        mavpicviewer = mavpicviewer()
-        mavpicviewer.cmd_openfolder(args.filepath)
+    # create queue for interprocess communication
+    mosaic_to_image_comm, image_to_mosaic_comm = multiproc.Pipe()
+
+    # create image viewer
+    filelist = mpv.get_file_list(args.filepath, ['jpg', 'jpeg'])
+    mavpicviewer_image.mavpicviewer_image(filelist, image_to_mosaic_comm)
+
+    # create mosaic
+    mavpicviewer_mosaic.mavpicviewer_mosaic(args.filepath, mosaic_to_image_comm)