From 2f28b2548382d9aa3f4655f187fba2760701bfe0 Mon Sep 17 00:00:00 2001 From: Stig Otnes Kolstad Date: Thu, 19 Mar 2020 00:55:08 +0100 Subject: [PATCH 1/7] chore: sett versjonsnummer til 0.4.0 --- ruterstop/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruterstop/__init__.py b/ruterstop/__init__.py index b44d6be..eb757a8 100644 --- a/ruterstop/__init__.py +++ b/ruterstop/__init__.py @@ -20,7 +20,7 @@ from ruterstop.utils import delta, human_delta, norwegian_ascii, timed_cache -__version__ = "0.3.1" +__version__ = "0.4.0" ENTUR_CLIENT_ID = __version__ ENTUR_STOP_PLACE_ENDPOINT = "https://api.entur.io/stop-places/v1/graphql" From ed41551a14f3b1ba20ccd51b8d4bc344690006e4 Mon Sep 17 00:00:00 2001 From: Stig Otnes Kolstad Date: Tue, 16 Jun 2020 01:02:50 +0200 Subject: [PATCH 2/7] chore: litt linting --- ruterstop/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ruterstop/__init__.py b/ruterstop/__init__.py index eb757a8..a998094 100644 --- a/ruterstop/__init__.py +++ b/ruterstop/__init__.py @@ -145,10 +145,12 @@ def get_stop_search_result(*, name_search): def parse_stops(raw_dict): for stop in raw_dict["data"]["stopPlace"]: numid = stop["id"].rsplit(":", maxsplit=1).pop() - yield StopPlace(numid, - stop["name"]["value"], - stop["topographicPlace"]["name"]["value"], - stop["topographicPlace"]["parentTopographicPlace"]["name"]["value"]) + yield StopPlace( + numid, + stop["name"]["value"], + stop["topographicPlace"]["name"]["value"], + stop["topographicPlace"]["parentTopographicPlace"]["name"]["value"]) + def parse_departures(raw_dict, *, date_fmt="%Y-%m-%dT%H:%M:%S%z"): """ @@ -235,7 +237,7 @@ def format_departure_list(departures, *, min_eta=0, long_eta=-1, directions=None # Build string output newdeps = list() - for eta, deps in by_eta.items(): + for _, deps in by_eta.items(): # Print single departures normally if len(deps) == 1: newdeps.append(deps[0]) @@ -249,7 +251,7 @@ def format_departure_list(departures, *, min_eta=0, long_eta=-1, directions=None # Create pretty output s = "" for dep in deps: - if long_eta >= 0 and delta(dep.eta) > long_eta: + if 0 < long_eta < delta(dep.eta): s += dep.ts_str() + '\n' else: s += str(dep) + '\n' From ad481a845082b0fcdd9005f258b8f1fbed910a88 Mon Sep 17 00:00:00 2001 From: Stig Otnes Kolstad Date: Tue, 16 Jun 2020 01:08:54 +0200 Subject: [PATCH 3/7] feat: sett standardinnstilling for --long-eta til 59 minutter --- ruterstop/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ruterstop/__init__.py b/ruterstop/__init__.py index a998094..2336262 100644 --- a/ruterstop/__init__.py +++ b/ruterstop/__init__.py @@ -22,6 +22,11 @@ __version__ = "0.4.0" +# Default settings +DEFAULTS = dict( + long_eta=59 +) + ENTUR_CLIENT_ID = __version__ ENTUR_STOP_PLACE_ENDPOINT = "https://api.entur.io/stop-places/v1/graphql" ENTUR_STOP_PLACE_QUERY = """ @@ -206,7 +211,7 @@ def get_departures(*, stop_id=None): return parse_departures(raw_stop) -def format_departure_list(departures, *, min_eta=0, long_eta=-1, directions=None, grouped=False): +def format_departure_list(departures, *, min_eta=0, long_eta=DEFAULTS["long_eta"], directions=None, grouped=False): """ Filters, formats and groups departures based on arguments passed. """ @@ -271,7 +276,7 @@ def main(argv=sys.argv, *, stdout=sys.stdout): help="filter direction of departures") par.add_argument('--min-eta', type=int, default=0, metavar="", help="minimum ETA of departures to return") - par.add_argument('--long-eta', type=int, default=-1, metavar="", + par.add_argument('--long-eta', type=int, default=DEFAULTS["long_eta"], metavar="", help="show departure time when ETA is later than this limit" + "(disable with -1)") par.add_argument('--grouped', action="store_true", From 2f10e49a67d2766319a274978694323ecfbbacb2 Mon Sep 17 00:00:00 2001 From: Stig Otnes Kolstad Date: Tue, 16 Jun 2020 19:55:56 +0200 Subject: [PATCH 4/7] docs: dokumenter --long-eta --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 86294a8..3c06b23 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Et program som viser sanntidsinformasjon for stoppesteder i Oslo og Akershus. - Bruk filtre som `--direction`, `--grouped` og `--min-eta` - Start en HTTP server med `--server` - Søk etter stoppesteder med `--search-stop` +- Sett når du ønsker å se klokkeslett med `--long-eta` - Bruk `--help` for full hjelp Innspill, tanker og feilmeldinger mottas med glede! From cd5beb47b57e106e70f672c57f9189ebb5e9cc39 Mon Sep 17 00:00:00 2001 From: Stig Otnes Kolstad Date: Tue, 16 Jun 2020 19:56:12 +0200 Subject: [PATCH 5/7] docs: formatering i kommentar --- ruterstop/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruterstop/utils.py b/ruterstop/utils.py index 4852322..d128d00 100644 --- a/ruterstop/utils.py +++ b/ruterstop/utils.py @@ -43,7 +43,7 @@ def wrapper(*_args, **_kwargs): def delta(until=None, *, since=None): """ Return amount of whole minutes until `until` date occurs, since `since`. - Returns -1 if since is later than until. + Returns -1 if `since` is later than `until`. """ if not since: since = datetime.now() From d0c026944e231cdf8e08823f539a8b2d158e2808 Mon Sep 17 00:00:00 2001 From: Stig Otnes Kolstad Date: Tue, 16 Jun 2020 20:03:10 +0200 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20sett=20maks=20s=C3=B8keresultater?= =?UTF-8?q?=20for=20stopps=C3=B8k=20til=20250?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruterstop/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruterstop/__init__.py b/ruterstop/__init__.py index 2336262..62067fd 100644 --- a/ruterstop/__init__.py +++ b/ruterstop/__init__.py @@ -31,7 +31,7 @@ ENTUR_STOP_PLACE_ENDPOINT = "https://api.entur.io/stop-places/v1/graphql" ENTUR_STOP_PLACE_QUERY = """ { - stopPlace(size: 10, query: "%(stop_name)s") { + stopPlace(size: 250, query: "%(stop_name)s") { id topographicPlace { name { From 07b959bfe6339156c6ffb70d2947ae6331b27571 Mon Sep 17 00:00:00 2001 From: Stig Otnes Kolstad Date: Tue, 16 Jun 2020 20:09:12 +0200 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20legg=20til=20st=C3=B8tte=20for=20lon?= =?UTF-8?q?g=5Feta=20over=20HTTP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 19 +++++++++---------- ruterstop/__init__.py | 2 ++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3c06b23..479ad4f 100644 --- a/README.md +++ b/README.md @@ -76,17 +76,16 @@ $ ruterstop --server Stoppested og filtre velges i adressen til spørringen ``` -$ curl localhost:4000/6013?direction=outbound -25 Majorstuen naa -31 Snaroeya naa +$ curl localhost:4000/6013?direction=outbound&long_eta=10 31 Fornebu naa -31 Snaroeya 8 min -25 Majorstuen 16 min -31 Fornebu 18 min -31 Snaroeya 28 min -31 Fornebu 38 min -25 Majorstuen 46 min -31 Snaroeya 48 min +31 Snaroeya 5 min +31 Fornebu 8 min +31 Fornebu 10 min +25 Majorstuen 20:21 +31 Snaroeya 20:24 +31 Snaroeya 20:36 +25 Majorstuen 20:36 +31 Fornebu 20:42 ``` ## Utvikling diff --git a/ruterstop/__init__.py b/ruterstop/__init__.py index 62067fd..45bed52 100644 --- a/ruterstop/__init__.py +++ b/ruterstop/__init__.py @@ -195,6 +195,8 @@ def serve_departures(stop_id): kw["min_eta"] = int(q.min_eta) if q.grouped: kw["grouped"] = True + if q.long_eta: + kw["long_eta"] = int(q.long_eta) deps = get_departures(stop_id=stop_id) bottle.response.set_header("Content-Type", "text/plain")