preset-loading and basic args from commandline

also made some docstrings more informative

5 files changed, 103 insertions, 21 deletions

diff --git a/components/__base__.py b/components/__base__.py
index 88f22d4..e43a517 100644
--- a/components/__base__.py
+++ b/components/__base__.py
@@ -1,5 +1,6 @@
 from PyQt4 import QtGui, QtCore
 from PIL import Image
+import os
 
 
 class Component(QtCore.QObject):
@@ -7,11 +8,12 @@ class Component(QtCore.QObject):
 
     # modified = QtCore.pyqtSignal(int, bool)
 
-    def __init__(self, moduleIndex, compPos):
+    def __init__(self, moduleIndex, compPos, core):
         super().__init__()
         self.currentPreset = None
         self.moduleIndex = moduleIndex
         self.compPos = compPos
+        self.core = core
 
     def __str__(self):
         return self.__doc__
@@ -32,24 +34,59 @@ class Component(QtCore.QObject):
         # read your widget values, then call super().update()
 
     def loadPreset(self, presetDict, presetName):
-        '''Children should take (presetDict, presetName=None) as args'''
-
-        # Use super().loadPreset(presetDict, presetName)
-        # Then update your widgets using the preset dict
+        '''Subclasses take (presetDict, presetName=None) as args.
+        Must use super().loadPreset(presetDict, presetName) first,
+        then update self.page widgets using the preset dict.
+        '''
         self.currentPreset = presetName \
             if presetName != None else presetDict['preset']
-    '''
-    def savePreset(self):
-        return {}
-    '''
+
     def preFrameRender(self, **kwargs):
+        '''Triggered only before a video is exported (video_thread.py)
+            self.worker = the video thread worker
+            self.completeAudioArray = a list of audio samples
+            self.sampleSize = number of audio samples per video frame
+            self.progressBarUpdate = signal to set progress bar number
+            self.progressBarSetText = signal to set progress bar text
+        Use the latter two signals to update the MainProgram if needed
+        for a long initialization procedure (i.e., for a visualizer)
+        '''
         for var, value in kwargs.items():
             exec('self.%s = value' % var)
 
+    def command(self, arg):
+        '''Configure a component using argument from the commandline.
+        Use super().command(arg) at the end of a subclass's method,
+        if no arguments are found in that method first
+        '''
+        if arg.startswith('preset='):
+            _, preset = arg.split('=', 1)
+            path = os.path.join(self.core.getPresetDir(self), preset)
+            if not os.path.exists(path):
+                print('Couldn\'t locate preset "%s"' % preset)
+                quit(1)
+            else:
+                print('Opening "%s" preset on layer %s' % \
+                    (preset, self.compPos))
+                self.core.openPreset(path, self.compPos, preset)
+        else:
+            print(
+                'To open a preset for this component:\n'
+                '    "preset=Preset Name"\n')
+            self.commandHelp()
+            quit(0)
+
+    def commandHelp(self):
+        '''Print help text for this Component's commandline arguments'''
+
     def blankFrame(self, width, height):
         return Image.new("RGBA", (width, height), (0, 0, 0, 0))
 
     def pickColor(self):
+        '''Use color picker to get color input from the user,
+        and return this as an RGB string and QPushButton stylesheet.
+        In a subclass apply stylesheet to any color selection widgets
+        '''
         dialog = QtGui.QColorDialog()
         dialog.setOption(QtGui.QColorDialog.ShowAlphaChannel, True)
         color = dialog.getColor()
@@ -63,7 +100,7 @@ class Component(QtCore.QObject):
             return None, None
 
     def RGBFromString(self, string):
-        ''' turns an RGB string like "255, 255, 255" into a tuple '''
+        ''' Turns an RGB string like "255, 255, 255" into a tuple '''
         try:
             tup = tuple([int(i) for i in string.split(',')])
             if len(tup) != 3:
