tagging and cleanup for 0.9 release.

MANIFEST

@@ -5,6 +5,8 @@ README.txt
 setup.py
 ./bin/pymazon
 ./pymazon/__init__.py
+./pymazon/cmd/__init__.py
+./pymazon/cmd/ui.py
 ./pymazon/core/__init__.py
 ./pymazon/core/decryptor.py
 ./pymazon/core/downloader.py
@@ -14,8 +16,6 @@ setup.py
 ./pymazon/core/settings.py
 ./pymazon/core/tree_model.py
 ./pymazon/gtk/__init__.py
-./pymazon/gtk/gtkgui.py
-./pymazon/gtk/tester.py
 ./pymazon/gtk/tree_model.py
 ./pymazon/gtk/ui.py
 ./pymazon/qt/__init__.py

bin/pymazon

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
-#for dev only
-sys.path.append('/home/brucewayne/development/pymazon/hg')
 
 from pymazon.core.options import parse_options
 from pymazon.core.settings import settings
@@ -33,7 +31,7 @@ logger = PymazonLogger('main')
 def main():    
     entry, amzs = parse_options()   
     if entry == 'cmd':
-        if not amzs:
+        if not amzs:            
             raise ValueError('No .amz files specified.')
         from pymazon.cmd.ui import main
         main(amzs)
@@ -42,7 +40,7 @@ def main():
             from pymazon.qt.ui import main
             main(amzs)
         except ImportError, e:
-            print e
+            logger.error(e)
             msg = ('Unable to import PyQt4. You can still use Pymazon '
                    'via the commmand line with the -c switch. '
                    'Type `pymazon --help` for more info.')
@@ -51,7 +49,8 @@ def main():
         try:
             from pymazon.gtk.ui import main
             main(amzs)
-        except ImportError:
+        except ImportError, e:
+            logger.error(e)
             msg = ('Unable to import PyGtk. You can still use Pymazon '
                    'via the commmand line with the -c switch. '
                    'Type `pymazon --help` for more info.')

pymazon/cmd/ui.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -19,12 +19,11 @@
 import os
 import sys
 
+from pymazon.core.downloader import Downloader
 from pymazon.core.item_model import Track
-from pymazon.core.tree_model import TreeModel
 from pymazon.core.parser import AmzParser
-from pymazon.core.downloader import Downloader
 from pymazon.core.settings import settings
-
+from pymazon.core.tree_model import TreeModel
 
 
 pymazon_splash = """

pymazon/core/decryptor.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -16,9 +16,9 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import sys
 import base64
 from cStringIO import StringIO
+import sys
 
 try:
     from Crypto.Cipher import DES
@@ -30,6 +30,7 @@
 
 from pymazon.util.log_util import PymazonLogger
 
+
 logger = PymazonLogger('decryptor')
 
 

pymazon/core/downloader.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -16,16 +16,17 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import urllib2
-import threading
-from cStringIO import StringIO
 from collections import deque
+from cStringIO import StringIO
+import threading
+import urllib2
 
 from pymazon.core.item_model import Downloadable
-from pymazon.core.tree_model import TreeModel
 from pymazon.core.settings import settings
+from pymazon.core.tree_model import TreeModel
 from pymazon.util.log_util import PymazonLogger
 
+
 logger = PymazonLogger('downloader')
 
 

pymazon/core/item_model.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -61,7 +61,7 @@ def __init__(self, url=None):
         super(Downloadable, self).__init__()
         self.url = url       
 
-    def _safe_save_name(self, fname):
+    def _safe_save_name(self, fname):        
         # ensure we don't overwrite any files
         i = 1
         nfname = fname
@@ -121,9 +121,9 @@ def save(self, data):
         sn = template.safe_substitute(artist=self.album.artist, 
                                       title=self.title,
                                       tracknum=self.number,
-                                      album=self.album.title)
+                                      album=self.album.title)        
 
-        save_path = os.path.join(settings.save_dir, sn + '.' + self.extension)       
+        save_path = os.path.join(settings.save_dir, sn + '.' + self.extension)        
         super(Track, self).save(save_path, data)        
 
     def __unicode__(self):

pymazon/core/options.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -17,7 +17,6 @@
 """
 
 import os
-
 from optparse import OptionParser
 
 from pymazon.core.settings import settings
@@ -87,7 +86,6 @@ def parse_options():
                            'downloader. i.e. the number of simultaneous '
                            'downloads. When using the command line interfaces, '
                            'the number of threads is always 1.')
-
 
     options, args = parser.parse_args()    
 

pymazon/core/parser.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -20,7 +20,7 @@
 from xml.parsers import expat
 
 from pymazon.core.decryptor import AmzDecryptor
-from pymazon.core.item_model import Album, Track, OtherMedia
+from pymazon.core.item_model import Album, OtherMedia, Track
 
 
 class ParseException(Exception):

pymazon/core/settings.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -16,10 +16,11 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+from ConfigParser import ConfigParser, NoOptionError, NoSectionError
 import os
 import sys
 import warnings
-from ConfigParser import ConfigParser, NoOptionError, NoSectionError
+
 
 def pymazon_showwarning(message, category, *args):
     print 'Warning:'
@@ -49,10 +50,24 @@ def _get_pymazon_dir():
                'access is granted. Then, restart Pymazon.' % pymazon_dir)
         sys.exit(0)
 
+
+def _get_default_toolkit():
+    # try qt first, then gtk, if neither, use qt
+    try:
+        import PyQt4
+        toolkit = 'qt4'
+    except ImportError:
+        try:
+            import pygtk
+            toolkit = 'gtk'
+        except ImportError:
+            toolkit = 'qt4'
+    return toolkit
+
 
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Program-wide settings Class 
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
 class PymazonSettingsError(Exception):
     pass
@@ -65,7 +80,7 @@ def __init__(self):
         self._config_file =  os.path.join(self._pymazon_dir, 'pymazonrc')
         self._save_dir = os.environ.get('XDG_MUSIC_DIR', os.getcwd())
         self._name_template = '${tracknum} - ${title}'
-        self._toolkit = 'qt4'
+        self._toolkit = None # will be figured out in read/write_config_file
         self._num_threads = 1 
         self._read_config_file()
 
@@ -86,7 +101,7 @@ def _get_name_template(self):
         return self._name_template
 
     def _set_name_template(self, value):
-        template_string = str(value)
+        template_string = str(value).lstrip(os.path.sep)
         self._name_template = template_string
 
     name_template = property(_get_name_template, _set_name_template)
@@ -117,6 +132,9 @@ def _set_num_threads(self, val):
     num_threads = property(_get_num_threads, _set_num_threads)
 
     def write_config_file(self):
+        # don't do unnecessary imports if the user already has a config file.
+        if self._toolkit is None:
+            self._toolkit = _get_default_toolkit()
         cp = '''\
 [config]
 save_dir = %s

pymazon/core/tree_model.py

@@ -1,6 +1,6 @@
 """
 Pymazon - A Python based downloader for the Amazon.com MP3 store
-Copyright (c) 2009 Steven C. Colbert
+Copyright (c) 2010 Steven C. Colbert
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as