From 98da57cd26f0331727086dd4056637c33f3b4892 Mon Sep 17 00:00:00 2001
From: Fabrice Quenneville <fabquenneville@gmail.com>
Date: Wed, 24 Apr 2024 05:38:00 -0400
Subject: [PATCH] Bug fix due to major bug in 0.0.11 where files where not
 properly marked for operation.

---
 docsource/source/conf.py                      |  2 +-
 docsource/source/index.rst                    |  1 +
 .../source/releasenotes/0.0.1-changelog.rst   |  2 +-
 .../source/releasenotes/0.0.10-changelog.rst  | 18 +++----
 .../source/releasenotes/0.0.11-changelog.rst  | 20 ++++----
 .../source/releasenotes/0.0.12-changelog.rst  | 50 +++++++++++++++++++
 .../source/releasenotes/0.0.4-changelog.rst   |  2 +-
 .../source/releasenotes/0.0.5-changelog.rst   |  2 +-
 .../source/releasenotes/0.0.6-changelog.rst   |  2 +-
 .../source/releasenotes/0.0.7-changelog.rst   |  2 +-
 .../source/releasenotes/0.0.8-changelog.rst   |  2 +-
 .../source/releasenotes/0.0.9-changelog.rst   |  2 +-
 mediacurator/library/medialibrary.py          | 33 ++++++++++--
 mediacurator/library/tools.py                 |  4 +-
 mediacurator/library/video.py                 |  2 +
 mediacurator/mediacurator.py                  |  3 --
 setup.py                                      |  2 +-
 17 files changed, 112 insertions(+), 37 deletions(-)
 create mode 100644 docsource/source/releasenotes/0.0.12-changelog.rst

diff --git a/docsource/source/conf.py b/docsource/source/conf.py
index 619883f..4545fcc 100644
--- a/docsource/source/conf.py
+++ b/docsource/source/conf.py
@@ -20,7 +20,7 @@
 project = 'MediaCurator'
 copyright = '2020, Fabrice Quenneville'
 author = 'Fabrice Quenneville'
