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

Proposed by cako
Status: Merged
Approved by: Vsevolod Velichko
Approved revision: 83
Merged at revision: 82
Proposed branch: lp:~goldencako/parcel-tracker/parcel-tracker
Merge into: lp:parcel-tracker
Diff against target: 98 lines (+47/-2)
4 files modified
data/glib-2.0/schemas/net.launchpad.parcel-tracker.gschema.xml (+5/-0)
data/ui/PreferencesParcelTrackerDialog.ui (+29/-0)
parcel_tracker/PreferencesParcelTrackerDialog.py (+1/-1)
parcel_tracker_lib/post_services.py (+12/-1)
To merge this branch: bzr merge lp:~goldencako/parcel-tracker/parcel-tracker
Reviewer Review Type Date Requested Status
Vsevolod Velichko Approve
Review via email: mp+120993@code.launchpad.net

Description of the change

Added Brazilian post service Correios.com.

To post a comment you must log in.
Revision history for this message
Vsevolod Velichko (torkvemada) wrote :

Thanks, merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/glib-2.0/schemas/net.launchpad.parcel-tracker.gschema.xml'
2--- data/glib-2.0/schemas/net.launchpad.parcel-tracker.gschema.xml 2012-07-10 22:16:05 +0000
3+++ data/glib-2.0/schemas/net.launchpad.parcel-tracker.gschema.xml 2012-08-23 13:37:57 +0000
4@@ -51,6 +51,11 @@
5 <summary>Enable Ukrposhta.com service</summary>
6 <description>Whether to use Ukrposhta.com for search</description>
7 </key>
8+ <key name="correios-com" type="b">
9+ <default>true</default>
10+ <summary>Enable Correios service</summary>
11+ <description>Whether to use Correios.com for search</description>
12+ </key>
13 <key name="update-period" type="i">
14 <default>300</default>
15 <summary>Service query period</summary>
16
17=== modified file 'data/ui/PreferencesParcelTrackerDialog.ui'
18--- data/ui/PreferencesParcelTrackerDialog.ui 2012-07-15 18:41:39 +0000
19+++ data/ui/PreferencesParcelTrackerDialog.ui 2012-08-23 13:37:57 +0000
20@@ -365,6 +365,35 @@
21 <property name="height">1</property>
22 </packing>
23 </child>
24+ <child>
25+ <object class="GtkLabel" id="correios_com_label">
26+ <property name="visible">True</property>
27+ <property name="can_focus">False</property>
28+ <property name="halign">start</property>
29+ <property name="hexpand">True</property>
30+ <property name="label" translatable="no">Correios</property>
31+ </object>
32+ <packing>
33+ <property name="left_attach">0</property>
34+ <property name="top_attach">10</property>
35+ <property name="width">1</property>
36+ <property name="height">1</property>
37+ </packing>
38+ </child>
39+ <child>
40+ <object class="GtkSwitch" id="correios_com">
41+ <property name="visible">True</property>
42+ <property name="can_focus">True</property>
43+ <property name="halign">end</property>
44+ <property name="use_action_appearance">False</property>
45+ </object>
46+ <packing>
47+ <property name="left_attach">1</property>
48+ <property name="top_attach">10</property>
49+ <property name="width">1</property>
50+ <property name="height">1</property>
51+ </packing>
52+ </child>
53 </object>
54 </child>
55 <child type="label">
56
57=== modified file 'parcel_tracker/PreferencesParcelTrackerDialog.py'
58--- parcel_tracker/PreferencesParcelTrackerDialog.py 2012-07-15 18:41:39 +0000
59+++ parcel_tracker/PreferencesParcelTrackerDialog.py 2012-08-23 13:37:57 +0000
60@@ -34,7 +34,7 @@
61 class PreferencesParcelTrackerDialog(PreferencesDialog):
62 __gtype_name__ = "PreferencesParcelTrackerDialog"
63
64- __searches__ = ["russianpost-ru", "emspost-ru", "posta-si", "postdanmark-dk", "swisspost-ch", "usps-com", "fedex-com", "dhl-de", "ukrposhta-com", "ups-com"]
65+ __searches__ = ["russianpost-ru", "emspost-ru", "posta-si", "postdanmark-dk", "swisspost-ch", "usps-com", "fedex-com", "dhl-de", "ukrposhta-com", "ups-com", "correios-com"]
66
67 def finish_initializing(self, builder): # pylint: disable=E1002
68 """Set up the preferences dialog"""
69
70=== modified file 'parcel_tracker_lib/post_services.py'
71--- parcel_tracker_lib/post_services.py 2012-07-15 18:41:39 +0000
72+++ parcel_tracker_lib/post_services.py 2012-08-23 13:37:57 +0000
73@@ -511,6 +511,16 @@
74 result.append((action, opdate, location))
75 return result
76
77+class CorreiosComService(TrackingService):
78+ """ Brazilian postal service Correios - www.correios.com """
79+
80+ url = 'http://websro.correios.com.br/sro_bin/txect01$.QueryList?P_LINGUA=001&P_TIPO=001&P_COD_UNI=%(number)s'
81+ def _parse_page(self, html):
82+ html = html.decode('utf-8', 'ignore')
83+ res = re.findall(r'<td rowspan=1>(.*?)</td><td>(.*?)</td><td><FONT COLOR=".*?">(.*?)</font></td>',
84+ html, re.DOTALL|re.IGNORECASE)
85+ return [ (op, parsedate(date, dayfirst=True), ' '.join(post.split())) for (date, post, op) in res]
86+
87 if __name__ == '__main__':
88 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(levelname)s - %(message)s")
89 import sys, codecs
90@@ -526,6 +536,7 @@
91 #service = UpsComService('1ZX799330362743967')
92 #service = UkrposhtaComService('RB041697087UA')
93 #service = DhlDeService('129921786448')
94- service = UpsComService('1Z882E910397601345')
95+ #service = UpsComService('1Z882E910397601345')
96+ service = CorreiosComService('RQ867951061BR')
97 for i in service.fetch():
98 print u'\t'.join([unicode(j) for j in i])

Subscribers

People subscribed via source and target branches