[suivi] Code cleanup
This commit is contained in:
Max
parent
497263eaf7
commit
3cb9a54cee
|
|
@ -1,6 +1,7 @@
|
|||
import urllib.request
|
||||
import urllib.parse
|
||||
from bs4 import BeautifulSoup
|
||||
import re
|
||||
|
||||
from nemubot.hooks import hook
|
||||
from nemubot.exception import IRCException
|
||||
|
|
@ -11,20 +12,25 @@ nemubotversion = 4.0
|
|||
|
||||
# POSTAGE SERVICE PARSERS ############################################
|
||||
|
||||
|
||||
def get_colissimo_info(colissimo_id):
|
||||
colissimo_data = getURLContent("http://www.colissimo.fr/portail_colissimo/suivre.do?colispart=%s" % colissimo_id)
|
||||
colissimo_data = getURLContent("http://www.colissimo.fr/portail_colissimo/"
|
||||
"suivre.do?colispart=%s" % colissimo_id)
|
||||
soup = BeautifulSoup(colissimo_data)
|
||||
|
||||
dataArray = soup.find(class_='dataArray')
|
||||
if dataArray and dataArray.tbody and dataArray.tbody.tr:
|
||||
date = dataArray.tbody.tr.find(headers="Date").get_text()
|
||||
libelle = dataArray.tbody.tr.find(headers="Libelle").get_text().replace('\n', '').replace('\t', '').replace('\r', '')
|
||||
libelle = re.sub(r'[\n\t\r]', '',
|
||||
dataArray.tbody.tr.find(headers="Libelle").get_text())
|
||||
site = dataArray.tbody.tr.find(headers="site").get_text().strip()
|
||||
return (date, libelle, site.strip())
|
||||
|
||||
|
||||
def get_chronopost_info(track_id):
|
||||
data = urllib.parse.urlencode({'listeNumeros': track_id})
|
||||
track_baseurl = "http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?lang=fr_FR"
|
||||
track_baseurl = "http://www.chronopost.fr/expedier/" \
|
||||
"inputLTNumbersNoJahia.do?lang=fr_FR"
|
||||
track_data = urllib.request.urlopen(track_baseurl, data.encode('utf-8'))
|
||||
soup = BeautifulSoup(track_data)
|
||||
|
||||
|
|
@ -38,22 +44,28 @@ def get_chronopost_info(track_id):
|
|||
libelle = info[1]
|
||||
return (date, libelle)
|
||||
|
||||
|
||||
def get_colisprive_info(track_id):
|
||||
data = urllib.parse.urlencode({'numColis': track_id})
|
||||
track_baseurl = "https://www.colisprive.com/moncolis/pages/detailColis.aspx"
|
||||
track_baseurl = "https://www.colisprive.com/moncolis/pages/" \
|
||||
"detailColis.aspx"
|
||||
track_data = urllib.request.urlopen(track_baseurl, data.encode('utf-8'))
|
||||
soup = BeautifulSoup(track_data)
|
||||
|
||||
dataArray = soup.find(class_='BandeauInfoColis')
|
||||
if dataArray and dataArray.find(class_='divStatut') and dataArray.find(class_='divStatut').find(class_='tdText'):
|
||||
status = dataArray.find(class_='divStatut').find(class_='tdText').get_text()
|
||||
if (dataArray and dataArray.find(class_='divStatut')
|
||||
and dataArray.find(class_='divStatut').find(class_='tdText')):
|
||||
status = dataArray.find(class_='divStatut') \
|
||||
.find(class_='tdText').get_text()
|
||||
return status
|
||||
|
||||
|
||||
def get_laposte_info(laposte_id):
|
||||
data = urllib.parse.urlencode({'id': laposte_id})
|
||||
laposte_baseurl = "http://www.part.csuivi.courrier.laposte.fr/suivi/index"
|
||||
|
||||
laposte_data = urllib.request.urlopen(laposte_baseurl, data.encode('utf-8'))
|
||||
laposte_data = urllib.request.urlopen(laposte_baseurl,
|
||||
data.encode('utf-8'))
|
||||
soup = BeautifulSoup(laposte_data)
|
||||
search_res = soup.find(class_='resultat_rech_simple_table').tbody.tr
|
||||
if (soup.find(class_='resultat_rech_simple_table').thead
|
||||
|
|
@ -74,28 +86,39 @@ def get_laposte_info(laposte_id):
|
|||
field = field.find_next('td')
|
||||
poste_status = field.get_text()
|
||||
|
||||
return (poste_type.lower(), poste_id.strip(), poste_status.lower(), poste_location, poste_date)
|
||||
return (poste_type.lower(), poste_id.strip(), poste_status.lower(),
|
||||
poste_location, poste_date)
|
||||
|
||||
|
||||
# TRACKING HANDLERS ###################################################
|
||||
|
||||
|
||||
def handle_laposte(tracknum):
|
||||
info = get_laposte_info(tracknum)
|
||||
if info:
|
||||
poste_type, poste_id, poste_status, poste_location, poste_date = info
|
||||
return ("Le courrier de type \x02%s\x0F : \x02%s\x0F est actuellement \x02%s\x0F dans la zone \x02%s\x0F (Mis à jour le \x02%s\x0F)." % (poste_type, poste_id, poste_status, poste_location, poste_date))
|
||||
return ("Le courrier de type \x02%s\x0F : \x02%s\x0F est actuellement "
|
||||
"\x02%s\x0F dans la zone \x02%s\x0F (Mis à jour le \x02%s\x0F"
|
||||
")." % (poste_type, poste_id, poste_status,
|
||||
poste_location, poste_date))
|
||||
|
||||
|
||||
def handle_colissimo(tracknum):
|
||||
info = get_colissimo_info(tracknum)
|
||||
if info:
|
||||
date, libelle, site = info
|
||||
return ("Colissimo: \x02%s\x0F : \x02%s\x0F Dernière mise à jour le \x02%s\x0F au site \x02%s\x0F." % (tracknum, libelle, date, site))
|
||||
return ("Colissimo: \x02%s\x0F : \x02%s\x0F Dernière mise à jour le "
|
||||
"\x02%s\x0F au site \x02%s\x0F."
|
||||
% (tracknum, libelle, date, site))
|
||||
|
||||
|
||||
def handle_chronopost(tracknum):
|
||||
info = get_chronopost_info(tracknum)
|
||||
if info:
|
||||
date, libelle = info
|
||||
return ("Colis Chronopost: \x02%s\x0F : \x02%s\x0F. Dernière mise à jour \x02%s\x0F." % (tracknum, libelle, date))
|
||||
return ("Colis Chronopost: \x02%s\x0F : \x02%s\x0F. Dernière mise à "
|
||||
"jour \x02%s\x0F." % (tracknum, libelle, date))
|
||||
|
||||
|
||||
def handle_coliprive(tracknum):
|
||||
info = get_colisprive_info(tracknum)
|
||||
|
|
@ -109,11 +132,15 @@ TRACKING_HANDLERS = {
|
|||
'coliprive': handle_coliprive
|
||||
}
|
||||
|
||||
|
||||
# HOOKS ##############################################################
|
||||
|
||||
|
||||
@hook("cmd_hook", "track",
|
||||
help="Track postage",
|
||||
help_usage={"[@tracker] TRACKING_ID [TRACKING_ID ...]": "Track the specified postage IDs using the specified tracking service or all of them."})
|
||||
help="Track postage",
|
||||
help_usage={"[@tracker] TRACKING_ID [TRACKING_ID ...]": "Track the "
|
||||
"specified postage IDs using the specified tracking service "
|
||||
"or all of them."})
|
||||
def get_tracking_info(msg):
|
||||
if not len(msg.args):
|
||||
raise IRCException("Renseignez un identifiant d'envoi.")
|
||||
|
|
@ -126,16 +153,22 @@ def get_tracking_info(msg):
|
|||
msg.kwargs['tracker']: TRACKING_HANDLERS[msg.kwargs['tracker']]
|
||||
}
|
||||
else:
|
||||
raise IRCException("No tracker named \x02{tracker}\x0F, please use one of the following: \x02{trackers}\x0F".format(tracker=msg.kwargs['tracker'], trackers=', '.join(TRACKING_HANDLERS.keys())))
|
||||
raise IRCException("No tracker named \x02{tracker}\x0F, please use"
|
||||
" one of the following: \x02{trackers}\x0F"
|
||||
.format(tracker=msg.kwargs['tracker'],
|
||||
trackers=', '
|
||||
.join(TRACKING_HANDLERS.keys())))
|
||||
else:
|
||||
trackers = TRACKING_HANDLERS
|
||||
|
||||
for tracknum in msg.args:
|
||||
for name,tracker in trackers.items():
|
||||
for name, tracker in trackers.items():
|
||||
ret = tracker(tracknum)
|
||||
if ret:
|
||||
res.append_message(ret)
|
||||
break
|
||||
if not ret:
|
||||
res.append_message("L'identifiant \x02{id}\x0F semble incorrect, merci de vérifier son exactitude.".format(id=tracknum))
|
||||
res.append_message("L'identifiant \x02{id}\x0F semble incorrect,"
|
||||
" merci de vérifier son exactitude."
|
||||
.format(id=tracknum))
|
||||
return res
|
||||
|
|
|
|||
Loading…
Reference in New Issue