Audit UI 3

openlp/core/lib/eventreceiver.py

@@ -78,6 +78,8 @@ class EventReceiver(QtCore.QObject):
     ``{plugin}_stop``
         Requests a plugin to handle a stop event
 
+    ``audit_live``
+        Sends live song audit requests to the audit component
     """
     global log
     log = logging.getLogger(u'EventReceiver')

openlp/plugins/audit/auditplugin.py

@@ -42,6 +42,18 @@ class AuditPlugin(Plugin):
         self.icon = QtGui.QIcon()
         self.icon.addPixmap(QtGui.QPixmap(u':/media/media_image.png'),
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.auditfile = None
+
+    def check_pre_conditions(self):
+        """
+        Check to see if auditing is required
+        """
+        log.debug('check_pre_conditions')
+        #Lets see if audit is required
+        if int(self.config.get_config(u'startup', 0)) == QtCore.Qt.Checked:
+            return True
+        else:
+            return False
 
     def get_settings_tab(self):
         self.AuditTab = AuditTab()
@@ -54,3 +66,10 @@ class AuditPlugin(Plugin):
 
     def initialise(self):
         log.info(u'Plugin Initialising')
+        self.auditfile = open(u'openlp.aud', 'a')
+        self.media_item.auditFile = self.auditfile
+
+    def finalise(self):
+        log.debug(u'Finalise')
+        if self.auditfile is not None:
+            self.auditfile.close()

openlp/plugins/audit/lib/audittab.py

@@ -39,39 +39,32 @@ class AuditTab(SettingsTab):
         self.AuditLayout.setObjectName(u'AuditLayout')
         self.AuditModeGroupBox = QtGui.QGroupBox(self)
         self.AuditModeGroupBox.setObjectName(u'AuditModeGroupBox')
-        self.TimeoutLayout = QtGui.QHBoxLayout(self.AuditModeGroupBox)
+        self.AuditModeLayout = QtGui.QVBoxLayout(self.AuditModeGroupBox)
-        self.TimeoutLayout.setSpacing(8)
+        self.AuditModeLayout.setSpacing(8)
-        self.TimeoutLayout.setMargin(0)
+        self.AuditModeLayout.setMargin(8)
-        self.TimeoutLayout.setObjectName(u'TimeoutLayout')
+        self.AuditModeLayout.setObjectName(u'AuditModeLayout')
-        self.TimeoutLabel = QtGui.QLabel(self.AuditModeGroupBox)
+        self.AuditPortSpinBox = QtGui.QSpinBox(self.AuditModeGroupBox)
-        self.TimeoutLabel.setObjectName(u'TimeoutLabel')
+        self.AuditPortSpinBox.setObjectName(u'AuditPortSpinBox')
-        self.TimeoutLayout.addWidget(self.TimeoutLabel)
+        self.AuditPortSpinBox.setMaximum(32767)
-        self.TimeoutSpinBox = QtGui.QSpinBox(self.AuditModeGroupBox)
+        self.AuditModeLayout.addWidget(self.AuditPortSpinBox)
-        self.TimeoutSpinBox.setMaximum(180)
+        self.AuditActive = QtGui.QCheckBox(self.AuditModeGroupBox)
-        self.TimeoutSpinBox.setObjectName(u'TimeoutSpinBox')
+        self.AuditActive.setObjectName(u'AuditPortSpinBox')
-        self.TimeoutLayout.addWidget(self.TimeoutSpinBox)
+        self.AuditModeLayout.addWidget(self.AuditActive)
-        self.TimeoutSpacer = QtGui.QSpacerItem(147, 20,
+        self.WarningLabel = QtGui.QLabel(self.AuditModeGroupBox)
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.WarningLabel.setObjectName(u'WarningLabel')
-        self.TimeoutLayout.addItem(self.TimeoutSpacer)
+        self.AuditModeLayout.addWidget(self.WarningLabel)
         self.AuditLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.AuditModeGroupBox)
-        # Signals and slots
-        QtCore.QObject.connect(self.TimeoutSpinBox,
-            QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
 
     def retranslateUi(self):
-        self.TimeoutLabel.setText(translate(u'AuditTab', u'Slide Loop Delay:'))
+        self.AuditModeGroupBox.setTitle(translate(u'AuditTab', u'Audit File'))
-        self.TimeoutSpinBox.setSuffix(translate(u'AuditTab', u's'))
+        self.AuditActive.setText(translate(u'AuditTab', 'Audit available:'))
-
+        self.WarningLabel.setText(translate(u'AuditTab', u'A restart is needed for this change to become effective'))
-    def onTimeoutSpinBoxChanged(self):
-        self.loop_delay = self.TimeoutSpinBox.value()
 
     def load(self):
-        self.loop_delay = int(self.config.get_config(u'loop delay', 5))
+        self.AuditPortSpinBox.setValue(int(self.config.get_config(u'Audit port', 4316)))
-        self.TimeoutSpinBox.setValue(self.loop_delay)
+        self.AuditActive.setChecked(int(self.config.get_config(u'startup', 0)))
 
     def save(self):
-        self.config.set_config(u'loop delay', self.loop_delay)
+        self.config.set_config(u'Audit port', unicode(self.AuditPortSpinBox.value()))
-        Receiver().send_message(u'update_spin_delay',  self.loop_delay )
+        self.config.set_config(u'startup', unicode(self.AuditActive.checkState()))
 
-    def postSetUp(self):
-        Receiver().send_message(u'update_spin_delay',  self.loop_delay )

openlp/plugins/audit/lib/mediaitem.py

@@ -24,9 +24,10 @@
 
 import logging
 import os
+from datetime import date
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, translate, buildIcon
+from openlp.core.lib import MediaManagerItem, translate, buildIcon,  Receiver
 
 class AuditMediaItem(MediaManagerItem):
     """
@@ -45,9 +46,13 @@ class AuditMediaItem(MediaManagerItem):
         self.hasNewIcon = False
         self.hasEditIcon = False
         MediaManagerItem.__init__(self, parent, icon, title)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'audit_live'), self.onReceiveAudit)
 
     def initialise(self):
-        pass
+        self.Toolbar.actions[self.startMessage].setVisible(True)
+        self.Toolbar.actions[self.stopMessage].setVisible(False)
+        self.auditActive = False
 
     def addStartHeaderBar(self):
         self.startMessage = translate(self.TranslationContext, u'Start Collecting')
@@ -77,7 +82,13 @@ class AuditMediaItem(MediaManagerItem):
     def onStartClick(self):
         self.Toolbar.actions[self.startMessage].setVisible(False)
         self.Toolbar.actions[self.stopMessage].setVisible(True)
+        self.auditActive = True
 
     def onStopClick(self):
         self.Toolbar.actions[self.startMessage].setVisible(True)
         self.Toolbar.actions[self.stopMessage].setVisible(False)
+        self.auditActive = False
+
+    def onReceiveAudit(self, auditData):
+        if self.auditActive:
+            self.auditFile.write(u'%s,%s\n' % (date.today(), auditData))