Implemented a.gd service. url redirect expand now works with 302.

joshthecoder · joshthecoder · commit 4945454ff3ee · 2009-08-02T01:31:34.000-05:00
diff --git a/README b/README
@@ -18,6 +18,7 @@ Supported URL shortening services for shrinking long urls:
     cli.gs
     twurl.nl (tweetburner)
     digg.com
+    a.gd
 
 Shorty can expand any url service by getting the redirect
 location by requesting the tiny url.
diff --git a/TODO b/TODO
@@ -1,4 +1,3 @@
-+ a.gd
 + buk.me
 + burnurl.com
 + chilp.it
diff --git a/shorty.py b/shorty.py
@@ -83,11 +83,13 @@ def get_redirect(url):
     class StopRedirectHandler(HTTPRedirectHandler):
         def http_error_301(self, req, fp, code, smg, headers):
             return None
+        def http_error_302(self, req, fp, code, smg, headers):
+            return None
     o = build_opener(StopRedirectHandler())
     try:
         o.open(url)
     except HTTPError, e:
-        if e.code == 301:
+        if e.code == 301 or e.code == 302:
             return e.headers['Location']
         else:
             raise ShortyError(e)
@@ -359,6 +361,26 @@ def expand(self, tinyurl):
 
 digg = Digg()
 
+class Agd(Service):
+
+    def shrink(self, bigurl, tag=None, password=None, expires=None):
+        post_param = {'url': bigurl}
+        if tag:
+            post_param['tag'] = tag
+        if password:
+            post_param['pass'] = password
+        if expires:
+            post_param['validTill'] = expires
+        resp = request('http://a.gd/?module=ShortURL&file=Add&mode=API',
+                        post_data = urlencode(post_param))
+        url = resp.read()
+        if url.startswith('http://'):
+            return url
+        else:
+            raise ShortyError(url[url.find('>')+1:url.rfind('<')])
+
+agd = Agd()
+
 """Mapping of domain to service class"""
 services = {
     'sandbox': sandbox,
@@ -369,7 +391,8 @@ def expand(self, tinyurl):
     'is.gd': isgd,
     'cli.gs': cligs,
     'tweetburner': tweetburner, 'twurl.nl': tweetburner,
-    'digg.com': digg
+    'digg.com': digg,
+    'a.gd': agd
 }
 
 """

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-+ a.gd`
`2`	`1`	`+ buk.me`
`3`	`2`	`+ burnurl.com`
`4`	`3`	`+ chilp.it`