From 109561c69495ba6fa4eabcd0a52c64dc28cd7521 Mon Sep 17 00:00:00 2001
From: Remy Sharp <remy@remysharp.com>
Date: Mon, 9 May 2016 11:57:07 +0100
Subject: [PATCH 1/2] Refactor to work with fixer.io

Mild rewrite to get the currency converter working and a lot more compatible with the language used in google to get ccy conversions.
---
 Currency Converter.alfredworkflow | Bin 33229 -> 33451 bytes
 README.md                         |  39 ++++++++------
 src/.DS_Store                     | Bin 6148 -> 0 bytes
 src/currency.php                  |  23 +++++---
 src/info.plist                    |  85 ------------------------------
 5 files changed, 40 insertions(+), 107 deletions(-)
 delete mode 100644 src/.DS_Store
 delete mode 100644 src/info.plist

diff --git a/Currency Converter.alfredworkflow b/Currency Converter.alfredworkflow
index f95f0a911f439b5ea94e30f084819c041617b6f6..9b080a26c63448f8f2392dc0d7b8c6ee49d3b0db 100644
GIT binary patch
delta 2514
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

delta 2263
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
P0MMOH+NmvbWB2x7@pb0g

diff --git a/README.md b/README.md
index 133da32..a0c93ff 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,41 @@
-Currency Converter for Alfred App
-=========
+# Currency Converter for Alfred App
 
-Currency Converter is a workflow for Alfred App on Mac.
+Currency Converter is a workflow for Alfred App on Mac. This is based on the Google currency conversion syntax, such as `30 USD in GBP`.
 
 The basic way to use the converter is to call Alfred with:
-> 30USD to EUR
 
-The default currency is DKK (can be changed) so the following will convert from USD to DKK:
+> 30 USD in EUR
+
+Note that `in` and `to` are interchangable. The default currency is GBP (can be changed) so the following will convert from USD to GBP:
+
 > 30USD
 
 Another shorthand is:
+
 > 30$ to €
 
-And even shorter: 
+And even shorter:
+
 > 30$ €
 
