Improved checkConflicts()
This commit is contained in:
parent
94bc1c115f
commit
9338961b2b
14
script.py
14
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")
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue