Compare commits
2 Commits
e87075a809
...
ab61ff7e9b
Author | SHA1 | Date | |
---|---|---|---|
ab61ff7e9b | |||
3cb35909d1 |
@ -354,21 +354,23 @@ class Downloader:
|
|||||||
command, query = _[0], ":".join(_[1:])
|
command, query = _[0], ":".join(_[1:])
|
||||||
|
|
||||||
do_search = "s" in command
|
do_search = "s" in command
|
||||||
|
do_fetch = "f" in command
|
||||||
do_download = "d" in command
|
do_download = "d" in command
|
||||||
do_merge = "m" in command
|
do_merge = "m" in command
|
||||||
|
|
||||||
if do_search and do_download:
|
if do_search and (do_download or do_fetch or do_merge):
|
||||||
raise MKInvalidInputException(message="You can't search and download at the same time.")
|
raise MKInvalidInputException(message="You can't search and do another operation at the same time.")
|
||||||
|
|
||||||
if do_search and do_merge:
|
|
||||||
raise MKInvalidInputException(message="You can't search and merge at the same time.")
|
|
||||||
|
|
||||||
if do_search:
|
if do_search:
|
||||||
self.search(":".join(input_str.split(":")[1:]))
|
self.search(":".join(input_str.split(":")[1:]))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def get_selected_objects(q: str):
|
||||||
|
if q.strip().lower() == "all":
|
||||||
|
return list(self.current_results)
|
||||||
|
|
||||||
indices = []
|
indices = []
|
||||||
for possible_index in query.split(","):
|
for possible_index in q.split(","):
|
||||||
possible_index = possible_index.strip()
|
possible_index = possible_index.strip()
|
||||||
if possible_index == "":
|
if possible_index == "":
|
||||||
continue
|
continue
|
||||||
@ -384,7 +386,9 @@ class Downloader:
|
|||||||
|
|
||||||
indices.append(i)
|
indices.append(i)
|
||||||
|
|
||||||
selected_objects = [self.current_results[i] for i in indices]
|
return [self.current_results[i] for i in indices]
|
||||||
|
|
||||||
|
selected_objects = get_selected_objects(query)
|
||||||
|
|
||||||
if do_merge:
|
if do_merge:
|
||||||
old_selected_objects = selected_objects
|
old_selected_objects = selected_objects
|
||||||
@ -397,6 +401,13 @@ class Downloader:
|
|||||||
|
|
||||||
selected_objects = [a]
|
selected_objects = [a]
|
||||||
|
|
||||||
|
if do_fetch:
|
||||||
|
for data_object in selected_objects:
|
||||||
|
self.pages.fetch_details(data_object)
|
||||||
|
|
||||||
|
self.print_current_options()
|
||||||
|
return False
|
||||||
|
|
||||||
if do_download:
|
if do_download:
|
||||||
self.download(selected_objects)
|
self.download(selected_objects)
|
||||||
return False
|
return False
|
||||||
|
Loading…
Reference in New Issue
Block a user