From 108a8a083f749c8cfd83ff72e5206b73625cdd1c Mon Sep 17 00:00:00 2001
From: Fabrice Quenneville <fabquenneville@gmail.com>
Date: Wed, 18 Nov 2020 04:52:08 -0500
Subject: [PATCH] Loading from files and listing now working

---
 mediacurator/curator.py              | 48 ++++++++++++++++------------
 mediacurator/library/medialibrary.py | 10 ++----
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/mediacurator/curator.py b/mediacurator/curator.py
index 7c05fc3..8d3528e 100755
--- a/mediacurator/curator.py
+++ b/mediacurator/curator.py
@@ -68,29 +68,35 @@ def main():
 
     # Actions
     if sys.argv[1] == "list":
-        if any("-files" in argv for argv in sys.argv):
-            pass
-        elif any("-dir" in argv for argv in sys.argv):
-            videolist = []
-            for directory in directories:
-                videolist += get_videolist(directory, inputs, filters)
-            videolist.sort()
-            for video in videolist:
-                print(f"{get_codec(video)} - {get_print_resolution(video)} - {get_size(video)}mb - {video}")
-                if len(filters) > 0 and "fferror" in filters:
-                    print(f"{BColors.WARNING}WARNING: {get_fferror(video)}{BColors.ENDC}")
+
+        for filepath in medialibrary.videos:
+            if medialibrary.videos[filepath].useful:
+                print(medialibrary.videos[filepath])
+            #print(self.videos[filepath])
+        # if any("-files" in argv for argv in sys.argv):
+        #     pass
+        # elif any("-dir" in argv for argv in sys.argv):
+        #     videolist = []
+        #     for directory in directories:
+        #         videolist += get_videolist(directory, inputs, filters)
+        #     videolist.sort()
+        #     for video in videolist:
+        #         print(f"{get_codec(video)} - {get_print_resolution(video)} - {get_size(video)}mb - {video}")
+        #         if len(filters) > 0 and "fferror" in filters:
+        #             print(f"{BColors.WARNING}WARNING: {get_fferror(video)}{BColors.ENDC}")
                 
-        else:
-            print(f"{BColors.FAIL}Missing directory: {BColors.ENDC}")
+        # else:
+        #     print(f"{BColors.FAIL}Missing directory: {BColors.ENDC}")
     elif sys.argv[1] == "test":
-        if any("-files" in argv for argv in sys.argv):
-            pass
-        elif any("-dir" in argv for argv in sys.argv):
-            print(medialibrary)
-            #print(f"directories = {directories}, inputs = {inputs}, filters = {filters}, outputs = {outputs}")
-            exit()
-        else:
-            print("{BColors.FAIL}Missing directory: {BColors.ENDC}")
+        pass
+        # if any("-files" in argv for argv in sys.argv):
+        #     pass
+        # elif any("-dir" in argv for argv in sys.argv):
+        #     print(medialibrary)
+        #     #print(f"directories = {directories}, inputs = {inputs}, filters = {filters}, outputs = {outputs}")
+        #     exit()
+        # else:
+        #     print("{BColors.FAIL}Missing directory: {BColors.ENDC}")
 
         
     elif sys.argv[1] == "convert":
diff --git a/mediacurator/library/medialibrary.py b/mediacurator/library/medialibrary.py
index 99216d3..28721bb 100644
--- a/mediacurator/library/medialibrary.py
+++ b/mediacurator/library/medialibrary.py
@@ -25,8 +25,9 @@ class MediaLibrary():
             This is the library object who holds the information about the workspace and all the videos in it.
         '''
         if files:
-            pass
-            # self.files = files
+            for filepath in files:
+                self.videos[filepath] = Video(filepath)
+
         elif directories:
             self.directories    = directories
         else:
@@ -39,11 +40,6 @@ class MediaLibrary():
 
         self.filter_videos()
 
-        for filepath in self.videos:
-            if self.videos[filepath].useful:
-                print(self.videos[filepath])
-            #print(self.videos[filepath])
-