Merge lp:~goldencako/parcel-tracker/parcel-tracker into lp:parcel-tracker

[cako]

I obtained a tracker code that had comments on the package status. I updated the code to include this information, that can be important sometimes. Also, added the correct encoding for the url.

[Vsevolod Velichko (torkvemada)]

Please, remove the .desktop file change from the diff.

review: Needs Fixing

[lp:~goldencako/parcel-tracker/parcel-tracker]

85. By Carlos da Costa <email address hidden> on 2012-08-25

Switched .desktop file to previous (correct) version

[cako (goldencako)]

Done! Sorry about that, I must have changed it trying to build it!

[Vsevolod Velichko (torkvemada)]

Ok, merging.

review: Approve

=== modified file 'parcel_tracker_lib/post_services.py'
--- parcel_tracker_lib/post_services.py	2012-08-23 13:27:43 +0000
+++ parcel_tracker_lib/post_services.py	2012-08-25 16:11:20 +0000
@@ -516,10 +516,19 @@
 
     url = 'http://websro.correios.com.br/sro_bin/txect01$.QueryList?P_LINGUA=001&P_TIPO=001&P_COD_UNI=%(number)s'
     def _parse_page(self, html):
-        html = html.decode('utf-8', 'ignore')
-        res = re.findall(r'<td rowspan=1>(.*?)</td><td>(.*?)</td><td><FONT COLOR=".*?">(.*?)</font></td>',
-                         html, re.DOTALL|re.IGNORECASE)
-        return [ (op, parsedate(date, dayfirst=True), ' '.join(post.split())) for (date, post, op) in res]
+        html = html.decode('ISO-8859-1', 'ignore')
+        res = re.findall(r'<tr><td rowspan=.*?>(.*?)</td><td>(.*?)</td><td><FONT COLOR=".*?">(.*?)</font></td></tr>(?:\s*?<tr><td colspan=2>(.*?)</td></tr>)?',
+                         html, re.DOTALL|re.IGNORECASE|re.UNICODE)
+        result = []
+        for (date, post, op, obs) in res:
+            resdate = parsedate(date, dayfirst=True)
+            respost = u' '.join(post.split())
+            if obs:
+                resop = u' '.join(op.split() + [u'-'] + obs.split())
+            else:
+                resop = u' '.join(op.split())
+            result.append((resop, resdate, respost))
+        return result
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(levelname)s - %(message)s")
@@ -537,6 +546,6 @@
     #service = UkrposhtaComService('RB041697087UA')
     #service = DhlDeService('129921786448')
     #service = UpsComService('1Z882E910397601345')
-    service = CorreiosComService('RQ867951061BR')
+    service = CorreiosComService('RD024810847SE')
     for i in service.fetch():
         print u'\t'.join([unicode(j) for j in i])

=== modified file 'po/parcel-tracker.pot'
--- po/parcel-tracker.pot	2012-07-13 18:31:55 +0000
+++ po/parcel-tracker.pot	2012-08-25 16:11:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-13 22:30+0400\n"
+"POT-Creation-Date: 2012-08-23 12:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"