From b43bf8fa2857901efb3394109ebc545edafb38c1 Mon Sep 17 00:00:00 2001
From: volpino <fox91@anche.no>
Date: Fri, 8 Jun 2012 14:43:18 +0200
Subject: [PATCH] euscanwww: Removing duplicated code

Signed-off-by: volpino <fox91@anche.no>
---
 bin/euscan                                    | 21 +++++--------------
 .../management/commands/scan_upstream.py      |  6 +-----
 .../admin/djcelery/taskstate/change_list.html |  5 ++++-
 pym/euscan/scan.py                            | 10 +++++++++
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/bin/euscan b/bin/euscan
index 907902a..7bea5bd 100755
--- a/bin/euscan
+++ b/bin/euscan
@@ -271,26 +271,15 @@ def main():
             output.eerror('%s: %s' % (query, str(err)))
             exit_helper(1)
 
-        if not CONFIG['quiet'] and not CONFIG['format']:
-            print()
-
         if (CONFIG['format'] or CONFIG['quiet']) and isatty:
             on_progress_gen.next()
             print("\n", file=sys.stderr)
 
-        if ret is not None:
-            if len(ret) > 0:
-                for cp, url, version, handler, confidence in ret:
-                    output.result(cp, version, url, handler, confidence)
-
-                if (CONFIG['format'] or CONFIG['quiet']) and isatty:
-                    print("\n", file=sys.stderr)
-
-            elif not CONFIG['quiet']:
-                output.ewarn(
-                    "Didn't find any new version, check package's homepage " +
-                    "for more informations"
-                )
+        if not ret and not CONFIG['quiet']:
+            output.ewarn(
+                "Didn't find any new version, check package's homepage " +
+                "for more informations"
+            )
 
     output.set_query(None)
 
diff --git a/euscanwww/djeuscan/management/commands/scan_upstream.py b/euscanwww/djeuscan/management/commands/scan_upstream.py
index 5cbdcb9..13b5a9d 100644
--- a/euscanwww/djeuscan/management/commands/scan_upstream.py
+++ b/euscanwww/djeuscan/management/commands/scan_upstream.py
@@ -22,11 +22,7 @@ class ScanUpstream(object):
         CONFIG["format"] = "dict"
         output.set_query(package)
 
-        ret = scan_upstream(package)
-        if ret is not None:
-            if len(ret) > 0:
-                for cp, url, version, handler, confidence in ret:
-                    output.result(cp, version, url, handler, confidence)
+        scan_upstream(package)
 
         out = output.get_formatted_output()
         out_json = output.get_formatted_output("json")
diff --git a/euscanwww/djeuscan/templates/admin/djcelery/taskstate/change_list.html b/euscanwww/djeuscan/templates/admin/djcelery/taskstate/change_list.html
index eff9ec5..0076a6c 100644
--- a/euscanwww/djeuscan/templates/admin/djcelery/taskstate/change_list.html
+++ b/euscanwww/djeuscan/templates/admin/djcelery/taskstate/change_list.html
@@ -68,10 +68,13 @@
             var url = "{% url "apply_task" "task_name" %}";
 
             $.post(url.replace("task_name", task_name), data, function() {
-              //location.reload();
+              alert("Submitted!");
+              location.reload();
             });
         });
 
+        setTimeout(location.reload, 10000);
+
       });
     })(django.jQuery);
   </script>
diff --git a/pym/euscan/scan.py b/pym/euscan/scan.py
index 0b8f4ad..5d1bf79 100644
--- a/pym/euscan/scan.py
+++ b/pym/euscan/scan.py
@@ -1,4 +1,7 @@
+from __future__ import print_function
+
 import os
+import sys
 from datetime import datetime
 
 import portage
@@ -212,4 +215,11 @@ def scan_upstream(query, on_progress=None):
     if on_progress:
         on_progress(maxval, curval)
 
+    if len(result) > 0:
+        if not (CONFIG['format'] or CONFIG['quiet']):
+            print("\n", file=sys.stderr)
+
+        for cp, url, version, handler, confidence in result:
+            output.result(cp, version, url, handler, confidence)
+
     return result