From: Conny Sjöblom <redacted>
Date: Sat, 8 Feb 2014 21:56:06 +0000 (+0200)
Subject: regex
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/99366200d5afdc1fa53fde0ee8533429af937f9e?ds=inline

regex
---

diff --git a/modules/coins.py b/modules/coins.py
index 34bbb54..5a92fad 100644
--- a/modules/coins.py
+++ b/modules/coins.py
@@ -22,8 +22,11 @@ import json
 import requests
 
 coin_regex = (
-#  re.compile(r'([0-9., ]+[0-9]+) (BTC|bitcoin|doge|dogecoin|ltc|litecoin)'), # Fix regex
-	re.compile(r'([0-9.\s]+)\s(btc|bitcoin|doge|dogecoin|ltc|litecoin)'),
+	re.compile(r'([0-9.,\s]+)\s(btc|bitcoin|doge|dogecoin|ltc|litecoin)'),
+)
+
+cur_regex = (
+	re.compile(r'([0-9.,\s]+)\s([a-zA-Z]{3})\sin\s([a-zA-Z]{3})'),
 )
 
 url = 'http://www.cryptocoincharts.info/v2/api/tradingPairs'
@@ -88,9 +91,22 @@ def privmsg_hook(bot, line):
 
 	chan = line.split()[2]
 
+	if 'in' in line:
+		for r in cur_regex:
+			for a, f, t in r.findall(linetx):
+
+				# https://www.google.com/finance/converter?a=1.2&from=USD&to=EUR
+
+				a = a.replace(",", ".")
+				a = a.replace(" ", "")
+				print a
+				print f
+				print t
+
 	if 'btc' in line or 'bitcoin' in line or 'doge' in line or 'dogecoin' in line:
 		for r in coin_regex:
 			for amount, coin in r.findall(linetx):
+				amount = amount.replace(",", ".")
 				amount = amount.replace(" ", "")
 				if 'btc' in coin or 'bitcoin' in coin:
 					try:
diff --git a/modules/urls.py b/modules/urls.py
index 9e8e3e2..2908dc0 100644
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -10,6 +10,8 @@ modinfo = {
 	'depends': [], # other modules required to work properly?
 }
 
+# http://embed.ly/tools/generator
+
 # preamble
 import modlib
 lib = modlib.modlib(__name__)
@@ -149,3 +151,4 @@ def gottwitch(url):
 				bot.msg(line.split()[2], 'Twitch: %s (%s playing %s)' % (twitch[0]['channel']['status'], twitch[0]['channel']['login'], twitch[0]['channel']['meta_game']))
 			except:
 				bot.msg(line.split()[2], 'Twitch: Channel offline.')
+