fixed urltools.py

plugins/urltools.py

@@ -4,7 +4,9 @@ from urllib2 import urlopen, Request, HTTPError
 import re
 import BeautifulSoup
 
-ignored_urls = ["http://google.com","http://youtube.com","http://pastebin.com","http://mibpaste.com","http://fpaste.com","beastnode.com"]
+ignored_urls = ["http://google.com", "http://youtube.com",
+                "http://pastebin.com", "http://mibpaste.com",
+                "http://fpaste.com"]
 
 wordDic = {
 '"': '"',
@@ -23,6 +25,7 @@ wordDic = {
 '$': '$',
 '  ': ' '}
 
+
 def parse(match):
     url = urlnorm.normalize(match.encode('utf-8'))
     if url not in ignored_urls:
@@ -33,24 +36,26 @@ def parse(match):
         except:
             return "fail"
 
+
 def multiwordReplace(text, wordDic):
     rc = re.compile('|'.join(map(re.escape, wordDic)))
+
     def translate(match):
         return wordDic[match.group(0)]
     return rc.sub(translate, text)
 
 
-#@hook.regex(r'^(?#Protocol)(?:(?:ht|f)tp(?:s?)\:\/\/|~\/|\/)?(?#Username:Password)(?:\w+:\w+@)?(?#Subdomains)(?:(?:[-\w]+\.)+(?#TopLevel Domains)(?:com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum|travel|[a-z]{2}))(?#Port)(?::[\d]{1,5})?(?#Directories)(?:(?:(?:\/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|\/)+|\?|#)?(?#Query)(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?#Anchor)(?:#(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)?$')
-#@hook.regex(r'([a-zA-Z]+://|www\.)[^ ]+')
-def urlparser(match, say = None):
-    print "[debug] URL found"
+@hook.regex(r'([a-zA-Z]://|www\.)?[^ ]+(\.[a-z]+)+')
+def urlparser(match, say=None):
     url = urlnorm.normalize(match.group().encode('utf-8'))
+    if url[:7] != "http://":
+        if url[:8] != "https://":
+            url = "http://" + url
     for x in ignored_urls:
         if x in url:
             return
     title = parse(url)
     if title == "fail":
-        print "[url] No title found"
         return
     title = multiwordReplace(title, wordDic)
     realurl = http.get_url(url)
@@ -60,6 +65,3 @@ def urlparser(match, say = None):
     else:
         say("(Link) %s [%s]" % (title, realurl))
         return
-
-
-