Merge branch 'master' into g+

klaut · Jun 9, 2012 · 6d1ef89 · 6d1ef89
2 parents fe1cc68 + a1fa19c
commit 6d1ef89
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 1 deletion.
diff --git a/lib/DDG/Spice/ExpandURL.pm b/lib/DDG/Spice/ExpandURL.pm
@@ -5,7 +5,8 @@ use DDG::Spice;
 
 spice to => 'http://api.longurl.org/v2/expand?url=$1&format=json&callback={{callback}}';
 
-triggers query => qr/^expand\s(.*)|^https?:\/\/((?:bit\.ly|j\.mp|awe\.sm|t\.co|g\.co|is\.gd|ow\.ly|is\.gd|wibi\.us|tinyurl\.com|0rz\.tw|1link\.in|1url\.com|2\.gp|2big\.at|2tu\.us|3\.ly|307\.to|4ms\.me|4sq\.com|4url\.cc|6url\.com|7\.ly|a\.gg|a\.nf|aa\.cx|abcurl\.net|ad\.vu|adf\.ly|adjix\.com|afx\.cc|all\.fuseurl\.com|alturl\.com|amzn\.to|ar\.gy|arst\.ch|atu\.ca|azc\.cc|b23\.ru|b2l\.me|bacn\.me|bcool\.bz|binged\.it|bit\.ly|bizj\.us|bloat\.me|bravo\.ly|bsa\.ly|budurl\.com|canurl\.com|chilp\.it|chzb\.gr|cl\.lk|cl\.ly|clck\.ru|cli\.gs|cliccami\.info|clickthru\.ca|clop\.in|conta\.cc|cort\.as|cot\.ag|crks\.me|ctvr\.us|cutt\.us|dai\.ly|decenturl\.com|dfl8\.me|digbig\.com|digg\.com|disq\.us|dld\.bz|dlvr\.it|do\.my|doiop\.com|dopen\.us|easyuri\.com|easyurl\.net|eepurl\.com|eweri\.com|fa\.by|fav\.me|fb\.me|fbshare\.me|ff\.im|fff\.to|fire\.to|firsturl\.de|firsturl\.net|flic\.kr|flq\.us|fly2\.ws|fon\.gs|freak\.to|fuseurl\.com|fuzzy\.to|fwd4\.me|fwib\.net|g\.ro\.lt|gizmo\.do|gl\.am|go\.9nl\.com|go\.ign\.com|go\.usa\.gov|goo\.gl|goshrink\.com|gurl\.es|hex\.io|hiderefer\.com|hmm\.ph|href\.in|hsblinks\.com|htxt\.it|huff\.to|hulu\.com|hurl\.me|hurl\.ws|icanhaz\.com|idek\.net|ilix\.in|is\.gd|its\.my|ix\.lt|j\.mp|jijr\.com|kl\.am|klck\.me|korta\.nu|krunchd\.com|l9k\.net|lat\.ms|liip\.to|liltext\.com|linkbee\.com|linkbun\.ch|liurl\.cn|ln-s\.net|ln-s\.ru|lnk\.gd|lnk\.ms|lnkd\.in|lnkurl\.com|lru\.jp|lt\.tl|lurl\.no|macte\.ch|mash\.to|merky\.de|migre\.me|miniurl\.com|minurl\.fr|mke\.me|moby\.to|moourl\.com|mrte\.ch|myloc\.me|myurl\.in|n\.pr|nbc\.co|nblo\.gs|nn\.nf|not\.my|notlong\.com|nsfw\.in|nutshellurl\.com|nxy\.in|nyti\.ms|o-x\.fr|oc1\.us|om\.ly|omf\.gd|omoikane\.net|on\.cnn\.com|on\.mktw\.net|onforb\.es|orz\.se|ow\.ly|ping\.fm|pli\.gs|pnt\.me|politi\.co|post\.ly|pp\.gg|profile\.to|ptiturl\.com|pub\.vitrue\.com|qlnk\.net|qte\.me|qu\.tc|qy\.fi|r\.im|rb6\.me|read\.bi|readthis\.ca|reallytinyurl\.com|redir\.ec|redirects\.ca|redirx\.com|retwt\.me|ri\.ms|rickroll\.it|riz\.gd|rt\.nu|ru\.ly|rubyurl\.com|rurl\.org|rww\.tw|s4c\.in|s7y\.us|safe\.mn|sameurl\.com|sdut\.us|shar\.es|shink\.de|shorl\.com|short\.ie|short\.to|shortlinks\.co\.uk|shorturl\.com|shout\.to|show\.my|shrinkify\.com|shrinkr\.com|shrt\.fr|shrt\.st|shrten\.com|shrunkin\.com|simurl\.com|slate\.me|smallr\.com|smsh\.me|smurl\.name|sn\.im|snipr\.com|snipurl\.com|snurl\.com|sp2\.ro|spedr\.com|srnk\.net|srs\.li|starturl\.com|su\.pr|surl\.co\.uk|surl\.hu|t\.cn|t\.co|t\.lh\.com|ta\.gd|tbd\.ly|tcrn\.ch|tgr\.me|tgr\.ph|tighturl\.com|tiniuri\.com|tiny\.cc|tiny\.ly|tiny\.pl|tinylink\.in|tinyuri\.ca|tinyurl\.com|tk\.|tl\.gd|tmi\.me|tnij\.org|tnw\.to|tny\.com|to\.|to\.ly|togoto\.us|totc\.us|toysr\.us|tpm\.ly|tr\.im|tra\.kz|trunc\.it|twhub\.com|twirl\.at|twitclicks\.com|twitterurl\.net|twitterurl\.org|twiturl\.de|twurl\.cc|twurl\.nl|u\.mavrev\.com|u\.nu|u76\.org|ub0\.cc|ulu\.lu|updating\.me|ur1\.ca|url\.az|url\.co\.uk|url\.ie|url360\.me|url4\.eu|urlborg\.com|urlbrief\.com|urlcover\.com|urlcut\.com|urlenco\.de|urli\.nl|urls\.im|urlshorteningservicefortwitter\.com|urlx\.ie|urlzen\.com|usat\.ly|use\.my|vb\.ly|vgn\.am|vl\.am|vm\.lc|w55\.de|wapo\.st|wapurl\.co\.uk|wipi\.es|wp\.me|x\.vu|xr\.com|xrl\.in|xrl\.us|xurl\.es|xurl\.jp|y\.ahoo\.it|yatuc\.com|ye\.pe|yep\.it|yfrog\.com|yhoo\.it|yiyd\.com|youtu\.be|yuarel\.com|z0p\.de|zi\.ma|zi\.mu|zipmyurl\.com|zud\.me|zurl\.ws|zz\.gd|zzang\.kr)\/.*)/;
+triggers query => qr/^expand\s(.*)|^https?:\/\/((?=[0123467abcdefghijklmnopqrstuvwxyz])(?:1(?:link\.in|url\.com)|2(?:\.gp|big\.at|tu\.us)|3(?:\.ly|07\.to)|4(?:ms\.me|sq\.com|url\.cc)|a(?:\.(?:gg|nf)|d(?:\.vu|f\.ly|jix\.com)|l(?:l\.fuse|t)url\.com|r(?:\.gy|st\.ch)|a\.cx|bcurl\.net|(?:fx|zc)\.cc|mzn\.to|tu\.ca)|b(?:2(?:3\.ru|l\.me)|i(?:nged\.it|t\.ly|zj\.us)|(?:acn|loat)\.me|cool\.bz|(?:ravo|sa)\.ly|udurl\.com)|c(?:h(?:ilp\.it|zb\.gr)|l(?:\.l[ky]|i(?:c(?:cami\.info|kthru\.ca)|\.gs)|ck\.ru|op\.in)|o(?:nta\.cc|rt\.as|t\.ag)|anurl\.com|rks\.me|(?:tvr|utt)\.us)|d(?:i(?:g(?:bi)?g\.com|sq\.us)|l(?:d\.bz|vr\.it)|o(?:\.my|iop\.com|pen\.us)|ai\.ly|ecenturl\.com|fl8\.me)|e(?:asyur(?:i\.com|l\.net)|(?:epurl|weri)\.com)|f(?:a(?:\.by|v\.me)|b(?:share)?\.me|f(?:\.im|f\.to)|ir(?:sturl\.(?:de|net)|e\.to)|l(?:ic\.kr|(?:q\.u|y2\.w)s)|u(?:seurl\.com|zzy\.to)|w(?:d4\.me|ib\.net)|on\.gs|reak\.to)|g(?:o(?:\.(?:(?:9nl|ign)\.com|usa\.gov)|o\.gl|shrink\.com)|\.ro\.lt|izmo\.do|l\.am|url\.es)|h(?:u(?:rl\.(?:me|ws)|ff\.to|lu\.com)|ex\.io|(?:iderefer|sblinks)\.com|mm\.ph|ref\.in|txt\.it)|i(?:canhaz\.com|(?:dek\.ne|x\.l)t|lix\.in|s\.gd|ts\.my)|j(?:\.mp|ijr\.com)|k(?:l(?:\.am|ck\.me)|orta\.nu|runchd\.com)|l(?:i(?:nkb(?:ee\.com|un\.ch)|ip\.to|ltext\.com|url\.cn)|n(?:\-s\.(?:net|ru)|k(?:\.(?:gd|ms)|d\.in|url\.com))|9k\.net|at\.ms|ru\.jp|t\.tl|url\.no)|m(?:a(?:cte\.ch|sh\.to)|i(?:n(?:iurl\.com|url\.fr)|gre\.me)|o(?:by\.to|ourl\.com)|y(?:loc\.me|url\.in)|(?:erky\.d|ke\.m)e|rte\.ch)|n(?:b(?:c\.co|lo\.gs)|ot(?:\.my|long\.com)|\.pr|n\.nf|(?:sfw|xy)\.in|utshellurl\.com|yti\.ms)|o(?:m(?:\.ly|f\.gd|oikane\.net)|n(?:\.(?:cnn\.com|mktw\.net)|forb\.es)|\-x\.fr|c1\.us|rz\.se|w\.ly)|p(?:o(?:liti\.co|st\.ly)|(?:ing\.f|(?:titurl|ub\.vitrue)\.co)m|li\.gs|nt\.me|p\.gg|rofile\.to)|q(?:lnk\.net|te\.me|u\.tc|y\.fi)|r(?:e(?:a(?:d(?:\.bi|this\.ca)|llytinyurl\.com)|dir(?:\.ec|ects\.ca|x\.com)|twt\.me)|i(?:\.ms|ckroll\.it|z\.gd)|u(?:\.ly|byurl\.com|rl\.org)|\.im|b6\.me|t\.nu|ww\.tw)|s(?:a(?:fe\.mn|meurl\.com)|h(?:o(?:r(?:t(?:\.(?:ie|to)|links\.co\.uk|url\.com)|l\.com)|ut\.to|w\.my)|r(?:ink(?:ify|r)\.com|t(?:\.(?:fr|st)|en\.com)|unkin\.com)|ar\.es|ink\.de)|m(?:allr\.com|(?:sh\.|url\.na)me)|n(?:ip(?:r|url)\.com|(?:\.i|url\.co)m)|p(?:2\.ro|edr\.com)|r(?:nk\.net|s\.li)|u(?:rl\.(?:co\.uk|hu)|\.pr)|4c\.in|(?:7y|dut)\.us|(?:im|tart)url\.com|late\.me)|t(?:\.(?:c[no]|lh\.com)|gr\.(?:me|ph)|i(?:n(?:y(?:\.(?:cc|ly|pl)|ur(?:i\.ca|l\.com)|link\.in)|iuri\.com)|ghturl\.com)|n(?:ij\.org|w\.to|y\.com)|o(?:\.(?:ly)?|(?:goto|tc|ysr)\.us)|r(?:\.im|a\.kz|unc\.it)|w(?:i(?:t(?:terurl\.(?:net|org)|clicks\.com|url\.de)|rl\.at)|url\.(?:cc|nl)|hub\.com)|[al]\.gd|(?:bd|pm)\.ly|crn\.ch|k\.|mi\.me)|u(?:\.(?:mavrev\.com|nu)|r(?:l(?:\.(?:az|co\.uk|ie)|b(?:org|rief)\.com|c(?:over|ut)\.com|s(?:\.i|horteningservicefortwitter\.co)m|(?:360\.m|enco\.d|x\.i)e|4\.eu|i\.nl|zen\.com)|1\.ca)|s(?:at\.l|e\.m)y|76\.org|b0\.cc|lu\.lu|pdating\.me)|v(?:b\.ly|(?:gn|l)\.am|m\.lc)|w(?:ap(?:o\.st|url\.co\.uk)|(?:55\.d|p\.m)e|ipi\.es)|x(?:r(?:l\.(?:in|us)|\.com)|url\.(?:es|jp)|\.vu)|y(?:e(?:\.pe|p\.it)|(?:\.a)?hoo\.it|(?:atuc|frog|iyd|uarel)\.com|outu\.be)|z(?:i(?:\.m[au]|pmyurl\.com)|u(?:d\.me|rl\.ws)|z(?:\.gd|ang\.kr\
+)|0p\.de)|0rz\.tw|6url\.com|7\.ly)\/.*)/;
 
 handle matches => sub {
     if ($2) {

diff --git a/lib/DDG/Spice/Imdb.pm b/lib/DDG/Spice/Imdb.pm
@@ -0,0 +1,15 @@
+package DDG::Spice::Imdb;
+# ABSTRACT: Give a summary of the movie from its IMDB page.
+
+use DDG::Spice;
+
+triggers startend => "imdb";
+
+spice to => 'http://www.imdbapi.com/?t=$1&callback={{callback}}';
+
+handle remainder => sub {
+    return $_ if $_;
+    return;
+};
+
+1;
diff --git a/share/spice/imdb/spice.js b/share/spice/imdb/spice.js
@@ -0,0 +1,32 @@
+function ddg_spice_imdb(movie) {
+
+    // Validity check
+    if (movie['Response'] == 'True') {
+        items = new Array();
+        items[0] = new Array();
+
+        // Main content and title
+        items[0]['a'] = get_snippet(movie);
+        items[0]['h'] = movie['Title'];
+
+        // Source name and url of the imdb page
+        items[0]['s'] = 'IMDB';
+        items[0]['u'] = 'http://www.imdb.com/title/' + movie['imdbID'];
+
+        // Render
+        nra(items);
+    } 
+}    
+
+function get_snippet(movie) {
+    var snippet, div;
+
+    snippet = d.createElement('span');
+    div = d.createElement('div');
+    div.innerHTML = movie['Title'] + " is a " + movie['Year'] + " movie, ";
+    div.innerHTML += "rated " + movie['imdbRating'] + ", ";
+    div.innerHTML += "starring " + movie['Actors'] + "."; 
+    snippet.appendChild(div);
+
+    return snippet;
+}