X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=manga%2Flib.py;h=21edd3db2b0b48fa593d9690bae57544afc56c85;hb=31ea855c3d572c75c6ad8737dda8df70502c76f9;hp=3c83ab127875263f0401991dc4a4a3b7cbb59449;hpb=39b66c759278aff6cde35883172f228fcab0ac7c;p=automanga.git

diff --git a/manga/lib.py b/manga/lib.py
index 3c83ab1..21edd3d 100644
--- a/manga/lib.py
+++ b/manga/lib.py
@@ -172,17 +172,16 @@ class cursor(object):
     def __iter__(self):
         return self
 
-def _lazymod(name):
-    return __import__(name, fromlist=["dummy"])
-class _lazydict(object):
-    def __init__(self):
-        self.bk = {}
-    def __setitem__(self, key, val):
-        self.bk[key] = "u", val
-    def __getitem__(self, key):
-        st, v = self.bk[key]
-        if st == "u":
-            v = self.bk[key] = v()
-        return v
-libraries = _lazydict()
-libraries["mf"] = lambda: _lazymod("manga.mangafox").library()
+loaded = {}
+def findlib(name):
+    def load(name):
+        mod = __import__(name, fromlist=["dummy"])
+        if not hasattr(mod, "library"):
+            raise ImportError("module " + name + " is not a manga library")
+        return mod.library()
+    if name not in loaded:
+        try:
+            loaded[name] = load("manga." + name)
+        except ImportError:
+            loaded[name] = load(name)
+    return loaded[name]