Merge lp:~chsn/parcel-tracker/parcel-tracker-fedex into lp:parcel-tracker

[Erik Christiansson]

=== modified file 'parcel_tracker_lib/postservices/fedexcom.py'
--- parcel_tracker_lib/postservices/fedexcom.py	2013-02-17 00:10:02 +0000
+++ parcel_tracker_lib/postservices/fedexcom.py	2013-06-24 09:38:27 +0000
@@ -4,7 +4,7 @@
 ### BEGIN LICENSE
 # Copyright © 2012 Vsevolod Velichko <[e-mail]>
 # Copyright © 2012 Carlos da Costa <[e-mail]>
-# Copyright © 2012 Erik Christiansson <[e-mail]>
+# Copyright © 2013 Erik Christiansson <[e-mail]>
 # This program is free software: you can redistribute it and/or modify it 
 # under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
@@ -24,31 +24,19 @@
 import json
 from dateutil.parser import parse as parsedate
 
-
 class FedexComService(TrackingService):
     """ FedEx """
 
     name = "Fedex"
-    url = 'http://www.fedex.com/Tracking'
-    post = 'clienttype=dotcom&track=y&ascend_header=1&cntry_code=us&cntry_code=ru&language=english&mi=n&tracknumbers=%(number)s&action=1&language=null&cntry_code=null&clienttype=null'
+    url = 'https://www.fedex.com/trackingCal/track'
+    post = 'data=%%7B%%22TrackPackagesRequest%%22%%3A%%7B%%22appType%%22%%3A%%22wtrk%%22%%2C%%22uniqueKey%%22%%3A%%22%%22%%2C%%22processingParameters%%22%%3A%%7B%%22anonymousTransaction%%22%%3Atrue%%2C%%22clientId%%22%%3A%%22WTRK%%22%%2C%%22returnDetailedErrors%%22%%3Atrue%%2C%%22returnLocalizedDateTime%%22%%3Afalse%%7D%%2C%%22trackingInfoList%%22%%3A%%5B%%7B%%22trackNumberInfo%%22%%3A%%7B%%22trackingNumber%%22%%3A%%22%(number)s%%22%%2C%%22trackingQualifier%%22%%3A%%22%%22%%2C%%22trackingCarrier%%22%%3A%%22%%22%%7D%%7D%%5D%%7D%%7D&action=trackpackages&locale=en_US&format=json&version=99'
 
     def _parse_page(self, html):
-        html = html.decode('utf-8', 'ignore')
-        res = re.search(r'var detailInfoObject\s*=\s*(\{.+\})', html)
-        if res is None:
-            return []
-        history = None
         try:
-            js = json.loads(res.group(1))
-            history = js['scans']
+            js = json.loads(html.replace('\\x', '\u00'))
+            if len(js['TrackPackagesResponse']['packageList'][0]['trackingQualifier']) > 0:
+                return [(e['status'], parsedate('%s %s' % (e['date'], e['time'])), e['scanLocation'])
+                        for e in js['TrackPackagesResponse']['packageList'][0]['scanEventList']]
         except:
-            return []
-        results = []
-        for op in history:
-            opdate = parsedate('%s, %s' % (op['scanDate'], op['scanTime']))
-            location = op['scanLocation'] if 'scanLocation' in op else ''
-            operation = op['scanStatus']
-            if 'scanComments' in op:
-                operation += '. ' + op['scanComments']
-            results.append((operation, opdate, location))
-        return results
+            pass
+        return []