[kupfer: 6/31] data: Change SourceController's load, pickle, initialize process

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 7ad67392bd74dcebc623f8effe5dbf6215d7c92c
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Wed Dec 30 16:26:01 2009 +0100

    data: Change SourceController's load, pickle, initialize process

 kupfer/data.py |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/kupfer/data.py b/kupfer/data.py
index ab82b68..5416ce4 100644
--- a/kupfer/data.py
+++ b/kupfer/data.py
@@ -298,13 +298,8 @@ class SourceController (pretty.OutputMixin):
 		self.content_decorators = set()
 		self.action_decorators = set()
 
-	def _as_set(self, s):
-		if isinstance(s, set):
-			return s
-		return set(s)
 	def add(self, srcs, toplevel=False):
-		srcs = self._as_set(srcs)
-		self._unpickle_or_rescan(srcs, rescan=toplevel)
+		srcs = set(self._try_unpickle(srcs))
 		self.sources.update(srcs)
 		if toplevel:
 			self.toplevel_sources.update(srcs)
@@ -421,23 +416,20 @@ class SourceController (pretty.OutputMixin):
 
 	def finish(self):
 		self._pickle_sources(self.sources)
-	def _unpickle_or_rescan(self, sources, rescan=True):
+
+	def _try_unpickle(self, sources):
 		"""
 		Try to unpickle the source that is equivalent to the
 		"dummy" instance @source, if it doesn't succeed,
-		the "dummy" becomes live and is rescanned if @rescan
+		the "dummy" becomes live.
 		"""
 		sourcepickler = SourcePickler()
-		for source in list(sources):
+		for source in set(sources):
 			if self.pickle:
 				news = sourcepickler.unpickle_source(source)
 			else:
 				news = None
-			if news:
-				sources.remove(source)
-				sources.add(news)
-			elif rescan:
-				self._checked_rescan_source(source, force=True)
+			yield news if news is not None else source
 
 	def _pickle_sources(self, sources):
 		if not self.pickle: