Better strategy for -f option: import feeds and then fetch them.

Author: passiomatic

coldsweat/commands.py

@@ -56,10 +56,13 @@ def command_import(self, options, args):
 
         self.user = self._get_user(options.username)
 
-        feeds = self.add_feeds_from_file(args[0], options.fetch_data)
+        feeds = self.add_feeds_from_file(args[0])
         for feed, group in feeds:
-            self.add_subscription(feed, group)
-    
+            self.add_subscription(feed, group)      
+        if options.fetch_data:
+            # Fetch just imported feeds
+            self.fetch_feeds([feed for feed, group in feeds]) 
+        
         print "Import%s completed for user %s. See log file for more information" % (' and fetch' if options.fetch_data else '', self.user.username)
 
 

coldsweat/models.py

@@ -50,22 +50,22 @@ def initialize_connection(self, connection):
         self.execute_sql('PRAGMA foreign_keys=ON;')
 
 def parse_connection_url(url):
-	parsed = urlparse.urlparse(url, scheme='sqlite')
-	connect_kwargs = {'database': parsed.path[1:]}
-	if parsed.username:
-		connect_kwargs['user'] = parsed.username
-	if parsed.password:
-		connect_kwargs['password'] = parsed.password
-	if parsed.hostname:
-		connect_kwargs['host'] = parsed.hostname
-	if parsed.port:
-		connect_kwargs['port'] = parsed.port
-
+    parsed = urlparse.urlparse(url, scheme='sqlite')
+    connect_kwargs = {'database': parsed.path[1:]}
+    if parsed.username:
+        connect_kwargs['user'] = parsed.username
+    if parsed.password:
+        connect_kwargs['password'] = parsed.password
+    if parsed.hostname:
+        connect_kwargs['host'] = parsed.hostname
+    if parsed.port:
+        connect_kwargs['port'] = parsed.port
+    
     # Adjust parameters for MySQL
-	if parsed.scheme == 'mysql' and 'password' in connect_kwargs:
-		connect_kwargs['passwd'] = connect_kwargs.pop('password')
-
-	return parsed.scheme, connect_kwargs
+    if parsed.scheme == 'mysql' and 'password' in connect_kwargs:
+        connect_kwargs['passwd'] = connect_kwargs.pop('password')
+    
+    return parsed.scheme, connect_kwargs
 
 
 engine, kwargs = parse_connection_url(config.database.connection_url)
@@ -79,7 +79,7 @@ def parse_connection_url(url):
     _db = PostgresqlDatabase(autorollback=True, **kwargs)
     migrator = PostgresqlMigrator(_db)
 else:
-	raise ValueError('Unknown database engine %s. Should be sqlite, postgresql or mysql' % engine)
+    raise ValueError('Unknown database engine %s. Should be sqlite, postgresql or mysql' % engine)
 
 # ------------------------------------------------------
 # Custom fields