KevinMidboe/bulk-downloader-for-reddit
1
0
Fork 0
mirror of https://github.com/KevinMidboe/bulk-downloader-for-reddit.git synced 2025-10-29 17:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved checkConflicts()

Browse Source
This commit is contained in:
Ali Parlakci
2018-08-09 09:26:01 +03:00
parent 94bc1c115f
commit 9338961b2b
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
script.py
View File

@@ -184,9 +184,10 @@ def checkConflicts():
else: else:
user = 1 user = 1
search = 1 if GLOBAL.arguments.search else 0
modes = [ modes = [
"saved","subreddit","submitted","search","log","link","upvoted", "saved","subreddit","submitted","log","link","upvoted","multireddit"
"multireddit"
] ]
values = { values = {
@@ -199,15 +200,18 @@ def checkConflicts():
if not sum(values[x] for x in values) == 1: if not sum(values[x] for x in values) == 1:
raise ProgramModeError("Invalid program mode") 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") 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") 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") 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: if values["upvoted"]+values["submitted"] == 1 and user == 0:
raise RedditorNameError("No redditor name given") raise RedditorNameError("No redditor name given")

2
src/searcher.py
View File

@@ -144,7 +144,7 @@ def getPosts(args):
} }
if "search" in 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") raise InvalidSortingType("Invalid sorting type has given")
if "subreddit" in args: if "subreddit" in args: