euscanwww: Fixed broken tasks

Signed-off-by: volpino <fox91@anche.no>

pym/euscan/out.py

@@ -67,12 +67,20 @@ class EOutputMem(EOutput):
         self.out = StringIO()
 
     def getvalue(self):
-        return re.sub("\033\[[0-9;]+m", "", self.out.getvalue())
+        return clean_colors(self.out.getvalue())
 
     def _write(self, f, msg):
         super(EOutputMem, self)._write(self.out, msg)
 
 
+def clean_colors(string):
+    if type(string) is str:
+        string = re.sub("\033\[[0-9;]+m", "", string)
+        string = re.sub(r"\\u001b\[[0-9;]+m", "", string)
+        string = re.sub(r"\x1b\[[0-9;]+m", "", string)
+    return string
+
+
 class EuscanOutput(object):
     """
     Class that handles output for euscan
@@ -141,7 +149,8 @@ class EuscanOutput(object):
 
     def metadata(self, key, value, show=True):
         if self.config["format"]:
-            self.queries[self.current_query]["metadata"][key] = value
+            self.queries[self.current_query]["metadata"][key] = \
+                clean_colors(value)
         elif show:
             print "%s: %s" % (key.capitalize(), value)
 

pym/euscan/scan.py

@@ -45,9 +45,13 @@ def filter_versions(cp, versions):
 def scan_upstream_urls(cpv, urls, on_progress):
     versions = []
 
-    progress_available = 70
-    num_urls = sum([len(urls[fn]) for fn in urls])
-    progress_increment = progress_available / num_urls
+    if on_progress:
+        progress_available = 70
+        num_urls = sum([len(urls[fn]) for fn in urls])
+        if num_urls > 0:
+            progress_increment = progress_available / num_urls
+        else:
+            progress_increment = 0
 
     for filename in urls:
         for url in urls[filename]: