From c52ca3c24fd0c4a48f715e9f5340e759bb7342f8 Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Sat, 22 Sep 2007 23:38:15 -0400
Subject: [PATCH] more setuptools work

---
 setup.py              |  3 +--
 src/Comic/Fetch.py    | 29 ++++++++++-------------------
 src/Comic/__init__.py |  4 ++++
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/setup.py b/setup.py
index 9781eb5..c959267 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import ez_setup
-ez_setup.use_setuptools(version='0.6c')
+ez_setup.use_setuptools(version='0.6c6')
 from setuptools import setup
 import sys, os.path
 
@@ -27,7 +27,6 @@ setup(
         SQLObject >= 0.8
         PyYAML >= 3.0
     ''',
-    scripts=['src/scripts/comic_get'],
     entry_points={
         'console_scripts': [
             'comic_show = Comic.Web:run',
diff --git a/src/Comic/Fetch.py b/src/Comic/Fetch.py
index 260aa77..894a9e4 100644
--- a/src/Comic/Fetch.py
+++ b/src/Comic/Fetch.py
@@ -12,7 +12,7 @@ import time, urllib, urllib2, random, yaml, re, BeautifulSoup, \
 from signal import SIG_IGN, SIGINT, signal
 from Comic import DB, Conf, ComicLoader, Magic, InitDB
 from htmlentitydefs import name2codepoint
-from pkg_resources import resource_filename
+from pkg_resources import resource_stream
 HaltLock = threading.Lock()
 
 REType = type(re.compile(''))
@@ -591,8 +591,10 @@ class ComicDef:
             ('url_current', 'url_start', 'url_archive', \
             'WorkingURL') ]:
             return False
-        if DB.Issue.select(AND(DB.Issue.q.comicID == self.DBComic.id,
-            DB.Issue.q.url == url)).count():
+        if DB.Issue.selectBy(
+            comicID=self.DBComic.id,
+            url=url
+        ).count():
             return False
         if url == self.url_stop:
             return False
@@ -735,21 +737,10 @@ class ComicDef:
             )
 
 def Init():
-    comics_source = os.path.join(resource_filename('Comic', 'data'), 'comics')
-    classes_source = [ os.path.join(comics_source, 'classes.yml') ]
-    definitions_source = [ os.path.join(comics_source, 'definitions.yml') ]
-    try:
-        classes_source.extend(Conf.comic_classes)
-    except KeyError:
-        pass
-    try:
-        definitions_source.extend(Conf.comic_definitions)
-    except KeyError:
-        pass
-    for infile in classes_source:
-        Merge(infile, ComicClass, Classes)
-    for infile in definitions_source:
-        Merge(infile, ComicDef, Defs)
+    classes_source = resource_stream('Comic', 'data/comics/classes.yml')
+    definitions_source = resource_stream('Comic', 'data/comics/definitions.yml')
+    Merge(classes_source, ComicClass, Classes)
+    Merge(definitions_source, ComicDef, Defs)
 
 usage = \
 """Usage: %s [[operation [comics]] | [[comic_options] [comics]]]
@@ -833,7 +824,7 @@ def Run():
             comiclist = []
             if sys.argv[1] in ('-A','--add'):
                 for c in sys.argv[2:]:
-                    if c in Defs:
+                    if not c in Defs:
                         sys.exit("The comic \"%s\" does not exist in the set of available comic definitions."%c)
                     elif not c in comiclist:
                         comiclist.append(c)
diff --git a/src/Comic/__init__.py b/src/Comic/__init__.py
index 951b7bc..49538db 100644
--- a/src/Comic/__init__.py
+++ b/src/Comic/__init__.py
@@ -46,8 +46,12 @@ else:
     SysAppDir = os.path.join('/usr/share', 'comic_get')
     SysConfDir = os.path.join('/etc', 'comic_get')
 
+Conf = None
+
 def InitConf():
     global Conf
+    if not Conf is None:
+        return
     from Comic import Config
     cdb = os.path.abspath(os.path.join(AppDir,'comics.db'))
     if win:
-- 
2.11.4.GIT