change title and fix bug

dozer47528 · Dec 14, 2015 · dcd642c · dcd642c
1 parent bc96a6f
commit dcd642c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/model/Base64.py b/model/Base64.py
@@ -1,4 +1,5 @@
 import base64
+import re
 
 from model.BaseModel import BaseModel
 from workflow.workflow import Item
@@ -15,24 +16,25 @@ def convert(self, query):
         encode_result = base64.encodestring(query).replace('\n', '')
         result += [
             Item(
-                    title=u'Base64 Encode',
+                    title=u'Base64 Encode' + ': ' + query,
                     subtitle=encode_result,
                     arg=encode_result,
                     valid=True
             )
         ]
 
         try:
-            decode_result = base64.decodestring(query).replace('\n', '')
-            if base64.encodestring(decode_result).replace('\n', '') == query:
-                result += [
-                    Item(
-                            title=u'Base64 Decode',
-                            subtitle=decode_result,
-                            arg=decode_result,
-                            valid=True
-                    )
-                ]
+            if re.search("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$", query):
+                decode_result = base64.decodestring(query).encode('utf-8').replace('\n', '')
+                if base64.encodestring(decode_result).replace('\n', '') == query:
+                    result += [
+                        Item(
+                                title=u'Base64 Decode' + ': ' + query,
+                                subtitle=decode_result,
+                                arg=decode_result,
+                                valid=True
+                        )
+                    ]
         except:
             pass
 

diff --git a/model/DateTime.py b/model/DateTime.py
@@ -19,13 +19,13 @@ def convert(self, query):
 
             result += [
                 Item(
-                        title=u'TimeStamp to DataTime(Local)',
+                        title=u'TimeStamp to DataTime(Local)' + ': ' + query,
                         subtitle=str(local_datetime),
                         arg=str(local_datetime),
                         valid=True
                 ),
                 Item(
-                        title=u'TimeStamp to DataTime(UTC)',
+                        title=u'TimeStamp to DataTime(UTC)' + ': ' + query,
                         subtitle=str(utc_datetime),
                         arg=str(utc_datetime),
                         valid=True

diff --git a/model/Html.py b/model/Html.py
@@ -11,13 +11,13 @@ def __init__(self):
     def convert(self, query):
         return [
             Item(
-                    title=u'Html Encode',
+                    title=u'Html Encode' + ': ' + query,
                     subtitle=saxutils.escape(query),
                     arg=saxutils.escape(query),
                     valid=True
             ),
             Item(
-                    title=u'Html Decode',
+                    title=u'Html Decode' + ': ' + query,
                     subtitle=saxutils.unescape(query),
                     arg=saxutils.unescape(query),
                     valid=True

diff --git a/model/Javascript.py b/model/Javascript.py
@@ -11,19 +11,19 @@ def __init__(self):
     def convert(self, query):
         return [
             Item(
-                    title=u'JavaScript encodeURI',
+                    title=u'JavaScript encodeURI' + ': ' + query,
                     subtitle=urllib2.quote(query, "!#$&'()*+,-./:;=?@_~").encode("utf-8"),
                     arg=urllib2.quote(query, "!#$&'()*+,-./:;=?@_~").encode("utf-8"),
                     valid=True
             ),
             Item(
-                    title=u'JavaScript encodeURIComponent',
+                    title=u'JavaScript encodeURIComponent' + ': ' + query,
                     subtitle=urllib2.quote(query, "!'()*-._~").encode("utf-8"),
                     arg=urllib2.quote(query, "!'()*-._~").encode("utf-8"),
                     valid=True
             ),
             Item(
-                    title=u'JavaScript decode',
+                    title=u'JavaScript decode' + ': ' + query,
                     subtitle=urllib2.unquote(query).encode("utf-8"),
                     arg=urllib2.unquote(query).encode("utf-8"),
                     valid=True

diff --git a/model/MD5.py b/model/MD5.py
@@ -13,7 +13,7 @@ def convert(self, query):
         m.update(query)
         v = m.hexdigest()
         return [Item(
-                title=self.name,
+                title=self.name + ': ' + query,
                 subtitle=v,
                 arg=v,
                 valid=True

diff --git a/test.py b/test.py
@@ -1,4 +1,4 @@
 from unified_converter import UnifiedConverter
 
 converter = UnifiedConverter()
-converter.convert('javascript asdas?asda=1zda')
+converter.convert('base64 MWFhYQ==')