-Installation
-=========
-[Download](https://github.com/sqren/alfred-currency/raw/master/Currency%20Converter.alfredworkflow) and open the workflow file
+All FX rates come from [fixer.io](http://fixer.io/).
+
+## Usage
+
+The alfred command is `c`, and hitting return will copy the converted currency value to the clipboard.
+
+## Installation
+
+[Download](https://github.com/remy/alfred-currency/raw/master/Currency%20Converter.alfredworkflow) and open the workflow file
+
+## Requirements
 
-Requirements
-=========
-  You must installed:
+You must installed:
 
  - [Alfred 2.0](http://www.alfredapp.com/) or higher
  - [Alfred PowerPack](http://www.alfredapp.com/powerpack/)
 
+## Author
 
-Author
-=======
-Søren Louv-Jansen, [Konscript](http://www.konscript.com)
+- [Remy sharp](https://remysharp.com)
+- Søren Louv-Jansen, [Konscript](http://www.konscript.com) ([original author](https://github.com/sqren/alfred-currency))
diff --git a/src/.DS_Store b/src/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/src/currency.php b/src/currency.php
index 0904d4a..fdef0fe 100644
--- a/src/currency.php
+++ b/src/currency.php
@@ -6,7 +6,7 @@ function getRow($currency_from, $currency_to, $amount){
   global $wf;
 
   // build URL
-  $url = "http://rate-exchange.appspot.com/currency?from=" . $currency_from . "&to=" . $currency_to;
+  $url = "http://api.fixer.io/latest?base=" . strtoupper($currency_from) . "&symbols=" . strtoupper($currency_to);
 
   // get exchange rate
   $data_json = file_get_contents($url);
@@ -19,7 +19,8 @@ function getRow($currency_from, $currency_to, $amount){
 
   // No problems
   }else{
-    $exchange_rate = $data->rate;
+    // print_r($data);
+    $exchange_rate = $data->rates->$currency_to;
 
     $clipboard = round($exchange_rate * $amount, 1);
     $text = round($exchange_rate * $amount, 1) . " " . $currency_to;
@@ -44,15 +45,23 @@ function getResult($query, $default_currency){
     $query
   );
 
+  // uppercase
+  $query = strtoupper($query);
+
   // strip " to "
-  $query = str_replace(" to ", " ", $query);
+  $query = str_replace(" TO ", " ", $query);
+  $query = str_replace(" IN ", " ", $query);
+
+  // trim
+  $query = trim($query);
 
-  // Uppercase and trim
-  $query = strtoupper(trim($query));
+  // print_r('>>> query');
+  // print_r($query);
 
   // parse query
-  preg_match("/^(\d+)([A-Z]{3})\s?([A-Z]{3})?$/", $query, $matches);
+  preg_match("/^(\d+)\s?([A-Z]{3})\s?([A-Z]{3})?$/", $query, $matches);
 
+  // print_r('>>> matches');
   // print_r($matches);
   if(!empty($matches)){
 
@@ -70,4 +79,4 @@ function getResult($query, $default_currency){
   return $wf->toxml();
 }
 
-// echo getResult("40usd $");
\ No newline at end of file
+// echo getResult("40usd $");
diff --git a/src/info.plist b/src/info.plist
deleted file mode 100644
index e85087e..0000000
--- a/src/info.plist
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundleid</key>
-	<string>currencyconverter</string>
-	<key>connections</key>
-	<dict>
-		<key>63F60794-BB56-4415-9372-BAF974C3A7E1</key>
-		<array/>
-	</dict>
-	<key>createdby</key>
-	<string>Søren Louv-Jansen</string>
-	<key>description</key>
-	<string>Convert currencies with ease</string>
-	<key>disabled</key>
-	<false/>
-	<key>name</key>
-	<string>Currency Converter</string>
-	<key>objects</key>
-	<array>
-		<dict>
-			<key>config</key>
-			<dict>
-				<key>argumenttype</key>
-				<integer>0</integer>
-				<key>escaping</key>
-				<integer>36</integer>
-				<key>keyword</key>
-				<string>c</string>
-				<key>runningsubtext</key>
-				<string>Please wait while I fetch the newest exchange rates</string>
-				<key>script</key>
-				<string>// Type your default currency below. 
-// Must be in the official three-letter format
-// Eg. EUR, USD, GBP
-$default_currency = "DKK";
-
-// ======= DO NOT EDIT BELOW THIS LINE ======
-require_once('currency.php');
-$query = "{query}";
-echo getResult($query, $default_currency);</string>
-				<key>subtext</key>
-				<string>Easily convert between currencies</string>
-				<key>title</key>
-				<string>Currency Converter</string>
-				<key>type</key>
-				<integer>1</integer>
-				<key>withspace</key>
-				<true/>
-			</dict>
-			<key>type</key>
-			<string>alfred.workflow.input.scriptfilter</string>
-			<key>uid</key>
-			<string>63F60794-BB56-4415-9372-BAF974C3A7E1</string>
-			<key>version</key>
-			<integer>0</integer>
-		</dict>
-	</array>
-	<key>readme</key>
-	<string>Currency Converter is a workflow for Alfred App on Mac.
-
-The basic way to use the converter is to call Alfred with:
-30USD to EUR
-
-The default currency is DKK (can be changed) so the following will will convert from USD to DKK:
-30USD
-
-Another shorthand is:
-30$ to €
-
-And even shorter:
-30$ €</string>
-	<key>uidata</key>
-	<dict>
-		<key>63F60794-BB56-4415-9372-BAF974C3A7E1</key>
-		<dict>
-			<key>ypos</key>
-			<real>60</real>
-		</dict>
-	</dict>
-	<key>webaddress</key>
-	<string>konscript.com</string>
-</dict>
-</plist>

From c626628c7b164dab7cea6e93892c445d92fa5ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Zu=CC=88rn?= <martin@weltundall.de>
Date: Fri, 8 Feb 2019 18:02:23 +0100
Subject: [PATCH 2/2] Updated API endpoint

---
 Currency Converter.alfredworkflow | Bin 33451 -> 33672 bytes
 README.md                         |   7 +++---
 src/currency.php                  |  39 ++++++++++++++++++------------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Currency Converter.alfredworkflow b/Currency Converter.alfredworkflow
index 9b080a26c63448f8f2392dc0d7b8c6ee49d3b0db..caf0714fb17e69a3e03e352ab5719b511d188a6c 100644
GIT binary patch
delta 2846
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
OIqm^7=~USHhW-P#*zBSJ

delta 2536
zcmaKuc{tQ-8^?bbOOuGmzC>ghMzT$oXbzQqFt)~IUz#zT#t?P<LP}YN42r_oQp~9A
zN|Pl^Y9f_gB3Z)7@(R(R-uJEZp6fl=^Vjpo_r9O&xvuZ$`ovvkFNtLbZ7nz;LI42p
z07;lT$Boj_JhmJF(8dh_ynrO&MLKiFhu{^i9_$~CcGv-MsQPO-CF3-lNN0BfY>*W;
z0QjCxLk}f&n+ZLBX)kGp@)9ZIC>(_0<y`kV2Uh07R0|s4X7;wWKk4=IZSj_`(ETHA
zctOa(Jm=z}P0(T#@37p$yvbncw@zdk+}hjWnfsZjtYxM`?vkKUHYw(nn)_DGHd7md
z(;9btsEH1vb;vKusx9_H)0)_4EoqNDFsBp4A0^q*9soLiC6mpE&>!D^I}A7<*Pak8
z)<|O$C3|3@H=ewi;Xll0p|&Ggji#2=>V=Kd5Y{b5g4C94C$&NkPjK0YUUV<5x(kE8
zHaweibLK!f^P_oY6V-85jdPlPUJ<)+J}P%dE9ykec-JwcRkpFpelsEArz+LgPmUpq
zDDRq4aq$U)3Fzoy#p)QnH?9G;2OGR38zro~u3PM06;U^3S5t-Vy>lSJ<fIcKGxu$z
z_Tfg&@j-AjktAPN5J{=(9fxW?(UxvnTwDaK%Y4}|Zbtkg3zQ@{cy7-VRv8vDKXVl?
zQueYhweEw8VWz)UVMVsESVSZsF#`0ukoWC8EY6ky*|i_G@U$4WbkxM;#fj&<Vg!_U
zX?to}r(AUkU4K!6eRf1%_w013N!S6RR^KL87=-vV+X)e$l8$y|>ZpE>FpVTQsb9FP
zW_hUkTT<8n2LTsK9auePMIE}8KQG{HN{$?UuN)Q#(SGP|&(L+r92*IBBC%@j$(_>s
zJUcZ_FnC*FY#y()kXJFI?j?GOxf$vvD`tGvroxUa)2ULs=}&VeW5~UwW>S&rsInn-
z(BoPA?n)#gc<1wb$p&Wr-k&0hRXPh!)Thvgu-aC1?NjGw-Z2=6BIL@KP5#B0KtC&r
zK;TN=a?l3JWvwp|PdeBfLR&I^sG9$P^!|eYry7q{j8tCx$Sf}S$z0dC46o6{UVeH5
zkLm!EIAKI}MCZ4Av!|5|-w142)~wM1d1hsyiSbHfI@k#O*Nl~YwJcD>p0!b)f253I
zR5xU3d3h{Jp}s^*D~uR$a~-ea@`e<~U*1U9^>s~IvwxEp;)%nsWU#vCgXnjT&G2&q
zOH}LJTDyVbV?9Qe9-nwx*Gu~2GOp*07YMpK(;U;Lz>Qh7PnCLOb_6cG8>yPFM#AEH
z?q*p=RMzpxj1~3^imWf21PF?1Lcg&6Ea#Otc4Vp^WFLQY?>cJZ)PD<D?hlDKhm;aI
zkf|%yQvBtd8>nCESuSs*ybr`+?;H=e#uVE@06>Ws0H9mN4j}jjsR!c&h#}u=P2Q^X
zFS-BJy3lceFkrU(4?c#cifG)f>v?l`Jzb&*gjl^Q_YS2sq0%;L#jeT@SVsDlJorX-
zB$`psltmB0-{$g89z^*0`Z1pqR=~0DXEDbd*fK^RIH)<9UuaC{6N&G5)im?$Ywgl~
zzYtJ-h|iB<(>ij_pi|=yQH;$cTTQhR*1ELoTYsJCspSumT+JRXV_AZfbk}tm7_J_h
z;etn3jjQPJmfpE$q$1_E=f;T(5Atsb)}H8FX{46%Rg+$x?b*1B3X+DlBIm#m+LuHl
zE>~2kp}xaab~0X>hmIoA@CqFLmSacnPVPQV)uYl@<$JmW%%D*fil+CXd>RV4Xlv+_
zS94m=8*=+JB@$0}&%7ScCU!EWD<qmC7>4wZZDDRjLKfLoFfnpW)W_(j*^RTqqi<lj
z5q<`xiLOq*m3FgPiLT{=d|>9AOMP=%s>>+aTfC#be%Hh!Rh5Dc<y#La7+Xc#WfeD7
z5N3Rlm}pZcOEJ`S!=>`8z8n5{G7}j~3HOVne9_041~a^$9kJB+X>uGSm;cTqUNjzC
zIw;BEOst1^vq^W&UwC0SX#Ug(d%^KBtQSh2JS5yOj}U8Ll_`j$fs#7fL+M%>NgW~s
zOHz(EV_nx^oi$nStu9FHC9f0PDT`IE1@2O-`ZI`&;q;@oAEi&1d}=4TT<Yg1g^vZ~
zXqvH<7cO(&u=TlBk92~yNV(J>q@5O^+fHuOGjhYPNh~Te<&5jm7jtD4?iHhEqt(Ce
z^^D_-fIVn3?m(yHfTvTk)RM~_CxcJ#hmS_%m<I4Q`k5-*>B*kka#4ntl@d^~M>|7v
zazyOm1Z(F*bdUNE(v1+z>wgI@37U*#`pS%?)_Z$K<@%FNO!&I5*cu19Xykh$_aiy^
z>R?McWBZ~JE#llUrAGF1Q&Kg@B`tc!b;eV$LU~ivA_BJ)cvral{_0uOrO!=62!lZ~
z^L<9cYrXbf2EG?g{cUIAPI)d&5vWlYn>8Soa4c1fx230=(J<4~ZiulVwA@If&Yx@(
zj!bE6>0Uv&^_^N{y;M)wqY`c2_RTVTQ;ypot^l)r=V2^xvq*6wSm;%sDQYg8_ToC{
zV7#opma={Xn5Yz5gk#J4*x$rXXEB+hH<qF+M%$&oJRe5-3;Q1Zc0at;)L_mIQ9G#5
zySRE~rLKGvw0U%ks1*SBX5yI2BWxONVPc;|*V>s;>i)8v=Y2!_G<*xbB7}#EA`^@)
zc<yMAh29IhGWpPIkD_1Pr}>6rr{X=M3e#69lf?r(;Ni8U9oB)0qt+HD`w=n5ibj|z
z6kh1aLBVqi@Qmz|4^U0+=9Jn)36GN@=-sfwSIra2sb@d$*ZI1_0zG$f&!;$KUC%Xl
z3YeOoEV`@t;wt=1nLcwNe(>>}+^M<2vO0%@Wln|Diu~)B`vzDE@Q0^`Yx@~7wBMPM
z$2@jRLgi0%DZt`b?w^OwXWf$=uDm7@{_+d|PqgJGY@rQKlH*q$S^o>X+(}n>`TlAp
zsVh+m^4kvbKmK8B!NxAl@xx=jqw+|!xL*2}$ov!-f*;y}6X4k9=RbtMlQbn-97J0K
zK!8^eK|T22!ELnuL-6mA72UEb0N6q)P!L5A+M4zYa<?9`jokk~j}!RuEivLpehUGB
ju%I(IUwlv)@rQ_Q#kW7}Z*fkp?UkHcCvAIg)b{O9AEje?

diff --git a/README.md b/README.md
index a0c93ff..4b4f33a 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ And even shorter:
 
 > 30$ €
 
-All FX rates come from [fixer.io](http://fixer.io/).
+All exchange rates come from [exchangeratesapi.io](https://exchangeratesapi.io/).
 
 ## Usage
 
@@ -26,7 +26,7 @@ The alfred command is `c`, and hitting return will copy the converted currency v
 
 ## Installation
 
-[Download](https://github.com/remy/alfred-currency/raw/master/Currency%20Converter.alfredworkflow) and open the workflow file
+[Download](./Currency%20Converter.alfredworkflow) and open the workflow file.
 
 ## Requirements
 
@@ -37,5 +37,6 @@ You must installed:
 
 ## Author
 
-- [Remy sharp](https://remysharp.com)
+- Martin Zürn
+- [Remy sharp](https://remysharp.com) ([Repo](https://github.com/remy/alfred-currency))
 - Søren Louv-Jansen, [Konscript](http://www.konscript.com) ([original author](https://github.com/sqren/alfred-currency))
diff --git a/src/currency.php b/src/currency.php
index fdef0fe..cab64a5 100644
--- a/src/currency.php
+++ b/src/currency.php
@@ -6,33 +6,42 @@ function getRow($currency_from, $currency_to, $amount){
   global $wf;
 
   // build URL
-  $url = "http://api.fixer.io/latest?base=" . strtoupper($currency_from) . "&symbols=" . strtoupper($currency_to);
+  $url = "https://api.exchangeratesapi.io/latest?base=" . $currency_from . "&symbols=" . $currency_to;
 
   // get exchange rate
-  $data_json = file_get_contents($url);
+  $options = array('http' => array('ignore_errors' => TRUE));
+  $context  = stream_context_create($options);
+  $data_json = file_get_contents($url, false, $context);
   $data = json_decode($data_json);
 
-  // Error occurec. Probabl invalid currency
-  if(isset($data->err)){
-    $subtext = "Supported currencies are: DKK, EUR, USD, SEK, GBP, CHF, AUD, NOK";
-    $wf->result(time(), $data->err, "Invalid currency", $subtext, 'icon.png');
+  // print_r($data);
 
-  // No problems
-  }else{
-    // print_r($data);
+  if(!isset($data->error) && getHttpCode($http_response_header) == 200){
     $exchange_rate = $data->rates->$currency_to;
-
-    $clipboard = round($exchange_rate * $amount, 1);
-    $text = round($exchange_rate * $amount, 1) . " " . $currency_to;
+    $clipboard = number_format($exchange_rate * $amount, 2);
+    $text = $clipboard . " " . $currency_to;
     $sub_text = $currency_from . ' to ' . $currency_to;
-
     $wf->result(time(), $clipboard, $text, $sub_text, 'icon.png');
+  } else {
+    $subtext = $data->error . " Please check if currencies are valid.";
+    $wf->result(time(), $data->err, "Could not fetch data", trim($subtext), 'icon.png');
   }
 }
 
+function getHttpCode($http_response_header)
+{
+    if(is_array($http_response_header))
+    {
+        $parts=explode(' ',$http_response_header[0]);
+        if(count($parts)>1) //HTTP/1.0 <code> <text>
+            return intval($parts[1]); //Get code
+    }
+    return 0;
+}
+
 function getWaitingRow(){
   global $wf;
-  $wf->result(time(), "Waiting for input", "Waiting for input...", "Type in like: 50USD to EUR", 'icon.png');
+  $wf->result(time(), "Waiting for input", "Waiting for input...", "Type in like: 50 USD to EUR", 'icon.png');
 }
 
 function getResult($query, $default_currency){
@@ -79,4 +88,4 @@ function getResult($query, $default_currency){
   return $wf->toxml();
 }
 
-// echo getResult("40usd $");
+// echo getResult("41 GBP", "EUR");