From 2b6507ed3912b53e02c32f2a666ef32845b53fa3 Mon Sep 17 00:00:00 2001 From: 4ndreaSt4gi Date: Sat, 23 Jul 2011 18:14:36 +0200 Subject: [PATCH 1/3] Added qrcode service in bit.ly and goo.gl --- services/bitly.py | 4 ++++ services/google.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/services/bitly.py b/services/bitly.py index 247ed6c..64fa812 100644 --- a/services/bitly.py +++ b/services/bitly.py @@ -59,3 +59,7 @@ def expand(self, tinyurl): raise ShortyError(jdata['errorMessage']) return str(jdata['results'].values()[0]['longUrl']) + def qrcode(self, tinyurl): + qrdata = request(tinyurl + '.qrcode').read() + return qrdata + diff --git a/services/google.py b/services/google.py index 965a063..c87144e 100644 --- a/services/google.py +++ b/services/google.py @@ -14,3 +14,7 @@ def shrink(self, bigurl): else: return jdata['short_url'] + def qrcode(self, tinyurl): + qrdata = request(tinyurl + '.qr').read() + return qrdata + From 2aa187e36cbfbb469cbda2a0ed58f64f622c55b2 Mon Sep 17 00:00:00 2001 From: 4ndreaSt4gi Date: Sat, 23 Jul 2011 18:30:34 +0200 Subject: [PATCH 2/3] Added stats for bit.ly --- services/bitly.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/services/bitly.py b/services/bitly.py index 64fa812..88ce7da 100644 --- a/services/bitly.py +++ b/services/bitly.py @@ -59,6 +59,17 @@ def expand(self, tinyurl): raise ShortyError(jdata['errorMessage']) return str(jdata['results'].values()[0]['longUrl']) + def stats(self, tinyurl): + if not self.login: + return get_redirect(tinyurl) + parameters, username_pass = self._setup() + parameters['shortUrl'] = tinyurl + resp = request('http://api.bit.ly/v3/clicks', parameters, username_pass) + jdata = json.loads(resp.read()) + if jdata['status_code'] != 200: + raise ShortyError(jdata['errorMessage']) + return str(jdata['data']['clicks'][0]['global_clicks']) + def qrcode(self, tinyurl): qrdata = request(tinyurl + '.qrcode').read() return qrdata From 6129144ca88c72607e64cc5ba857267886609bb6 Mon Sep 17 00:00:00 2001 From: 4ndreaSt4gi Date: Sun, 24 Jul 2011 12:10:43 +0200 Subject: [PATCH 3/3] Complete stats for bit.ly with user and global click --- services/bitly.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/bitly.py b/services/bitly.py index 88ce7da..8233da8 100644 --- a/services/bitly.py +++ b/services/bitly.py @@ -68,7 +68,10 @@ def stats(self, tinyurl): jdata = json.loads(resp.read()) if jdata['status_code'] != 200: raise ShortyError(jdata['errorMessage']) - return str(jdata['data']['clicks'][0]['global_clicks']) + clicks = {} + clicks['user'] = jdata['data']['clicks'][0]['user_clicks'] + clicks['global'] = jdata['data']['clicks'][0]['global_clicks'] + return clicks def qrcode(self, tinyurl): qrdata = request(tinyurl + '.qrcode').read()