-version = '0.0.11'
+version = '0.0.12'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/docsource/source/index.rst b/docsource/source/index.rst
index 85fda6b..3561639 100644
--- a/docsource/source/index.rst
+++ b/docsource/source/index.rst
@@ -30,6 +30,7 @@ The source code can be found on `GitHub <https://github.com/fabquenneville/Media
    :maxdepth: 1
    :caption: Release Notes:
 
+   releasenotes/0.0.12-changelog
    releasenotes/0.0.11-changelog
    releasenotes/0.0.10-changelog
    releasenotes/0.0.9-changelog
diff --git a/docsource/source/releasenotes/0.0.1-changelog.rst b/docsource/source/releasenotes/0.0.1-changelog.rst
index be93831..5cbdfc1 100644
--- a/docsource/source/releasenotes/0.0.1-changelog.rst
+++ b/docsource/source/releasenotes/0.0.1-changelog.rst
@@ -37,7 +37,7 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
diff --git a/docsource/source/releasenotes/0.0.10-changelog.rst b/docsource/source/releasenotes/0.0.10-changelog.rst
index 7084714..e48cc1a 100644
--- a/docsource/source/releasenotes/0.0.10-changelog.rst
+++ b/docsource/source/releasenotes/0.0.10-changelog.rst
@@ -10,14 +10,7 @@ Added support to mpeg filetype.
 Dropped Support
 ===============
 
-Future Changes
-==============
-
-* More filters
-* Test AV1 Support
-* Prepare API for GUI
-
-Compatibility notes
+Compatibility Notes
 ===================
 
 Python Support
@@ -33,13 +26,11 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
 
-
-
 Improvements
 ============
 
@@ -47,7 +38,12 @@ Improvements
 Changes
 =======
 
+Future Changes
+==============
 
+* More filters
+* Test AV1 Support
+* Prepare API for GUI
 
 Deprecations
 ============
diff --git a/docsource/source/releasenotes/0.0.11-changelog.rst b/docsource/source/releasenotes/0.0.11-changelog.rst
index 2f44642..d42970d 100644
--- a/docsource/source/releasenotes/0.0.11-changelog.rst
+++ b/docsource/source/releasenotes/0.0.11-changelog.rst
@@ -1,14 +1,14 @@
 ========================================
-MediaCurator 0.0.1 Release Notes
+MediaCurator 0.0.11 Release Notes
 ========================================
 
-Improvements
-============
+Highlights
+==========
 
-* Rectified a bug where MediaLibrary would encounter an error due to a missing directory.
-* Enhanced clarity by refining comments.
-* Improved code readability through cleanup and organization.
-* Ensured consistency and enhanced readability by adjusting variable names.
+Code improvements.
+
+Dropped Support
+===============
 
 Compatibility Notes
 ====================
@@ -34,8 +34,10 @@ New Features
 Improvements
 ============
 
-* Added a changelog in .rst format.
-* Added verbose output to the convert method in the Video class for better visibility during the conversion process.
+* Rectified a bug where MediaLibrary would encounter an error due to a missing directory.
+* Enhanced clarity by refining comments.
+* Improved code readability through cleanup and organization.
+* Ensured consistency and enhanced readability by adjusting variable names.
 
 Changes
 =======
diff --git a/docsource/source/releasenotes/0.0.12-changelog.rst b/docsource/source/releasenotes/0.0.12-changelog.rst
new file mode 100644
index 0000000..17be2d0
--- /dev/null
+++ b/docsource/source/releasenotes/0.0.12-changelog.rst
@@ -0,0 +1,50 @@
+========================================
+MediaCurator 0.0.11 Release Notes
+========================================
+
+Highlights
+==========
+
+Code improvements.
+
+Dropped Support
+===============
+
+Compatibility Notes
+====================
+
+Python Support
+--------------
+
+MediaCurator has been tested on Python 3.7 - 3.9.7.
+
+FFMPEG Support
+--------------
+
+MediaCurator has been tested to work with FFMPEG versions ranging from 4.1.6 to 4.4.1.
+
+OS Support
+----------
+
+MediaCurator has been tested to work on various GNU/Linux distributions as well as Windows.
+
+New Features
+============
+
+Improvements
+============
+
+* Rectified a bug where MediaLibrary would be unable to gather the videos to operate.
+
+Changes
+=======
+
+Deprecations
+============
+
+Future Changes
+==============
+
+* More filters
+* Test AV1 Support
+* Prepare API for GUI
diff --git a/docsource/source/releasenotes/0.0.4-changelog.rst b/docsource/source/releasenotes/0.0.4-changelog.rst
index 26a64b4..1b61272 100644
--- a/docsource/source/releasenotes/0.0.4-changelog.rst
+++ b/docsource/source/releasenotes/0.0.4-changelog.rst
@@ -37,7 +37,7 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
diff --git a/docsource/source/releasenotes/0.0.5-changelog.rst b/docsource/source/releasenotes/0.0.5-changelog.rst
index 181b454..6cab42c 100644
--- a/docsource/source/releasenotes/0.0.5-changelog.rst
+++ b/docsource/source/releasenotes/0.0.5-changelog.rst
@@ -38,7 +38,7 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
diff --git a/docsource/source/releasenotes/0.0.6-changelog.rst b/docsource/source/releasenotes/0.0.6-changelog.rst
index 49f02b3..776a040 100644
--- a/docsource/source/releasenotes/0.0.6-changelog.rst
+++ b/docsource/source/releasenotes/0.0.6-changelog.rst
@@ -41,7 +41,7 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
diff --git a/docsource/source/releasenotes/0.0.7-changelog.rst b/docsource/source/releasenotes/0.0.7-changelog.rst
index 9d77918..7374d17 100644
--- a/docsource/source/releasenotes/0.0.7-changelog.rst
+++ b/docsource/source/releasenotes/0.0.7-changelog.rst
@@ -37,7 +37,7 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
diff --git a/docsource/source/releasenotes/0.0.8-changelog.rst b/docsource/source/releasenotes/0.0.8-changelog.rst
index 6acf9be..197987f 100644
--- a/docsource/source/releasenotes/0.0.8-changelog.rst
+++ b/docsource/source/releasenotes/0.0.8-changelog.rst
@@ -33,7 +33,7 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
diff --git a/docsource/source/releasenotes/0.0.9-changelog.rst b/docsource/source/releasenotes/0.0.9-changelog.rst
index f88d7b2..d4e515f 100644
--- a/docsource/source/releasenotes/0.0.9-changelog.rst
+++ b/docsource/source/releasenotes/0.0.9-changelog.rst
@@ -33,7 +33,7 @@ Mediacurator has been tested to work with FFMPEG versions ranging from 4.1.6 to
 OS Support
 ----------
 
-Mediacurator has been tested to work on various GNU/Linux distribution as well as Windows
+Mediacurator has been tested to work on various GNU/Linux distributions as well as Windows
 
 New Features
 ============
diff --git a/mediacurator/library/medialibrary.py b/mediacurator/library/medialibrary.py
index 21de744..de4cfee 100644
--- a/mediacurator/library/medialibrary.py
+++ b/mediacurator/library/medialibrary.py
@@ -6,9 +6,11 @@ from pathlib import Path
 from .video import Video
 from .tools import deletefile
 
+# Import colorama for colored output
 import colorama
 colorama.init()
 
+# Define color codes for colored output
 cgreen = colorama.Fore.GREEN
 creset = colorama.Fore.RESET
 
@@ -73,10 +75,33 @@ class MediaLibrary():
         
         for directory in self.directories:
             path = Path(directory)
-            # Get all video filetypes
-            for ext in ["wmv", "avi", "mkv", "mp4", "m4v", "flv", "mpg", "mpeg", "vid", "vob", "divx", "ogm", "webm"]:
-                if ext in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
-                    videolist += list(path.rglob(f"*.[{ext.upper()}{ext.lower()}]"))
+            # get all video filetypes
+            if "wmv" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[wW][mM][vV]"))
+            if "avi" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[aA][vV][iI]"))
+            if "mkv" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[mM][kK][vV]"))
+            if "mp4" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[mM][pP]4"))
+            if "m4v" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[mM]4[vV]"))
+            if "flv" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[fF][lL][vV]"))
+            if "mpg" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[mM][pP][gG]"))
+            if "mpeg" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[mM][pP][eE][gG]"))
+            if "vid" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[vV][iI][dD]"))
+            if "vob" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[vV][oO][bB]"))
+            if "divx" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[dD][iI][vV][xX]"))
+            if "ogm" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[oO][gG][mM]"))
+            if "webm" in self.inputs or "any" in self.inputs or len(self.inputs) < 1:
+                videolist += list(path.rglob("*.[wW][eE][bB][mM]"))
         
         # Remove folders
         videolist_tmp = videolist
diff --git a/mediacurator/library/tools.py b/mediacurator/library/tools.py
index 7387c6a..3b89831 100644
--- a/mediacurator/library/tools.py
+++ b/mediacurator/library/tools.py
@@ -7,16 +7,18 @@ import subprocess
 import os
 import sys
 
+# Import colorama for colored output
 import colorama
 colorama.init()
 
+# Define color codes for colored output
 cgreen = colorama.Fore.GREEN
 cyellow = colorama.Fore.YELLOW
 cred = colorama.Fore.RED
 creset = colorama.Fore.RESET
 
 def load_arguments():
-    '''Get/load command parameters 
+    '''Get/load command parameters
 
     Returns:
         dict: A dictionary containing lists of options passed by the user
diff --git a/mediacurator/library/video.py b/mediacurator/library/video.py
index 36c8b87..97d07bf 100644
--- a/mediacurator/library/video.py
+++ b/mediacurator/library/video.py
@@ -5,9 +5,11 @@ from .tools import deletefile, findfreename
 import subprocess
 import os
 
+# Import colorama for colored output
 import colorama
 colorama.init()
 
+# Define color codes for colored output
 cyellow = colorama.Fore.YELLOW
 cred = colorama.Fore.RED
 creset = colorama.Fore.RESET
diff --git a/mediacurator/mediacurator.py b/mediacurator/mediacurator.py
index be68bc4..182b172 100755
--- a/mediacurator/mediacurator.py
+++ b/mediacurator/mediacurator.py
@@ -37,8 +37,6 @@ def main():
     '''
     MediaCurator's main function
     
-    Args:
-    
     Returns:
     '''
 
@@ -66,7 +64,6 @@ def main():
     else:
         print(f"{cred}ERROR: No files or directories selected.{creset}")
         return
-    
 
     # Actions
     if sys.argv[1] == "list":
diff --git a/setup.py b/setup.py
index 7d0afc1..6820158 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="MediaCurator",
-    version="0.0.11",
+    version="0.0.12",
     author="Fabrice Quenneville",
     author_email="fab@fabq.ca",
     url="https://github.com/fabquenneville/MediaCurator",