Agregar soporte para intervalo de días
This commit is contained in:
parent
c8767f56a3
commit
5d750f57ee
|
@ -53,8 +53,8 @@ def _process_command_line_arguments():
|
|||
parser.add_argument('-d', '--dia', help=help,
|
||||
dest='day', default=0, type=int, choices=range(32))
|
||||
help = "Intervalo de días a partir de la fecha actual y hacia a atras"
|
||||
parser.add_argument('-id', '--intervalo-dias', help=help,
|
||||
dest='interval_days', default=0, type=int, choices=range(30))
|
||||
parser.add_argument('-ud', '--ultimos-dias', help=help,
|
||||
dest='last_days', default=0, type=int, choices=range(30))
|
||||
|
||||
help = 'Solicitar descarga'
|
||||
parser.add_argument('-sd', '--solicitar-descarga', help=help,
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
import getpass
|
||||
import uuid
|
||||
from calendar import monthrange
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timedelta
|
||||
from pathlib import Path
|
||||
from time import sleep
|
||||
|
||||
|
@ -134,9 +134,6 @@ def _validate_requests_args(args):
|
|||
log.error(msg)
|
||||
return False, {}
|
||||
|
||||
# ~ cer = data['path_cer'].read_bytes()
|
||||
# ~ key = data['path_enc'].read_bytes()
|
||||
# ~ cert = SATCertificate(cer, key)
|
||||
cert = _get_cert(data)
|
||||
|
||||
if not cert.is_valid_time:
|
||||
|
@ -150,14 +147,22 @@ def _validate_requests_args(args):
|
|||
data['month'] = args.month
|
||||
data['day'] = args.day
|
||||
|
||||
now = today()
|
||||
|
||||
if args.last_days:
|
||||
date_start = now.replace(hour=0, minute=0, second=0, microsecond=0) \
|
||||
- timedelta(days=args.last_days)
|
||||
date_end = now.replace(hour=23, minute=59, second=59, microsecond=0)
|
||||
data['date_start'] = date_start
|
||||
data['date_end'] = date_end
|
||||
return True, data
|
||||
|
||||
if data['day']:
|
||||
if not validate_date(data['year'], data['month'], data['day']):
|
||||
msg = 'Fecha inválida'
|
||||
log.error(msg)
|
||||
return False, {}
|
||||
|
||||
now = today()
|
||||
|
||||
month1 = month2 = data['month']
|
||||
if month1 == 0:
|
||||
month1 = 1
|
||||
|
|
Loading…
Reference in New Issue