@@ -83,14 +120,10 @@ class Component(QtCore.QObject):
         self.parent = parent
         page = uic.loadUi(os.path.join(
             os.path.dirname(os.path.realpath(__file__)), 'example.ui'))
-        # connect widgets signals
+        # --- connect widget signals here ---
         self.page = page
         return page
 
-    def update(self):
-        super().update()
-        self.parent.drawPreview()
-
     def previewRender(self, previewWorker):
         width = int(previewWorker.core.settings.value('outputWidth'))
         height = int(previewWorker.core.settings.value('outputHeight'))
@@ -102,12 +135,6 @@ class Component(QtCore.QObject):
         height = int(self.worker.core.settings.value('outputHeight'))
         image = Image.new("RGBA", (width, height), (0,0,0,0))
         return image
-
-    def cancel(self):
-        self.canceled = True
-
-    def reset(self):
-        self.canceled = False
     '''
 
 class BadComponentInit(Exception):
diff --git a/components/image.py b/components/image.py
index b6aa29b..d0e1894 100644
--- a/components/image.py
+++ b/components/image.py
@@ -92,3 +92,20 @@ class Component(__base__.Component):
             self.settings.setValue("backgroundDir", os.path.dirname(filename))
             self.page.lineEdit_image.setText(filename)
             self.update()
+
+    def command(self, arg):
+        if not arg.startswith('preset='):
+            if os.path.exists(arg):
+                try:
+                    Image.open(arg)
+                    self.imagePath = arg
+                    self.stretched = True
+                    return True
+                except OSError as e:
+                    print("Not a supported image format")
+                    quit(1)
+        super().command(arg)
+
+    def commandHelp(self):
+        print('Give a complete filepath to an image to load that '
+            'image with default settings.')
diff --git a/components/original.py b/components/original.py
index 5e2f9d4..328d64f 100644
--- a/components/original.py
+++ b/components/original.py
@@ -183,3 +183,15 @@ class Component(__base__.Component):
 
         return im
 
+    def command(self, arg):
+        if not arg.startswith('preset='):
+            if arg == 'classic':
+                self.layout = 0; return
+            elif arg == 'split':
+                self.layout = 1; return
+            elif arg == 'bottom':
+                self.layout = 2; return
+        super().command(arg)
+
+    def commandHelp(self):
+        print('Give a layout name: classic, split, or bottom')
diff --git a/components/text.py b/components/text.py
index f8ef7b3..6c465b1 100644
--- a/components/text.py
+++ b/components/text.py
@@ -146,3 +146,13 @@ class Component(__base__.Component):
             return
         self.page.lineEdit_textColor.setText(RGBstring)
         self.page.pushButton_textColor.setStyleSheet(btnStyle)
+
+    def commandHelp(self, arg):
+        print('Enter a string to use as centred white text. '
+        'Use quotes around the string to escape spaces.')
+
+    def command(self, arg):
+        if not arg.startswith('preset='):
+            self.title = arg
+            return True
+        super().command(arg)
diff --git a/components/video.py b/components/video.py
index 3d43a18..dd385b4 100644
--- a/components/video.py
+++ b/components/video.py
@@ -221,6 +221,22 @@ class Component(__base__.Component):
             width, height = scale(self.scale, width, height, int)
         self.chunkSize = 4*width*height
 
+    def command(self, arg):
+        if not arg.startswith('preset='):
+            if os.path.exists(arg):
+                if os.path.splitext(arg)[1] in self.core.videoFormats:
+                    self.videoPath = arg
+                    self.scale = 100
+                    return True
+                else:
+                    print("Not a supported video format")
+                    quit(1)
+        super().command(arg)
+
+    def commandHelp(self):
+        print('Give a complete filepath to a video to load that '
+            'video with default settings.')
+
 def scale(scale, width, height, returntype=None):
     width = (float(width) / 100.0) * float(scale)
     height = (float(height) / 100.0) * float(scale)