diff options
Diffstat (limited to 'ppad')
-rwxr-xr-x | ppad/__init__.py | 52 | ||||
-rw-r--r-- | ppad/lib/__init__.py | 0 | ||||
-rw-r--r-- | ppad/lib/util.py | 45 |
3 files changed, 59 insertions, 38 deletions
diff --git a/ppad/__init__.py b/ppad/__init__.py index 1e19a80..5f87383 100755 --- a/ppad/__init__.py +++ b/ppad/__init__.py @@ -1,13 +1,13 @@ import sys import os import time -import datetime from concurrent import futures -import pytz -from dateutil import parser import requests import progressbar +from .lib.util import parse_date, parse_argv + + PAPERTRAIL_API_TOKEN = os.environ.get('PAPERTRAIL_API_TOKEN', None) ARCHIVES_URL = 'https://papertrailapp.com/api/v1/archives.json' DEFAULT_REMAIN_SIZE = 25 @@ -45,52 +45,28 @@ def do_download(url, filename, index): time.sleep(1) -def parse_span(): - if len(sys.argv) == 1: - return None, None - - f = t = None - fromstr = tostr = '' - span = sys.argv[1].split('~') - if len(span) == 1: - fromstr = tostr = span[0] - else: - [fromstr, tostr, *_] = span - - if fromstr: - f = parser.isoparse(fromstr) - if not f.tzname(): - utc = pytz.timezone('UTC') - f = utc.localize(f) - - if tostr: - t = parser.isoparse(tostr) - if not t.tzname(): - utc = pytz.timezone('UTC') - t = utc.localize(t) - - if tostr and fromstr == tostr: - t = t + datetime.timedelta(days=1) - - return f, t - - def main(): if not PAPERTRAIL_API_TOKEN: print('Not set the environment variable `PAPERTRAIL_API_TOKEN`', file=sys.stderr) sys.exit(1) - _from, to = parse_span() + date_from, date_to = parse_argv(sys.argv) print("fetching log archives information ...", end="\r", file=sys.stderr) r = requests.get(ARCHIVES_URL, headers=HEADERS) r.raise_for_status() - archives = [ar for ar in r.json() - if (not _from or _from <= parser.isoparse(ar["start"])) - and (not to or parser.isoparse(ar["end"]) < to) - ] + archives = [ + ar for ar in r.json() + if ( + # If `date_from` is None, + # then it gets archives without `date_from` limitation + ((not date_from) or date_from <= parse_date(ar["start"])) + # ... and `date_to` is as well. + and ((not date_to) or parse_date(ar["end"]) < date_to) + ) + ] with futures.ThreadPoolExecutor(max_workers=10) as executor: future_list = [] diff --git a/ppad/lib/__init__.py b/ppad/lib/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/ppad/lib/__init__.py diff --git a/ppad/lib/util.py b/ppad/lib/util.py new file mode 100644 index 0000000..0a97141 --- /dev/null +++ b/ppad/lib/util.py @@ -0,0 +1,45 @@ +import datetime +from dateutil import parser +import pytz +import time + + +def parse_date(date: str) -> datetime: + dt = parser.isoparse(date) + + if dt.tzinfo is not None: + return dt + + default_tz = pytz.timezone(time.tzname[time.daylight]) + return default_tz.localize(dt) + + +def parse_argv(argv: list[str]) -> tuple[datetime, datetime]: + if len(argv) == 1: + return None, None + + date_to: datetime = None + date_from: datetime = None + from_str: str + to_str: str + + span = argv[1].split('~') + if len(span) == 1: + from_str = to_str = span[0] + else: + [from_str, to_str, *_] = span + + if from_str: + date_from = parse_date(from_str) + + if to_str: + date_to = parse_date(to_str) + + if date_from is None and date_to is None: + # probably `argv` would be only character '~' + return None, None + + if date_from == date_to: + date_to = date_to + datetime.timedelta(days=1) + + return date_from, date_to |