VikingKong
/
Inomnibus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement displaying and rendering article texts.

Browse Source
master
VikingKong 3 years ago
parent a0dd71637f
commit dae29f9fd6
3 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
API.py
Unescape View File

@ -22,7 +22,7 @@ class Fetcher:
self.feeds = response.json()["subscriptions"] self.feeds = response.json()["subscriptions"]
def feedsFromCategory(self, category): def feedsFromCategory(self, category):
return [item for item in self.feeds if item["categories"][0]["id"] == category] return [item for item in self.feeds if item["categories"][0]["id"] == category and self.unreadCounts[item["id"]][0] != 0]
def articlesFromCategory(self, category, number): def articlesFromCategory(self, category, number):
if category not in self.articles: if category not in self.articles:

73
App.py
Unescape View File

@ -2,6 +2,7 @@ import urwid
import yaml import yaml
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
from API import Fetcher from API import Fetcher
from Render import Article
class LeftPane(urwid.ListBox): class LeftPane(urwid.ListBox):
@ -14,6 +15,9 @@ class LeftPane(urwid.ListBox):
self.categoryPosition = 0 self.categoryPosition = 0
self.isCategoryView = True self.isCategoryView = True
self.currentCategory = "" self.currentCategory = ""
focus_widget, idx = self.get_focus()
if self.isCategoryView:
self.currentCategory = focus_widget.attr_map[None][0]
def getArticlesFromCategory(self, category, number): def getArticlesFromCategory(self, category, number):
tui.fetcher.articlesFromCategory(category[13:], str(number)) tui.fetcher.articlesFromCategory(category[13:], str(number))
@ -41,8 +45,10 @@ class LeftPane(urwid.ListBox):
idx = idx + 1 idx = idx + 1
self.set_focus(idx) self.set_focus(idx)
focus_widget, idx = self.get_focus() focus_widget, idx = self.get_focus()
articles = self.getArticles(focus_widget.attr_map[None]) if self.isCategoryView:
tui.articles.fill(articles) self.currentCategory = focus_widget.attr_map[None][0]
tui.articles = self.getArticles(focus_widget.attr_map[None])
tui.articleView.fill(tui.articles)
return return
elif key in ("k", "up"): elif key in ("k", "up"):
focus_widget, idx = self.get_focus() focus_widget, idx = self.get_focus()
@ -50,8 +56,10 @@ class LeftPane(urwid.ListBox):
idx = idx - 1 idx = idx - 1
self.set_focus(idx) self.set_focus(idx)
focus_widget, idx = self.get_focus() focus_widget, idx = self.get_focus()
articles = self.getArticles(focus_widget.attr_map[None]) if self.isCategoryView:
tui.articles.fill(articles) self.currentCategory = focus_widget.attr_map[None][0]
tui.articles = self.getArticles(focus_widget.attr_map[None])
tui.articleView.fill(tui.articles)
return return
elif key in ("l", "right"): elif key in ("l", "right"):
if self.isCategoryView: if self.isCategoryView:
@ -59,7 +67,6 @@ class LeftPane(urwid.ListBox):
focus_widget, idx = self.get_focus() focus_widget, idx = self.get_focus()
self.categoryPosition = idx self.categoryPosition = idx
categoryId = focus_widget.attr_map[None][0] categoryId = focus_widget.attr_map[None][0]
self.currentCategory = categoryId
feeds = tui.fetcher.feedsFromCategory(categoryId) feeds = tui.fetcher.feedsFromCategory(categoryId)
feedItems = [urwid.AttrMap(urwid.Columns([(5, urwid.Text(str(tui.fetcher.unreadCounts[feed["id"]][0]))), feedItems = [urwid.AttrMap(urwid.Columns([(5, urwid.Text(str(tui.fetcher.unreadCounts[feed["id"]][0]))),
urwid.Text(feed["title"])]), feed["id"], "reveal focus") for feed in feeds] urwid.Text(feed["title"])]), feed["id"], "reveal focus") for feed in feeds]
@ -67,8 +74,10 @@ class LeftPane(urwid.ListBox):
self.body = walker self.body = walker
tui.leftBox.set_title(categoryId[13:]) tui.leftBox.set_title(categoryId[13:])
focus_widget, idx = self.get_focus() focus_widget, idx = self.get_focus()
articles = self.getArticles(focus_widget.attr_map[None]) if self.isCategoryView:
tui.articles.fill(articles) self.currentCategory = focus_widget.attr_map[None][0]
tui.articles = self.getArticles(focus_widget.attr_map[None])
tui.articleView.fill(tui.articles)
return return
elif key in ("h", "left"): elif key in ("h", "left"):
if not self.isCategoryView: if not self.isCategoryView:
@ -80,8 +89,8 @@ class LeftPane(urwid.ListBox):
tui.leftBox.set_title("Categories") tui.leftBox.set_title("Categories")
self.set_focus(self.categoryPosition) self.set_focus(self.categoryPosition)
focus_widget, idx = self.get_focus() focus_widget, idx = self.get_focus()
articles = self.getArticles(focus_widget.attr_map[None]) tui.articles = self.getArticles(focus_widget.attr_map[None])
tui.articles.fill(articles) tui.articleView.fill(tui.articles)
return return
return super().keypress(size, key) return super().keypress(size, key)
@ -92,6 +101,8 @@ class RightPane(urwid.ListBox):
super().__init__(self) super().__init__(self)
walker = urwid.SimpleListWalker([]) walker = urwid.SimpleListWalker([])
self.body = walker self.body = walker
self.isList = True
self.articlePosition = 0
def fill(self, articles): def fill(self, articles):
items = [urwid.AttrMap(urwid.Columns([(2, urwid.Text("N")), urwid.Text(article["title"])]), items = [urwid.AttrMap(urwid.Columns([(2, urwid.Text("N")), urwid.Text(article["title"])]),
@ -99,6 +110,10 @@ class RightPane(urwid.ListBox):
walker = urwid.SimpleListWalker(items) walker = urwid.SimpleListWalker(items)
self.body = walker self.body = walker
def getArticle(self, articleId):
article = [item for item in tui.fetcher.articles[tui.feedView.currentCategory[13:]] if item["id"] == articleId][0]
return article
def keypress(self, size, key): def keypress(self, size, key):
if key in ("j", "down"): if key in ("j", "down"):
item_size = len(self.body) item_size = len(self.body)
@ -114,20 +129,23 @@ class RightPane(urwid.ListBox):
self.set_focus(idx) self.set_focus(idx)
return return
elif key in ("l", "right"): elif key in ("l", "right"):
if self.isList is True:
self.isList = False
focus_widget, idx = self.get_focus() focus_widget, idx = self.get_focus()
value = next(focus_widget.render((100,), focus=False).content())[1][2].decode().strip() self.articlePosition = idx
feeds = tui.leftPaneItems[value]["feeds"] articleId = focus_widget.attr_map[None]
feedItems = [urwid.Columns([(4, urwid.Text(item["count"])), urwid.Text(item["name"])]) article = Article(self.getArticle(articleId))
for item in feeds] walker = urwid.SimpleListWalker([urwid.Text(""), urwid.Text(article.text), urwid.Text("")])
walker = urwid.SimpleListWalker([urwid.AttrMap(item, None, 'reveal focus') for item in feedItems])
self.body = walker self.body = walker
tui.leftBox.set_title(value) self.set_focus(1)
tui.rightBox.set_title(article.title)
return return
elif key in ("h", "left"): elif key in ("h", "left"):
feedItems = tui.feedItems if self.isList is False:
walker = urwid.SimpleListWalker([urwid.AttrMap(item, None, 'reveal focus') for item in feedItems]) self.isList = True
self.body = walker self.fill(tui.articles)
tui.leftBox.set_title("Categories") tui.rightBox.set_title("Articles")
self.set_focus(self.articlePosition)
return return
return super().keypress(size, key) return super().keypress(size, key)
@ -164,23 +182,24 @@ class TUI(urwid.Frame):
self.executor = ThreadPoolExecutor(max_workers=1) self.executor = ThreadPoolExecutor(max_workers=1)
self.loop = None self.loop = None
self.articleItems = [urwid.Text("Article# " + str(i)) for i in range(0, 10)] self.articleItems = [urwid.Text("Article# " + str(i)) for i in range(0, 10)]
self.feeds = LeftPane(self.fetcher.categories) self.feedView = LeftPane(self.fetcher.categories)
self.articles = RightPane([]) self.articleView = RightPane([])
self.leftBox = urwid.LineBox(self.feeds, title="Categories") self.leftBox = urwid.LineBox(self.feedView, title="Categories")
self.rightBox = urwid.LineBox(self.articleView, title="Articles")
self.container = urwid.Columns( self.container = urwid.Columns(
[(40, self.leftBox), [(40, self.leftBox), self.rightBox])
urwid.LineBox(self.articles, title="Articles")])
self.body = self.container self.body = self.container
self.articles = []
super().__init__(self.body) super().__init__(self.body)
def run(self): def run(self):
focus_widget, idx = self.feeds.get_focus() focus_widget, idx = self.feedView.get_focus()
itemId = focus_widget.attr_map[None][0] itemId = focus_widget.attr_map[None][0]
number = focus_widget.attr_map[None][1] number = focus_widget.attr_map[None][1]
tui.fetcher.articlesFromCategory(itemId[13:], str(number)) tui.fetcher.articlesFromCategory(itemId[13:], str(number))
articles = tui.fetcher.articles[itemId[13:]] self.articles = tui.fetcher.articles[itemId[13:]]
self.articles.fill(articles) self.articleView.fill(self.articles)
self.loop.run() self.loop.run()
self.executor.shutdown(wait=False) self.executor.shutdown(wait=False)

7
Render.py
Unescape View File

@ -0,0 +1,7 @@
from inscriptis import get_text
class Article:
def __init__(self, articleObj):
self.text = get_text(articleObj["summary"]["content"])
self.title = articleObj["title"]
Write Preview
Loading…
Cancel
Save