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

[Erik Christiansson]

[Vsevolod Velichko (torkvemada)]

You probably need to rename 'pattern' → 'number_validate_pattern' for it not to be too abstract.

review: Needs Fixing

Unmerged revisions

168. By Erik Christiansson on 2013-06-25

Unneeded import removed

167. By Erik Christiansson on 2013-06-25

Implement a (optional) regex for each service that checks if the tracking number is valid for this service to reduce the ammount of useless requests.

=== modified file 'parcel_tracker_lib/postservices/__init__.py'
--- parcel_tracker_lib/postservices/__init__.py	2013-03-25 11:37:47 +0000
+++ parcel_tracker_lib/postservices/__init__.py	2013-06-25 08:47:30 +0000
@@ -63,6 +63,7 @@
     logger = logging.getLogger('parcel_tracker_lib')
     name = 'Unknown Service'
     service_classes = {}
+    pattern = None
 
     class __metaclass__(type):
         def __new__(mcs, name, bases, dict):
@@ -168,6 +169,8 @@
 
     def fetch(self):
         try:
+            if self.pattern and not re.match(self.pattern, self.number.strip()):
+                return []
             page = self._get_page()
             updates = self._parse_page(page)
             return updates

=== modified file 'parcel_tracker_lib/postservices/fedexcom.py'
--- parcel_tracker_lib/postservices/fedexcom.py	2013-06-24 09:34:13 +0000
+++ parcel_tracker_lib/postservices/fedexcom.py	2013-06-25 08:47:30 +0000
@@ -30,6 +30,8 @@
     name = "Fedex"
     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'
+    # Numeric tracking code of length 12, 15, 20 or 22
+    pattern = r'^([0-9]{12}|[0-9]{15}|[0-9]{20}|[0-9]{22})$'
 
     def _parse_page(self, html):
         try:

=== modified file 'parcel_tracker_lib/postservices/postense.py'
--- parcel_tracker_lib/postservices/postense.py	2013-02-17 00:10:02 +0000
+++ parcel_tracker_lib/postservices/postense.py	2013-06-25 08:47:30 +0000
@@ -29,6 +29,8 @@
 
     name = 'Posten.se'
     url = 'http://www.posten.se/tracktrace/TrackConsignments_do.jsp?trackntraceAction=saveSearch&consignmentId=%(number)s&lang=GB'
+    # 11 digits + country code or two characters + 9 digits + country code
+    pattern = r'^([0-9]{2}|[a-zA-Z]{2})[0-9]{9}[a-zA-Z]{2}$'
 
     def _parse_page(self, html):
         html = html.decode('ISO-8859-1', 'ignore')

=== modified file 'parcel_tracker_lib/postservices/schenkernu.py'
--- parcel_tracker_lib/postservices/schenkernu.py	2013-02-17 00:10:02 +0000
+++ parcel_tracker_lib/postservices/schenkernu.py	2013-06-25 08:47:30 +0000
@@ -29,6 +29,7 @@
 
     name = "privpak.schenker.nu"
     url = 'http://privpakportal.schenker.nu/TrackAndTrace/packagesearch.aspx?packageid=%(number)s&referenceid='
+    pattern = r'^([0-9]{3}\s*){3}[0-9]$'
 
     def _parse_page(self, html):
         html = html.decode('utf-8', 'ignore')
@@ -53,6 +54,7 @@
 
     name = "was.schenker.nu"
     url = 'https://was.schenker.nu/ctts-a/com.dcs.servicebroker.http.HttpXSLTServlet?request.service=CTTSTYPEA&request.method=search&clientid=&language=sv&country=SE&reference_type=*DWB&reference_number=%(number)s'
+    pattern = r'^([0-9]{3}\s*){3}[0-9]$'
 
     def _parse_page(self, html):
         html = html.decode('utf-8', 'ignore')

=== modified file 'parcel_tracker_lib/postservices/upscom.py'
--- parcel_tracker_lib/postservices/upscom.py	2013-02-17 00:10:02 +0000
+++ parcel_tracker_lib/postservices/upscom.py	2013-06-25 08:47:30 +0000
@@ -31,6 +31,7 @@
     name = "UPS"
     url = 'http://wwwapps.ups.com/WebTracking/detail'
     post = 'loc=en_US&USER_HISTORY_LIST=&progressIsLoaded=N&refresh_sii=&showSpPkgProg1=true&datakey=line1&HIDDEN_FIELD_SESSION=%(session)s&multiship=true&descValue%(number)s=&trackNums=%(number)s'
+    pattern = r'^(1Z\s*([0-9]{3}\s*){2}[0-9]{2}\s*[0-9]{4}\s*[0-9]{3}\s*[0-9]|[T0-9][0-9]{3}\s*([0-9]{4}\s*){2}|[0-9]{4}\s*[0-9]{3}\s*[0-9]{2})$'
 
     def __extract_form_state(self):
         page = super(UpsComService, self)._fetch_url(