Merge pull request #55 from djfun/logging

using the builtin logging module

3 files changed, 40 insertions, 13 deletions

diff --git a/src/components/spectrum.py b/src/components/spectrum.py
index 666e20a..32763c0 100644
--- a/src/components/spectrum.py
+++ b/src/components/spectrum.py
@@ -4,6 +4,7 @@ import os
 import math
 import subprocess
 import time
+import logging
 
 from component import Component
 from toolkit.frame import BlankFrame, scale
@@ -13,6 +14,9 @@ from toolkit.ffmpeg import (
 )
 
 
+log = logging.getLogger('AVP.Components.Spectrum')
+
+
 class Component(Component):
     name = 'Spectrum'
     version = '1.0.0'
@@ -68,6 +72,7 @@ class Component(Component):
         if not changedSize \
                 and not self.changedOptions \
                 and self.previewFrame is not None:
+            log.debug('Comp #%s is reusing old preview frame' % self.compPos)
             return self.previewFrame
 
         frame = self.getPreviewFrame()
@@ -131,13 +136,14 @@ class Component(Component):
             '-frames:v', '1',
         ])
         logFilename = os.path.join(
-            self.core.dataDir, 'preview_%s.log' % str(self.compPos))
-        with open(logFilename, 'w') as log:
-            log.write(" ".join(command) + '\n\n')
-        with open(logFilename, 'a') as log:
+            self.core.logDir, 'preview_%s.log' % str(self.compPos))
+        log.debug('Creating ffmpeg process (log at %s)' % logFilename)
+        with open(logFilename, 'w') as logf:
+            logf.write(" ".join(command) + '\n\n')
+        with open(logFilename, 'a') as logf:
             pipe = openPipe(
                 command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                stderr=log, bufsize=10**8
+                stderr=logf, bufsize=10**8
             )
         byteFrame = pipe.stdout.read(self.chunkSize)
         closePipe(pipe)
diff --git a/src/components/video.py b/src/components/video.py
index b6bdd52..a189f60 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -3,6 +3,7 @@ from PyQt5 import QtGui, QtCore, QtWidgets
 import os
 import math
 import subprocess
+import logging
 
 from component import Component
 from toolkit.frame import BlankFrame, scale
@@ -10,6 +11,9 @@ from toolkit.ffmpeg import openPipe, closePipe, testAudioStream, FfmpegVideo
 from toolkit import checkOutput
 
 
+log = logging.getLogger('AVP.Components.Video')
+
+
 class Component(Component):
     name = 'Video'
     version = '1.0.0'
@@ -134,10 +138,17 @@ class Component(Component):
             '-ss', '90',
             '-frames:v', '1',
         ])
-        pipe = openPipe(
-            command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL, bufsize=10**8
-        )
+
+        logFilename = os.path.join(
+            self.core.logDir, 'preview_%s.log' % str(self.compPos))
+        log.debug('Creating ffmpeg process (log at %s)' % logFilename)
+        with open(logFilename, 'w') as logf:
+            logf.write(" ".join(command) + '\n\n')
+        with open(logFilename, 'a') as logf:
+            pipe = openPipe(
+                command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
+                stderr=logf, bufsize=10**8
+            )
         byteFrame = pipe.stdout.read(self.chunkSize)
         closePipe(pipe)
 
diff --git a/src/components/waveform.py b/src/components/waveform.py
index 71cbcac..1517be2 100644
--- a/src/components/waveform.py
+++ b/src/components/waveform.py
@@ -4,6 +4,7 @@ from PyQt5.QtGui import QColor
 import os
 import math
 import subprocess
+import logging
 
 from component import Component
 from toolkit.frame import BlankFrame, scale
@@ -13,6 +14,9 @@ from toolkit.ffmpeg import (
 )
 
 
+log = logging.getLogger('AVP.Components.Waveform')
+
+
 class Component(Component):
     name = 'Waveform'
     version = '1.0.0'
@@ -106,10 +110,16 @@ class Component(Component):
             '-codec:v', 'rawvideo', '-',
             '-frames:v', '1',
         ])
-        pipe = openPipe(
-            command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL, bufsize=10**8
-        )
+        logFilename = os.path.join(
+            self.core.logDir, 'preview_%s.log' % str(self.compPos))
+        log.debug('Creating ffmpeg process (log at %s)' % logFilename)
+        with open(logFilename, 'w') as logf:
+            logf.write(" ".join(command) + '\n\n')
+        with open(logFilename, 'a') as logf:
+            pipe = openPipe(
+                command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
+                stderr=logf, bufsize=10**8
+            )
         byteFrame = pipe.stdout.read(self.chunkSize)
         closePipe(pipe)