Merge branch 'release/1.3.1'

JohnDoee · Feb 20, 2015 · d530880 · d530880
2 parents f6b4465 + 41b5bdb
commit d530880
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 Anders Jensen
+Copyright (C) 2015 Anders Jensen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/autotorrent/cmd.py b/autotorrent/cmd.py
@@ -71,10 +71,13 @@ def commandline_handler():
     at.populate_torrents_seeded()
 
     if args.rebuild:
+        print('Rebuilding database')
         db.rebuild()
+        print('Database rebuilt')
 
     if args.addfile:
         print('Found %s torrent(s)' % len(args.addfile))
+        at.populate_torrents_seeded()
         for torrent in args.addfile:
             at.handle_torrentfile(os.path.join(current_path, torrent))
 

diff --git a/autotorrent/db.py b/autotorrent/db.py
@@ -31,9 +31,9 @@ def rebuild(self):
         logger.info('Rebuilding database')
         self.truncate()
 
-        for path in self.paths:
-            logger.info('Scanning %s' % path)
-            for root, dirs, files in os.walk(path):
+        for root_path in self.paths:
+            logger.info('Scanning %s' % root_path)
+            for root, dirs, files in os.walk(root_path):
                 for f in files:
                     normalized_filename = self.normalize_filename(f)
 
@@ -56,7 +56,7 @@ def rebuild(self):
                             logger.warning('Duplicate key %s and %s' % (path, self.db[key]))
 
                     self.db[key] = path
-            logger.info('Done scanning %s' % path)
+            logger.info('Done scanning %s' % root_path)
         self.db.sync()
 
     def find_file_path(self, f, size):

diff --git a/setup.py b/setup.py
@@ -13,21 +13,21 @@ def read_description():
 
 setup(
     name='autotorrent',
-    version='1.3.0',
+    version='1.3.1',
     description='AutoTorrent allows easy cross-seeding',
     long_description=read_description(),
     author='Anders Jensen',
     author_email='johndoee+autotorrent@tidalstream.org',
     maintainer='John Doee',
     url='https://github.com/JohnDoee/autotorrent',
-    packages=['autotorrent'],
+    packages=['autotorrent', 'autotorrent.clients'],
     install_requires=['six'],
-    license='BSD',
+    license='MIT',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',
         'Intended Audience :: End Users/Desktop',
-        'License :: OSI Approved :: BSD License',
+        'License :: OSI Approved :: MIT License',
         'Operating System :: POSIX :: BSD',
         'Operating System :: POSIX :: Linux',
         'Operating System :: POSIX :: Other',