From e0b9afdbfa34a62e91978069b3c50fc4c141f7f9 Mon Sep 17 00:00:00 2001
From: Fabrice Quenneville <fabquenneville@gmail.com>
Date: Sun, 15 Nov 2020 20:16:24 -0500
Subject: [PATCH] Added more filters

---
 README.md  |  2 +-
 curator.py | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1e8389d..f979fba 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ pip install -r requirements.txt
 ```
 
 ## Usage
-./curator.py [list,convert] [-del] [-verbose] [-in:any,avi,mkv,wmv,mpg,mp4,m4v,flv,vid] [-filters:old,lowres,mpeg,mpeg4,x264,wmv3,wmv] [-out:mkv/mp4,x265/av1] [-dir/-file:"/mnt/media/",,"/mnt/media2/"]
+./curator.py [list,convert] [-del] [-verbose] [-in:any,avi,mkv,wmv,mpg,mp4,m4v,flv,vid] [-filters:old,lowres,hd,720,1080,mpeg,mpeg4,x264,wmv3,wmv] [-out:mkv/mp4,x265/av1] [-dir/-file:"/mnt/media/",,"/mnt/media2/"]
 
 > for multiple files or filenames use double comma separated values ",,"
 
diff --git a/curator.py b/curator.py
index 10d3f50..38ac957 100755
--- a/curator.py
+++ b/curator.py
@@ -7,7 +7,6 @@
     ./converter.py list -in:any -filters:old -dir:/mnt/media/ >> ../medlist.txt
     ./converter.py convert -del -in:any -filters:mpeg4 -out:x265,mkv -dir:"/mnt/media/Movies/"
     ./converter.py convert -del -verbose -in:avi,mpg -dir:/mnt/media/
-
 '''
 
 import sys
@@ -18,7 +17,6 @@ from pathlib import Path
 from pprint import pprint
 from hurry.filesize import size
 
-
 def main():
     ffmpeg_version = detect_ffmpeg()
     if not ffmpeg_version:
@@ -160,7 +158,7 @@ def get_videolist(parentdir, inputs = ["any"], filters = []):
     # Filter the list for specific codecs
     videolist_tmp = videolist
     print(f"{bcolors.OKGREEN}Filtering {len(videolist)} videos for the requested parameters{bcolors.ENDC}")
-    if len([filt for filt in filters if filt not in ["lowres"]]) > 0:
+    if len([filt for filt in filters if filt not in ["lowres", "hd"]]) > 0:
         videolist = []
 
         if "old" in filters:
@@ -179,9 +177,17 @@ def get_videolist(parentdir, inputs = ["any"], filters = []):
             videolist += [video for video in videolist_tmp if get_codec(video) in ["x264"]]
         
     if len(filters) > 0 and "lowres" in filters:
-        #print("here")
         videolist_tmp = videolist
         videolist = [video for video in videolist_tmp if get_resolution(video)[0] < 720]
+    elif len(filters) > 0 and "hd" in filters:
+        videolist_tmp = videolist
+        videolist = [video for video in videolist_tmp if get_resolution(video)[0] >= 720]
+    elif len(filters) > 0 and "720" in filters:
+        videolist_tmp = videolist
+        videolist = [video for video in videolist_tmp if get_resolution(video)[0] = 720]
+    elif len(filters) > 0 and "1080" in filters:
+        videolist_tmp = videolist
+        videolist = [video for video in videolist_tmp if get_resolution(video)[0] = 720]
 
     print(f"{bcolors.OKGREEN}Found {len(videolist)} videos for the requested parameters{bcolors.ENDC}")
     return videolist