Skip to content

Commit

Permalink
Update formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
lamasters committed Aug 17, 2020
1 parent eae93bb commit 07fae7c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
18 changes: 11 additions & 7 deletions defe/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,15 @@ def main():
sys.exit(1)

args = parser.parse_args()

hotkey_listener()
set_feed(args.feed, args.max_feed_count, False)


def set_feed(feed_arg, max_feed_count, refresh):
if feed_arg == "general":
data = feedcore.all_feed()
for item in data[: max_feed_count]:
for item in data[:max_feed_count]:
print(Fore.RED + Style.BRIGHT + str(data.index(item) + 1), end=". ")
defy(item["feed_src"], item["title"], item["link"])
if not refresh:
Expand All @@ -118,7 +119,7 @@ def set_feed(feed_arg, max_feed_count, refresh):
return data
if feed_arg == "news":
data = feedcore.news_feed()
for item in data[: max_feed_count]:
for item in data[:max_feed_count]:
print(Fore.RED + Style.BRIGHT + str(data.index(item) + 1), end=". ")
defy(item["feed_src"], item["title"], item["link"])
if not refresh:
Expand All @@ -127,7 +128,7 @@ def set_feed(feed_arg, max_feed_count, refresh):
return data
if feed_arg == "newsletters":
data = feedcore.newsletters_feeds()
for item in data[: max_feed_count]:
for item in data[:max_feed_count]:
print(Fore.RED + Style.BRIGHT + str(data.index(item) + 1), end=". ")
defy(item["feed_src"], item["title"], item["link"])
if not refresh:
Expand All @@ -136,7 +137,7 @@ def set_feed(feed_arg, max_feed_count, refresh):
return data
if feed_arg == "podcasts":
data = feedcore.podcasts_feeds()
for item in data[: max_feed_count]:
for item in data[:max_feed_count]:
print(Fore.RED + Style.BRIGHT + str(data.index(item) + 1), end=". ")
if item:
defy(item["feed_src"], item["title"], item["link"])
Expand Down Expand Up @@ -164,12 +165,15 @@ def set_feed(feed_arg, max_feed_count, refresh):
Style.BRIGHT + "Open a PR at https://github.com/Bhupesh-V/defe", end="\n\n",
)


def on_press():
controller = pynput.keyboard.Controller()
controller.type('REFRESH\n')
controller.type("REFRESH\n")


def hotkey_listener():
keyboard.add_hotkey('alt+r', on_press)
keyboard.add_hotkey("alt+r", on_press)


if __name__ == "__main__":
main()
8 changes: 5 additions & 3 deletions defe/formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import webbrowser
import sys


def defy(src, title, link):
init(autoreset=True)
print(Style.BRIGHT + src, end="\n")
Expand All @@ -26,16 +27,17 @@ def defy_prompt(feed, feed_type, max_feed_count):
input(Fore.GREEN + Style.BRIGHT + "Enter Feed Index to open : ")
)
print(Style.RESET_ALL)
if 'REFRESH' not in feed_to_open:
if "REFRESH" not in feed_to_open:
print(Style.BRIGHT + "Opening Link in your default browser ...")
webbrowser.open(feed[int(feed_to_open) - 1].link)
else:
print(chr(27) + "[2J") # clear the output
print(chr(27) + "[2J") # clear the output
feed = set_feed(feed_type, max_feed_count, True)
except ValueError:
print(Style.BRIGHT + "Enter Valid Index 😟")
except KeyboardInterrupt:
# Oh no!, come back again :(
sys.exit()

from defe.__main__ import set_feed

from defe.__main__ import set_feed

0 comments on commit 07fae7c

Please sign in to comment.