From 86311f9952b800fb4371a73135d7f5752dadde5e Mon Sep 17 00:00:00 2001
From: Tilman Vatteroth <tilman.vatteroth@udo.edu>
Date: Wed, 20 Jun 2018 09:57:27 +0200
Subject: [PATCH] =?UTF-8?q?*=20benutze=20exakte=20tagesabst=C3=A4nde=20*?=
=?UTF-8?q?=20preview=20argument=20in=20daydiff=20umbenannt=20*=20fehlerme?=
=?UTF-8?q?ldung=20bei=20fehlenden=20events=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
program_info.py | 2 +-
telegram_bot.py | 14 +++++++++-----
twitter_bot.py | 14 +++++++++-----
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/program_info.py b/program_info.py
index e5862101..1598e4fd 100644
--- a/program_info.py
+++ b/program_info.py
@@ -122,7 +122,7 @@ class ProgramInfo:
elif now.time() <= d.time():
day_diff = diff.days
- if day_diff <= wanted_day_diff:
+ if day_diff == wanted_day_diff:
if just_print:
pprint(i)
else:
diff --git a/telegram_bot.py b/telegram_bot.py
index 0d7399a7..daaef059 100755
--- a/telegram_bot.py
+++ b/telegram_bot.py
@@ -24,12 +24,11 @@ aparser.add_argument(
help="Alternativer Telegramchat"
)
aparser.add_argument(
- "--preview",
+ "--daydiff",
dest='day_diff',
- action="store_const",
- const=2,
+ type=int,
default=1,
- help="Überprüfe die nächsten 2 Tage statt nur den nächsten Tag."
+ help="Prüfe ob in DAY_DIFF Tagen ein Event stattfindet anstatt morgen."
)
args = aparser.parse_args()
# Überschreibe den Telegramkanal, wenn einer angegeben wurde. (Praktisch für Debugging)
@@ -44,7 +43,12 @@ next_event = program_info.get_next_event(args.day_diff)
if next_event is None:
if not args.nofailmessage:
print("Telegram:")
- print("Kein Event in den nächsten " + str(args.day_diff) + " Tagen.")
+ if args.day_diff == '0':
+ print("Kein Event heute.")
+ elif args.day_diff == 1:
+ print("Kein Event morgen.")
+ else:
+ print("Kein Event in " + str(args.day_diff) + " Tagen.")
exit(1)
diff --git a/twitter_bot.py b/twitter_bot.py
index 059c46ab..24b2de4c 100755
--- a/twitter_bot.py
+++ b/twitter_bot.py
@@ -33,12 +33,11 @@ aparser.add_argument(
help="Schreibe DEST per mention an"
)
aparser.add_argument(
- "--preview",
+ "--daydiff",
dest='day_diff',
- action="store_const",
- const=2,
+ type=int,
default=1,
- help="Überprüfe die nächsten 2 Tage statt nur den nächsten Tag."
+ help="Prüfe ob in DAY_DIFF Tagen ein Event stattfindet anstatt morgen."
)
args = aparser.parse_args()
@@ -50,7 +49,12 @@ next_event = program_info.get_next_event(args.day_diff)
if next_event is None:
if not args.nofailmessage:
print("Twitter:")
- print("Kein Event in den nächsten " + str(args.day_diff) + " Tagen.")
+ if args.day_diff == 0:
+ print("Kein Event heute.")
+ elif args.day_diff == 1:
+ print("Kein Event morgen.")
+ else:
+ print("Kein Event in " + str(args.day_diff) + " Tagen.")
exit(1)
--
GitLab