From 838360dd02fbd86c6dbc54cfaf04b80de8601e46 Mon Sep 17 00:00:00 2001 From: Matthieu Weber Date: Wed, 11 Feb 2015 08:05:59 +0200 Subject: [PATCH] Added module itella This module enables parceloob to track parcels sent with Itella, the finnish postal service. This version of the patch contains a favicon and replaces the previous patch with the same title. Signed-off-by: Matthieu Weber --- modules/itella/__init__.py | 24 ++++++++++++++ modules/itella/browser.py | 32 +++++++++++++++++++ modules/itella/favicon.png | Bin 0 -> 664 bytes modules/itella/module.py | 49 +++++++++++++++++++++++++++++ modules/itella/pages.py | 63 +++++++++++++++++++++++++++++++++++++ modules/itella/test.py | 29 +++++++++++++++++ 6 files changed, 197 insertions(+) create mode 100644 modules/itella/__init__.py create mode 100644 modules/itella/browser.py create mode 100644 modules/itella/favicon.png create mode 100644 modules/itella/module.py create mode 100644 modules/itella/pages.py create mode 100644 modules/itella/test.py diff --git a/modules/itella/__init__.py b/modules/itella/__init__.py new file mode 100644 index 00000000..1e0699d4 --- /dev/null +++ b/modules/itella/__init__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2015 Matthieu Weber +# +# This file is part of weboob. +# +# weboob is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# weboob is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with weboob. If not, see . + + +from .module import ItellaModule + + +__all__ = ['ItellaModule'] diff --git a/modules/itella/browser.py b/modules/itella/browser.py new file mode 100644 index 00000000..c1242a76 --- /dev/null +++ b/modules/itella/browser.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2015 Matthieu Weber +# +# This file is part of weboob. +# +# weboob is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# weboob is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with weboob. If not, see . + + +from weboob.browser import PagesBrowser, URL + +from .pages import SearchPage + + +class ItellaBrowser(PagesBrowser): + BASEURL = 'http://www.itella.fi' + + search_page = URL('/itemtracking/itella/search_by_shipment_id\?lang=en&ShipmentId=(?P.+)', SearchPage) + + def get_tracking_info(self, _id): + return self.search_page.go(id=_id).get_info(_id) diff --git a/modules/itella/favicon.png b/modules/itella/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..877faa72ddd27f1097f9e6ca9e758e0ec75c70d8 GIT binary patch literal 664 zcmV;J0%!e+P)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-yk3kCrWcvG;?0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbP5=lfsRA}Dq*uPIxQ4|O8@3$6zAYeod1gtn1A(1dxhbCa6 z24iAKbWogF{R3P{#DvwqfUP(HU2*V7BR?7$j7~%YMzpOViq(`t+la62VK8B;dF?B; z@4|WWdAawKd+#~tUdkkl{ycyJ6rcbFC}1B0yyb=86UQS-!9souRtmqrBOAlU2mE@2 zM1@2?oAM#}GhM&j9OBGcYcfpUS}# z1|MR!-9-O_9Pt^Ph1hr=S6)cnF@w`6o4Rmm%B)w}tgZKJRhk3P}A~>3m=x zx4G=bEhNV;;_55bHQ9&$d|iuHqUfX#9L3>QH2dMZi}u^4v=RWYI$aAuv2#KP=0t>< z6_c~j`%#0_sKi5Ddub{_HkR=AzNv*wHa}wS2CbBl0QvR|;a+CrRjb6+n|gK?i^GhL z1LZyb)fga!JQ8z=1`(T}Sk>=^Dw=B!g};xxYsl<8?#|On{>Ns{>80LTEz|pe0u-PC y1t>rP3Q&Lo6rg}zywFThS3m&@P=EsV6kr>-k)L`2P{7v!0000. + + +from weboob.tools.backend import Module +from weboob.capabilities.parcel import CapParcel + +from .browser import ItellaBrowser + + +__all__ = ['ItellaModule'] + + +class ItellaModule(Module, CapParcel): + NAME = 'itella' + DESCRIPTION = u'Itella website' + MAINTAINER = u'Matthieu Weber' + EMAIL = 'mweber+weboob@free.fr' + LICENSE = 'AGPLv3+' + VERSION = '1.1' + + BROWSER = ItellaBrowser + + def get_parcel_tracking(self, id): + """ + Get information abouut a parcel. + + :param id: ID of the parcel + :type id: :class:`str` + :rtype: :class:`Parcel` + :raises: :class:`ParcelNotFound` + """ + return self.browser.get_tracking_info(id) diff --git a/modules/itella/pages.py b/modules/itella/pages.py new file mode 100644 index 00000000..ad98d06e --- /dev/null +++ b/modules/itella/pages.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2015 Matthieu Weber +# +# This file is part of weboob. +# +# weboob is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# weboob is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with weboob. If not, see . + +from dateutil.parser import parse as parse_date + +from weboob.browser.pages import HTMLPage +from weboob.capabilities.parcel import Parcel, Event, ParcelNotFound + + +class SearchPage(HTMLPage): + def get_info(self, _id): + result_id = self.doc.xpath('//table[@id="shipment-details-table"]//tr[position()=1]/td[@id="td-bold"]') + if not result_id: + raise ParcelNotFound("No such ID: %s" % _id) + result_id = result_id[0].text + if result_id != _id: + raise ParcelNotFound("ID mismatch: expecting %s, got %s" % (_id, result_id)) + + p = Parcel(id) + events = self.doc.xpath('//div[@id="shipment-event-table-cell"]') + p.history = [self.build_event(i, div) for i, div in enumerate(events)] + most_recent = p.history[0] + p.status, p.info = self.guess_status(p.history) + p.info = most_recent.activity + return p + + def guess_status(self, events): + for event in events: + txt = event.activity + if txt == "Itella has received advance information of the item.": + return Parcel.STATUS_PLANNED, txt + elif txt == "Item in sorting." or txt == "Item has been registered.": + return Parcel.STATUS_IN_TRANSIT, txt + elif txt.startswith("Item ready for pick up") or \ + txt.startswith("A notice of arrival has been sent to the recipient"): + return Parcel.STATUS_ARRIVED, txt + else: + return Parcel.STATUS_UNKNOWN, events[0].activity + + def build_event(self, index, div): + event = Event(index) + event.activity = unicode(div.xpath('div[@class="shipment-event-table-header"]')[0].text) + event.date = parse_date(div.xpath('.//span[@class="shipment-event-table-label" and text()="Registration:"]/' + 'following-sibling::span')[0].text) + event.location = unicode(div.xpath('.//span[@class="shipment-event-table-label" and text()="Location:"]/' + 'following-sibling::span')[0].text) + return event diff --git a/modules/itella/test.py b/modules/itella/test.py new file mode 100644 index 00000000..ededc768 --- /dev/null +++ b/modules/itella/test.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2015 Matthieu Weber +# +# This file is part of weboob. +# +# weboob is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# weboob is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with weboob. If not, see . + + +from weboob.tools.test import BackendTest +from weboob.capabilities.parcel import ParcelNotFound + + +class ItellaTest(BackendTest): + MODULE = 'itella' + + def test_itella(self): + self.assertRaises(ParcelNotFound, self.backend.get_parcel_tracking, "foo")