Rework plugins with classes

plugins/display/top_visitors.py

@@ -1,37 +1,27 @@
 import time
+
+from iwla import IWLA
+from iplugin import IPlugin
 from display import *
 
-PLUGIN_CLASS = 'HTTP'
-API_VERSION = 1
+class IWLADisplayTopVisitors(IPlugin):
+    def __init__(self, iwla):
+        super(IWLADisplayTopVisitors, self).__init__(iwla)
+        self.API_VERSION = 1
+        self.requires = ['IWLAPostAnalysisTopVisitors']
 
-def get_plugins_infos():
-    infos = {
-        'class' : PLUGIN_CLASS,
-        'min_version' : API_VERSION,
-        'max_version' : -1
-    }
-    return infos
+    def hook(self, iwla):
+        stats = iwla.getMonthStats()
 
-def load():
-    return True
-
-def hook(iwla):
-    stats = iwla.getMonthStats()
-
-    top_visitors = stats.get('top_visitors', None)
-    if not top_visitors:
-        print 'Top visitors post analysis plugin not installed'
-        return
-
-    index = iwla.getDisplayIndex()
-    table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen'])
-    for super_hit in top_visitors:
-        row = [
-            super_hit['remote_addr'],
-            super_hit['viewed_pages'],
-            super_hit['viewed_hits'],
-            bytesToStr(super_hit['bandwidth']),
-            time.asctime(super_hit['last_access'])
-            ]
-        table.appendRow(row)
-    index.appendBlock(table)
+        index = iwla.getDisplayIndex()
+        table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen'])
+        for super_hit in stats['top_visitors']:
+            row = [
+                super_hit['remote_addr'],
+                super_hit['viewed_pages'],
+                super_hit['viewed_hits'],
+                bytesToStr(super_hit['bandwidth']),
+                time.asctime(super_hit['last_access'])
+                ]
+            table.appendRow(row)
+        index.appendBlock(table)