Merged in the new plugin system

6 files changed, 6 insertions, 130 deletions

diff --git a/portato/plugins/__init__.py b/portato/plugins/__init__.py
index fe95dbc..5080cec 100644
--- a/portato/plugins/__init__.py
+++ b/portato/plugins/__init__.py
@@ -3,9 +3,14 @@
 # File: portato/plugins/__init__.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2007 René 'Necoro' Neumann
+# Copyright (C) 2007-2008 René 'Necoro' Neumann
 # This is free software.  You may redistribute copies of it under the terms of
 # the GNU General Public License version 2.
 # There is NO WARRANTY, to the extent permitted by law.
 #
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
+
+"""
+This is a dummy module. The plugins loaded from here are in reality stored
+in /usr/share/portato/plugins or alike.
+"""
diff --git a/portato/plugins/etc_proposals.py b/portato/plugins/etc_proposals.py
deleted file mode 100644
index d5f707f..0000000
--- a/portato/plugins/etc_proposals.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# File: portato/plugins/etc_proposals.py
-# This file is part of the Portato-Project, a graphical portage-frontend.
-#
-# Copyright (C) 2007 René 'Necoro' Neumann
-# This is free software.  You may redistribute copies of it under the terms of
-# the GNU General Public License version 2.
-# There is NO WARRANTY, to the extent permitted by law.
-#
-# Written by René 'Necoro' Neumann <necoro@necoro.net>
-
-from portato.helper import error
-
-import os
-from subprocess import Popen
-
-PROG=["/usr/sbin/etc-proposals"]
-
-def launch (options = []):
-	if os.getuid() == 0:
-		Popen(PROG+options)
-	else:
-		error("ETC_PROPOSALS :: %s",_("Cannot start etc-proposals. Not root!"))
-
-def etc_prop (*args, **kwargs):
-	"""Entry point for this plugin."""
-	launch(["--fastexit"])
-
-def etc_prop_menu (*args, **kwargs):
-	launch()
diff --git a/portato/plugins/exception.py b/portato/plugins/exception.py
deleted file mode 100644
index 64bdb77..0000000
--- a/portato/plugins/exception.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def throw (*args, **kwargs):
-	raise Exception, "As requested, Sir!"
diff --git a/portato/plugins/gpytage.py b/portato/plugins/gpytage.py
deleted file mode 100644
index 22cc7ef..0000000
--- a/portato/plugins/gpytage.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# File: portato/plugins/gpytage.py
-# This file is part of the Portato-Project, a graphical portage-frontend.
-#
-# Copyright (C) 2008 René 'Necoro' Neumann
-# This is free software.  You may redistribute copies of it under the terms of
-# the GNU General Public License version 2.
-# There is NO WARRANTY, to the extent permitted by law.
-#
-# Written by René 'Necoro' Neumann <necoro@necoro.net>
-
-from subprocess import Popen
-
-def gpytage(*args, **kwargs):
-	Popen(["/usr/bin/gpytage"])
diff --git a/portato/plugins/new_version.py b/portato/plugins/new_version.py
deleted file mode 100644
index fe69292..0000000
--- a/portato/plugins/new_version.py
+++ /dev/null
@@ -1,58 +0,0 @@
-try:
-	from bzrlib import plugin, branch
-except ImportError:
-	plugin = branch =  None
-import gobject
-
-from portato.helper import debug, warning
-from portato import get_listener
-from portato.constants import VERSION, APP_ICON, APP
-from portato.gui.utils import GtkThread
-
-def find_version (rev):
-	try:
-		b = branch.Branch.open("lp:portato")
-	except Exception, e:
-		warning("NEW_VERSION :: Exception occured while accessing the remote branch: %s", str(e))
-		return
-
-	debug("NEW_VERSION :: Installed rev: %s - Current rev: %s", rev, b.revno())
-	if int(rev) < int(b.revno()):
-		def callback():
-			get_listener().send_notify(base = "New Portato Live Version Found", descr = "You have rev. %s, but the most recent revision is %s." % (rev, b.revno()), icon = APP_ICON)
-			return False
-		
-		gobject.idle_add(callback)
-
-def start_thread(rev):
-	t = GtkThread(target = find_version, name = "Version Updater Thread", args = (rev,))
-	t.setDaemon(True)
-	t.start()
-	return True
-
-def run_menu (*args, **kwargs):
-	"""
-	Run the thread once.
-	"""
-	if not all((plugin, branch)):
-		return None
-
-	v = VERSION.split()
-	if len(v) != 3 or v[0] != "9999":
-		return None
-
-	rev = v[-1]
-
-	plugin.load_plugins() # to have lp: addresses parsed
-	
-	start_thread(rev)
-	return rev
-
-def run (*args, **kwargs):
-	"""
-	Run the thread once and add a 30 minutes timer.
-	"""
-	rev = run_menu()
-
-	if rev is not None:
-		gobject.timeout_add(30*60*1000, start_thread, rev) # call it every 30 minutes
diff --git a/portato/plugins/notify.py b/portato/plugins/notify.py
deleted file mode 100644
index 78812b3..0000000
--- a/portato/plugins/notify.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import pynotify
-
-from portato import get_listener
-
-from portato.helper import warning, error, debug
-from portato.constants import APP_ICON, APP
-
-def notify (retcode, **kwargs):
-	if retcode is None:
-		warning("NOTIFY :: %s", _("Notify called while process is still running!"))
-	else:
-		icon = APP_ICON
-		if retcode == 0:
-			text = _("Emerge finished!")
-			descr = ""
-			urgency = pynotify.URGENCY_NORMAL
-		else:
-			text = _("Emerge failed!")
-			descr = _("Error Code: %d") % retcode
-			urgency = pynotify.URGENCY_CRITICAL
-
-		get_listener().send_notify(base = text, descr = descr, icon = icon, urgency = urgency)