Add quick filters to config

src/cutselectionController.py

@@ -520,7 +520,7 @@ def updateProgressStatistics(self):
     try:
       targetTrim=float(self.ui.targetTrimVar.get())
     except Exception as e:
-      print(e)
+      print('updateProgressStatistics',e)
 
     for filename,rid,s,e in self.videoManager.getAllClips():
       totalExTrim += (e-s)-(targetTrim*2)

src/filterSelectionController.py

@@ -20,12 +20,10 @@ def __init__(self,ui,videoManager,ffmpegService,faceDetectService,globalOptions=
           name = fn.rpartition('.')[0]
           value = json.loads(open(os.path.join('filterTemplates',fn),'r').read())
           self.templates[name]=value
-          print(name,value)
+          print('filter template load:',name)
         except Exception as e:
           print(e)
 
-    print(self.templates)
-
     self.ui.setController(self)
     self.videoManager = videoManager
     self.ffmpegService = ffmpegService
@@ -210,7 +208,10 @@ def getViideoAR(self):
     return vid_w/vid_h
 
   def getvideoOSDExtents(self):
-    par = self.player.video_out_params.get('par',1)
+    if self.player.video_out_params is not None:
+      par = self.player.video_out_params.get('par',1)
+    else:
+      par =1
 
     osd_w = self.player.osd_width
     osd_h = self.player.osd_height

src/filterSelectionUi.py

@@ -618,7 +618,7 @@ def remove(self):
 
 
 class FilterSelectionUi(ttk.Frame):
-  def __init__(self, master=None, enableFaceDetection=False, *args, **kwargs):
+  def __init__(self, master=None, enableFaceDetection=False, globalOptions={}, *args, **kwargs):
     ttk.Frame.__init__(self, master)
     # build ui
     self.frameFilterFrame = self
@@ -706,10 +706,15 @@ def __init__(self, master=None, enableFaceDetection=False, *args, **kwargs):
 
     basicFilters=[]
 
+    quickFilters = [x.strip().upper() for x in globalOptions.get('quickFilters','').split(',') if len(x.strip())>0]
+
     for fltx in sorted(selectableFilters,key=lambda x:x.get('name','').upper()):
       categories = fltx.get('category',['General'])
 
-      if 'Basic' in categories:
+      if len(quickFilters) > 0:
+        if fltx.get('name','ALL').upper() in quickFilters:
+          basicFilters.append(fltx)  
+      elif 'Basic' in categories:
         basicFilters.append(fltx)      
 
       if type(categories) != list:
@@ -718,6 +723,9 @@ def __init__(self, master=None, enableFaceDetection=False, *args, **kwargs):
         submenu = self.submenuMap.setdefault( cat, tk.Menu(self.filterMenu, tearoff=0) )
         submenu.add_command(label="{} - {}".format(fltx.get('name','UNAMED'),fltx.get('desc',fltx.get('name','UNAMED')+' filter')),command=lambda n=fltx.get('name','UNAMED') :self.selectedFilter.set(n))
 
+    if len(quickFilters)>0:
+       basicFilters = sorted(basicFilters,key=lambda x:quickFilters.index(x.get('name','').upper()))        
+
     for fltx in basicFilters:
       self.filterMenu.add_command(label="{} - {}".format(fltx.get('name','UNAMED'),fltx.get('desc',fltx.get('name','UNAMED')+' filter')),command=lambda n=fltx.get('name','UNAMED') :self.selectedFilter.set(n))
     self.filterMenu.add_separator()

src/filterSpec.py

@@ -1724,7 +1724,3 @@
     if flt in filterDupes:
       print(f['name'],'Duplicate filter')
     filterDupes.add(flt)
-
-  print('\n---CATLIST----\n')
-  for k,v in sorted(catcounts.items(),key=lambda x:x[1],reverse=True):
-    print(k,'-',v)

src/mergeSelectionController.py

@@ -34,7 +34,7 @@ def __init__(self,ui,videoManager,ffmpegService,filterController,globalOptions={
             profile['editable'] = True
             profileName = profile['name']
             profile['name'] = profileName 
-            print('Custom profile:',profile)
+            print('Custom profile load:',profileName)
             self.customProfileSpecs.append( profile )
           except Exception as e:
             print('Custom profile load error',profileFilename,e)

src/webmGeneratorController.py

@@ -63,6 +63,7 @@ def __init__(self,initialFiles):
       "titleMetadataSuffix":' WmG',
       "startFullscreen":False,
       "darkMode":False,
+      "quickFilters":"",
 
       "allowableTargetSizeUnderrun":0.15,
       "allowEarlyExitIfUndersized":True,
@@ -180,34 +181,39 @@ def __init__(self,initialFiles):
                                      globalOptions=self.globalOptions)
 
 
+
     self.cutselectionController = CutselectionController(self.cutselectionUi,
                                                          self.initialFiles,
                                                          self.videoManager,
                                                          self.ffmpegService,
                                                          self.ytdlService,
                                                          self.voiceActivityService,
                                                          self.globalOptions)
+    print('cutselectionController loaded')
 
     self.filterSelectionController = FilterSelectionController(self.filterSselectionUi,
                                                                self.videoManager,
                                                                self.ffmpegService,
                                                                self.faceDetectionService,
                                                                self.globalOptions)
+    print('filterSelectionController loaded')
 
     self.composeController = ComposeController(self.composeUi,
                                                              self.videoManager,
                                                              self.ffmpegService,
                                                              self.filterSelectionController,
                                                              self.globalOptions
                                                              )
+    print('composeController loaded')
+
 
     self.mergeSelectionController = MergeSelectionController(self.mergeSelectionUi,
                                                              self.videoManager,
                                                              self.ffmpegService,
                                                              self.filterSelectionController,
                                                              self.globalOptions
                                                              )
-
+    print('mergeSelectionController loaded')
 
 
     if os.path.exists(self.autosaveFilename) and len(self.initialFiles)==0:

src/webmGeneratorUi.py

@@ -104,11 +104,22 @@ def __init__(self,controller,master=None):
 
 
     if darkMode:
-      self.style.configure (".",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f',highlightbackground='#0f0f0f')
+      self.style.configure (".",color='white',foreground='white',background='#0f0f0f',bordercolor='#000000',highlightbackground='#0f0f0f',troughcolor='#0f0f0f',border=0)
+      self.style.map('.',background=[('active', '#69bfdb'),('disabled', '#060B0C')], foreground=[('active', '#282828'),('disabled', '#4c4c4c')] )
+
+
+      self.style.configure ("TMenu",color='white',foreground='white',background='#0f0f0f',bordercolor='#000000',highlightbackground='#0f0f0f',troughcolor='#0f0f0f')
 
-      self.style.configure ("TToolbutton",color='white',foreground='white',background='#0f0f0f',activeforeground='white',activebackground='#0f0f0f',bordercolor='#0f0f0f',lightcolor='white',darkcolor='#0f0f0f',highlightbackground='#69bfdb',highlightcolor='#282828')
 
-      self.style.map('TToolbutton',background=[('active', '#69bfdb')], foreground=[('active', '#282828')] )
+      self.style.configure ("TToolbutton",color='white',foreground='white',background='#1f1f1f',activeforeground='white',activebackground='#1f1f1f',bordercolor='#1f1f1f',lightcolor='white',darkcolor='#1f1f1f',highlightbackground='#1f1f1f',highlightcolor='#282828')
+      self.style.configure ("TToolbutton.button",color='white',foreground='white',background='#1f1f1f',activeforeground='white',activebackground='#1f1f1f',bordercolor='#1f1f1f',lightcolor='white',darkcolor='#1f1f1f',highlightbackground='#1f1f1f',highlightcolor='#282828')
+
+
+      self.style.map('TToolbutton',background=[('active', '#1f1f1f')], foreground=[('active', '#282828')] )
+      self.style.map('TRadiobutton',background=[('active', '#1f1f1f')], foreground=[('active', '#282828')] )
+
+      self.style.map('TToolbutton.button',background=[('active', '#69bfdb')], foreground=[('active', '#282828')] )
+
 
       self.style.configure ("TProgressbar.trough",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f',highlightbackground='#0f0f0f')
 
@@ -127,14 +138,14 @@ def __init__(self,controller,master=None):
       self.style.configure ("TNotebook.Pane",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f',highlightbackground='#0f0f0f')
 
       self.style.configure ("TLabel",color='white',foreground='white',background='#0f0f0f')
-      self.style.configure ("TFrame",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f',highlightbackground='#0f0f0f')
+      self.style.configure ("TFrame",color='white',foreground='white',background='#0f0f0f',bordercolor='#1f1f1f',highlightbackground='#0f0f0f')
 
 
-      self.style.configure ("TLabelframe",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f',highlightbackground='#0f0f0f',relief='flat')
+      self.style.configure ("TLabelframe",color='white',foreground='white',background='#0f0f0f',bordercolor='#1f1f1f',highlightbackground='#0f0f0f',relief='flat')
 
-      self.style.configure ("TLabelframe.Label",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f')
+      self.style.configure ("TLabelframe.Label",color='white',foreground='white',background='#0f0f0f',bordercolor='#1f1f1f')
 
-      self.style.configure ("TLabelframe.Frame",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f',highlightbackground='#0f0f0f')
+      self.style.configure ("TLabelframe.Frame",color='white',foreground='white',background='#0f0f0f',bordercolor='#1f1f1f',highlightbackground='#0f0f0f')
 
       self.style.configure ("TButton",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f',activebackground='#282828',activeforeground='#282828',highlightcolor='#282828',lightcolor='#282828',darkcolor='#282828',fieldbackground='#282828',highlightbackground='#69bfdb')
       self.style.map('TButton',background=[('active', '#69bfdb')], foreground=[('active', '#282828')] )
@@ -145,8 +156,8 @@ def __init__(self,controller,master=None):
 
       self.style.configure ("TMenubutton",color='white',foreground='white',background='#0f0f0f',bordercolor='#0f0f0f')
 
-      self.style.configure ("TSpinbox",color='white',foreground='white',fieldbackground='#0f0f0f',background='#0f0f0f',bordercolor='#0f0f0f',buttonbackground='white')
-      self.style.configure ("TEntry",color='white',foreground='white',fieldbackground='#0f0f0f',background='#0f0f0f',bordercolor='#0f0f0f')
+      self.style.configure ("TSpinbox",color='white',foreground='white',fieldbackground='#1f1f1f',background='#0f0f0f',bordercolor='darkgrey',buttonbackground='white')
+      self.style.configure ("TEntry",color='white',foreground='white',fieldbackground='#1f1f1f',background='#0f0f0f',bordercolor='darkgrey')
       self.style.configure ("TCombobox",color='white',foreground='white',fieldbackground='#0f0f0f',background='#0f0f0f',bordercolor='#0f0f0f')