From 9338961b2b05128257b693ae5f8d150f34141cd0 Mon Sep 17 00:00:00 2001 From: Ali Parlakci Date: Thu, 9 Aug 2018 09:26:01 +0300 Subject: [PATCH] Improved checkConflicts() --- script.py | 14 +++++++++----- src/searcher.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/script.py b/script.py index 37d91ca..1e46d80 100644 --- a/script.py +++ b/script.py @@ -184,9 +184,10 @@ def checkConflicts(): else: user = 1 + search = 1 if GLOBAL.arguments.search else 0 + modes = [ - "saved","subreddit","submitted","search","log","link","upvoted", - "multireddit" + "saved","subreddit","submitted","log","link","upvoted","multireddit" ] values = { @@ -199,15 +200,18 @@ def checkConflicts(): if not sum(values[x] for x in values) == 1: raise ProgramModeError("Invalid program mode") - if values["search"]+values["saved"] == 2: + if search+values["saved"] == 2: raise SearchModeError("You cannot search in your saved posts") - if values["search"]+values["submitted"] == 2: + if search+values["submitted"] == 2: raise SearchModeError("You cannot search in submitted posts") - if values["search"]+values["upvoted"] == 2: + if search+values["upvoted"] == 2: raise SearchModeError("You cannot search in upvoted posts") + if search+values["log"] == 2: + raise SearchModeError("You cannot search in log files") + if values["upvoted"]+values["submitted"] == 1 and user == 0: raise RedditorNameError("No redditor name given") diff --git a/src/searcher.py b/src/searcher.py index 70821f8..3befafb 100644 --- a/src/searcher.py +++ b/src/searcher.py @@ -144,7 +144,7 @@ def getPosts(args): } if "search" in args: - if args["sort"] in ["hot","rising","controversial"]: + if GLOBAL.arguments.sort in ["hot","rising","controversial"]: raise InvalidSortingType("Invalid sorting type has given") if "subreddit" in args: