Merge lp:~jacobparker1992/slingshot/conversion-plugin into lp:~parnold-x/slingshot/conversion-plugin

[Jacob Parker]

I fixed your regex. It now works with Kelvin, and the regex expressions are much more lenient.

[lp:~jacobparker1992/slingshot/conversion-plugin]

438. By Jacob Parker on 2014-08-14

Those braces weren't meant to be there

[Djax (parnold-x)]

Hi, thanks! Was my first time with regex as you noticed :)
I commented inline. Do you know a solution?

[Djax (parnold-x)]

For now I do the replacement after the split but if you know a regex solution ...

=== modified file 'lib/synapse-plugins/conversion-plugin.vala'
--- lib/synapse-plugins/conversion-plugin.vala	2014-08-09 20:12:30 +0000
+++ lib/synapse-plugins/conversion-plugin.vala	2014-08-14 22:27:31 +0000
@@ -83,7 +83,7 @@
             match_regex = new Regex (@"(?<=\\D)\\s(?:$CONVERSION_WORD)\\s",
                          RegexCompileFlags.OPTIMIZE);
             // regex to match the temperature units
-            temp_regex = new Regex ("((?<=\\d)F\\s|°C|fahrenheit|celsius|(?<=\\d)R\\s|rankine|(?<=\\d)K\\s|reaumur)",
+            temp_regex = new Regex ("(?i)(?<=\\d)[FCKR]\\s|fahrenheit|celsius|kelvin|reaumur",
                          RegexCompileFlags.OPTIMIZE);
             digit_regex = new Regex ("\\d*",
                          RegexCompileFlags.OPTIMIZE);
@@ -106,25 +106,32 @@
     public bool handles_query (Query query) {
       return (QueryFlags.ACTIONS in query.query_type);
     }
+    
+    static bool regex_function (MatchInfo info, StringBuilder resource) {
+        string match = info.fetch (0).slice (0,1).up ();
+        resource.append ("temp" + match + " ");
+        
+        return false;
+    }
 
     public async ResultSet? search (Query query) throws SearchError {
       string input = query.query_string;
       bool matched = match_regex.match (input);
       if (matched) {
         try {
-            // replace some characters, more needed?
+            // replace some characters, more needed? - Author
+            // I not convinced any of these are tbh - Jacob
             input=input.replace ("²","^2").replace ("³","^3");
             // to support the conversion of temperatures see http://www.gnu.org/software/units/manual/units.html#Temperature-Conversions
             bool temparaturematch = temp_regex.match (input);
             if (temparaturematch)
-                input = temp_regex.replace (input,input.length,0,"""temp\g<0>""").replace("°C","C");
+                input = temp_regex.replace_eval (input,input.length,0,RegexMatchFlags.NOTBOL,(RegexEvalCallback) regex_function);
             string[] inputsplit = match_regex.split (input);
             if (temparaturematch) {
                 MatchInfo info;
                 digit_regex.match (inputsplit[0],0,out info);
                 string digit = info.fetch (0);
-                inputsplit[0] = inputsplit[0].replace (digit,"");
-                inputsplit[0] = inputsplit[0]+@"($digit)";
+                inputsplit[0] = inputsplit[0].replace (digit,"") + @"($digit)";
             }
     
             Pid pid;