OpenLP

Merge lp:~trb143/openlp/audit into lp:openlp

  1. audit
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/audit
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/audit
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+12080@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Clean up Plugin status code following last review

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Looking good!

Just a thought:

from plugin import PluginStatus
from plugin import Plugin

You might as well have written:

from plugin import Plugin, PluginStatus

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2009-09-14 22:10:08 +0000
+++ openlp/core/lib/__init__.py 2009-09-18 17:37:11 +0000
@@ -111,6 +111,7 @@
111from eventreceiver import Receiver111from eventreceiver import Receiver
112from settingsmanager import SettingsManager112from settingsmanager import SettingsManager
113from pluginconfig import PluginConfig113from pluginconfig import PluginConfig
114from plugin import PluginStatus
114from plugin import Plugin115from plugin import Plugin
115from pluginmanager import PluginManager116from pluginmanager import PluginManager
116from settingstab import SettingsTab117from settingstab import SettingsTab
117118
=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py 2009-09-17 18:24:13 +0000
+++ openlp/core/lib/plugin.py 2009-09-18 17:37:11 +0000
@@ -27,6 +27,13 @@
2727
28from openlp.core.lib import PluginConfig, Receiver28from openlp.core.lib import PluginConfig, Receiver
2929
30class PluginStatus(object):
31 """
32 Defines the status of the plugin
33 """
34 Active = 1
35 Inactive = 2
36
30class Plugin(object):37class Plugin(object):
31 """38 """
32 Base class for openlp plugins to inherit from.39 Base class for openlp plugins to inherit from.
@@ -122,6 +129,7 @@
122 self.icon = None129 self.icon = None
123 self.config = PluginConfig(self.name)130 self.config = PluginConfig(self.name)
124 self.weight = 0131 self.weight = 0
132 self.status = PluginStatus.Inactive
125 # Set up logging133 # Set up logging
126 self.log = logging.getLogger(self.name)134 self.log = logging.getLogger(self.name)
127 self.preview_controller = plugin_helpers[u'preview']135 self.preview_controller = plugin_helpers[u'preview']
128136
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2009-09-17 18:24:13 +0000
+++ openlp/core/lib/pluginmanager.py 2009-09-18 17:37:11 +0000
@@ -26,7 +26,7 @@
26import sys26import sys
27import logging27import logging
2828
29from openlp.core.lib import Plugin29from openlp.core.lib import Plugin, PluginStatus
3030
31class PluginManager(object):31class PluginManager(object):
32 """32 """
@@ -92,23 +92,20 @@
92 log.error(u'Failed to import module %s on path %s for reason %s', modulename, path, e.args[0])92 log.error(u'Failed to import module %s on path %s for reason %s', modulename, path, e.args[0])
93 plugin_classes = Plugin.__subclasses__()93 plugin_classes = Plugin.__subclasses__()
94 self.plugins = []94 self.plugins = []
95 self.plugin_list=[]
96 plugin_objects = []95 plugin_objects = []
97 for p in plugin_classes:96 for p in plugin_classes:
98 try:97 try:
99 plugin = p(self.plugin_helpers)98 plugin = p(self.plugin_helpers)
100 log.debug(u'Loaded plugin %s with helpers', unicode(p))99 log.debug(u'Loaded plugin %s with helpers', unicode(p))
101
102 plugin_objects.append(plugin)100 plugin_objects.append(plugin)
103 except TypeError:101 except TypeError:
104 log.error(u'loaded plugin %s has no helpers', unicode(p))102 log.error(u'loaded plugin %s has no helpers', unicode(p))
105 plugins_list = sorted(plugin_objects, self.order_by_weight)103 plugins_list = sorted(plugin_objects, self.order_by_weight)
106 for plugin in plugins_list:104 for plugin in plugins_list:
107 pList = {u'plugin': plugin, u'status': u'Inactive'}
108 if plugin.check_pre_conditions():105 if plugin.check_pre_conditions():
109 log.debug(u'Plugin %s active', unicode(plugin.name))106 log.debug(u'Plugin %s active', unicode(plugin.name))
110 pList[u'status'] = u'Active'107 plugin.status = PluginStatus.Active
111 self.plugins.append(pList)108 self.plugins.append(plugin)
112109
113 def order_by_weight(self, x, y):110 def order_by_weight(self, x, y):
114 """111 """
@@ -131,11 +128,11 @@
131 The Media Manager itself.128 The Media Manager itself.
132 """129 """
133 for plugin in self.plugins:130 for plugin in self.plugins:
134 if plugin[u'status'] == u'Active':131 if plugin.status == PluginStatus.Active:
135 media_manager_item = plugin[u'plugin'].get_media_manager_item()132 media_manager_item = plugin.get_media_manager_item()
136 if media_manager_item is not None:133 if media_manager_item is not None:
137 log.debug(u'Inserting media manager item from %s' % plugin[u'plugin'].name)134 log.debug(u'Inserting media manager item from %s' % plugin.name)
138 mediatoolbox.addItem(media_manager_item, plugin[u'plugin'].icon, media_manager_item.title)135 mediatoolbox.addItem(media_manager_item, plugin.icon, media_manager_item.title)
139136
140 def hook_settings_tabs(self, settingsform=None):137 def hook_settings_tabs(self, settingsform=None):
141 """138 """
@@ -147,12 +144,12 @@
147 Defaults to *None*. The settings form to add tabs to.144 Defaults to *None*. The settings form to add tabs to.
148 """145 """
149 for plugin in self.plugins:146 for plugin in self.plugins:
150 settings_tab = plugin[u'plugin'].get_settings_tab()147 settings_tab = plugin.get_settings_tab()
151 if settings_tab is not None:148 if settings_tab is not None:
152 log.debug(u'Inserting settings tab item from %s' % plugin[u'plugin'].name)149 log.debug(u'Inserting settings tab item from %s' % plugin.name)
153 settingsform.addTab(settings_tab)150 settingsform.addTab(settings_tab)
154 else:151 else:
155 log.debug(u'No settings in %s' % plugin[u'plugin'].name)152 log.debug(u'No settings in %s' % plugin.name)
156153
157 def hook_import_menu(self, import_menu):154 def hook_import_menu(self, import_menu):
158 """155 """
@@ -163,8 +160,8 @@
163 The Import menu.160 The Import menu.
164 """161 """
165 for plugin in self.plugins:162 for plugin in self.plugins:
166 if plugin[u'status'] == u'Active':163 if plugin.status == PluginStatus.Active:
167 plugin[u'plugin'].add_import_menu_item(import_menu)164 plugin.add_import_menu_item(import_menu)
168165
169 def hook_export_menu(self, export_menu):166 def hook_export_menu(self, export_menu):
170 """167 """
@@ -175,8 +172,8 @@
175 The Export menu.172 The Export menu.
176 """173 """
177 for plugin in self.plugins:174 for plugin in self.plugins:
178 if plugin[u'status'] == u'Active':175 if plugin.status == PluginStatus.Active:
179 plugin[u'plugin'].add_export_menu_item(export_menu)176 plugin.add_export_menu_item(export_menu)
180177
181 def hook_tools_menu(self, tools_menu):178 def hook_tools_menu(self, tools_menu):
182 """179 """
@@ -187,8 +184,8 @@
187 The Tools menu.184 The Tools menu.
188 """185 """
189 for plugin in self.plugins:186 for plugin in self.plugins:
190 if plugin[u'status'] == u'Active':187 if plugin.status == PluginStatus.Active:
191 plugin[u'plugin'].add_tools_menu_item(tools_menu)188 plugin.add_tools_menu_item(tools_menu)
192189
193 def initialise_plugins(self):190 def initialise_plugins(self):
194 """191 """
@@ -196,8 +193,8 @@
196 initialise themselves.193 initialise themselves.
197 """194 """
198 for plugin in self.plugins:195 for plugin in self.plugins:
199 if plugin[u'status'] == u'Active':196 if plugin.status == PluginStatus.Active:
200 plugin[u'plugin'].initialise()197 plugin.initialise()
201198
202 def finalise_plugins(self):199 def finalise_plugins(self):
203 """200 """
@@ -205,5 +202,5 @@
205 clean themselves up202 clean themselves up
206 """203 """
207 for plugin in self.plugins:204 for plugin in self.plugins:
208 if plugin[u'status'] == u'Active':205 if plugin.status == PluginStatus.Active:
209 plugin[u'plugin'].finalise()206 plugin.finalise()
210207
=== modified file 'openlp/core/ui/plugindialoglistform.py'
--- openlp/core/ui/plugindialoglistform.py 2009-08-15 19:10:59 +0000
+++ openlp/core/ui/plugindialoglistform.py 2009-09-18 17:37:11 +0000
@@ -9,7 +9,7 @@
99
10import logging10import logging
11from PyQt4 import QtCore, QtGui11from PyQt4 import QtCore, QtGui
12from openlp.core.lib import translate12from openlp.core.lib import translate, PluginStatus
1313
14class PluginForm(QtGui.QDialog):14class PluginForm(QtGui.QDialog):
15 global log15 global log
@@ -63,11 +63,14 @@
63 for plugin in self.parent.plugin_manager.plugins:63 for plugin in self.parent.plugin_manager.plugins:
64 row = self.PluginViewList.rowCount()64 row = self.PluginViewList.rowCount()
65 self.PluginViewList.setRowCount(row + 1)65 self.PluginViewList.setRowCount(row + 1)
66 item1 = QtGui.QTableWidgetItem(plugin[u'plugin'].name)66 item1 = QtGui.QTableWidgetItem(plugin.name)
67 item1.setTextAlignment(QtCore.Qt.AlignVCenter)67 item1.setTextAlignment(QtCore.Qt.AlignVCenter)
68 item2 = QtGui.QTableWidgetItem(plugin[u'plugin'].version)68 item2 = QtGui.QTableWidgetItem(plugin.version)
69 item2.setTextAlignment(QtCore.Qt.AlignVCenter)69 item2.setTextAlignment(QtCore.Qt.AlignVCenter)
70 item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', plugin[u'status']))70 if plugin.status == PluginStatus.Active:
71 item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Active'))
72 else:
73 item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Inactive'))
71 item3.setTextAlignment(QtCore.Qt.AlignVCenter)74 item3.setTextAlignment(QtCore.Qt.AlignVCenter)
72 self.PluginViewList.setItem(row, 0, item1)75 self.PluginViewList.setItem(row, 0, item1)
73 self.PluginViewList.setItem(row, 1, item2)76 self.PluginViewList.setItem(row, 1, item2)