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

- Switch to Category View when all feeds are read.

Browse Source 
- Fix error 302 on loading comments from Reddit.
- Display the name of the feed when in the Category View.
- Some refactoring.
sqlite
VikingKong 3 years ago
parent ac2c76541f
commit 449db3dff7
3 changed files with 86 additions and 61 deletions
Show Stats Download Patch File Download Diff File

72
App.py
Unescape View File

@ -79,14 +79,14 @@ class LeftPane(urwid.ListBox):
itemId = attrMap[0]
name = attrMap[1]
tui.articles = tui.cache.getArticlesFromCategory(itemId, tui.show_read)
tui.articleView.fill(tui.articles)
tui.articleView.fill(tui.articles, True)
self.setArticlesPaneTitle(name)
def setFeedArticles(self, attrMap):
itemId = attrMap[0]
tui.articles = tui.cache.getArticlesFromFeed(itemId, tui.show_read)
if tui.articles is not None:
tui.articleView.fill(tui.articles)
tui.articleView.fill(tui.articles, False)
self.setArticlesPaneTitle(attrMap[1])
def keypress(self, size, key): # noqa
@ -122,6 +122,27 @@ class LeftPane(urwid.ListBox):
pass
return
elif key in ("l", "right"):
self.stepInto()
return
elif key in ("h", "left"):
self.stepOut()
return
elif key in ("r"):
self.markAsRead()
return
return super().keypress(size, key)
def stepOut(self):
if not self.isCategoryView:
self.isCategoryView = True
self.fill(tui.categories, True)
tui.leftBox.set_title("Categories")
self.set_focus(self.categoryPosition)
focus_widget, idx = self.get_focus()
self.setCategoryArticles(self.processAttrMap(focus_widget.attr_map))
def stepInto(self):
try:
if self.isCategoryView and self.currentCategory != "Favorites":
self.isCategoryView = False
@ -136,17 +157,8 @@ class LeftPane(urwid.ListBox):
tui.leftBox.set_title(categoryName)
except BaseException:
pass
return
elif key in ("h", "left"):
if not self.isCategoryView:
self.isCategoryView = True
self.fill(tui.categories, True)
tui.leftBox.set_title("Categories")
self.set_focus(self.categoryPosition)
focus_widget, idx = self.get_focus()
self.setCategoryArticles(self.processAttrMap(focus_widget.attr_map))
return
elif key in ("r"):
def markAsRead(self):
try:
focus_widget, idx = self.get_focus()
del self.body[idx]
@ -156,17 +168,16 @@ class LeftPane(urwid.ListBox):
tui.cache.markStreamAsRead(self.processAttrMap(focus_widget.attr_map)[0])
tui.categories = tui.cache.getCategories(tui.show_read)
focus_widget, idx = self.get_focus()
if focus_widget is None and not self.isCategoryView:
self.stepOut()
return
if self.isCategoryView:
self.currentCategory = self.processAttrMap(focus_widget.attr_map)[0]
self.setCategoryArticles(self.processAttrMap(focus_widget.attr_map))
else:
self.setFeedArticles(focus_widget.attr_map[None])
except BaseException as e:
Utils.writeLog(e)
except BaseException:
pass
return
return super().keypress(size, key)
class RightPane(urwid.ListBox):
@ -179,16 +190,25 @@ class RightPane(urwid.ListBox):
self.article = None
self.chunkNumber = 0
def fill(self, articles):
def fill(self, articles, isCategoryView):
status = ""
def makeColumns(article):
title = article[1]
if isCategoryView:
title += " (" + article[-1] + ")"
cols = [
(2, urwid.Text(status)),
(16, urwid.Text(article[3])),
urwid.Text(title),
]
return cols
if tui.show_read:
status = "R"
items = [
urwid.AttrMap(
urwid.Columns(
[(2, urwid.Text(status)),
(16, urwid.Text(article[3])),
urwid.Text(article[1])]),
urwid.Columns(makeColumns(article)),
article[0],
"reveal focus") for article in articles]
walker = urwid.SimpleListWalker(items)
@ -231,7 +251,6 @@ class RightPane(urwid.ListBox):
pass
return
elif key in ("f"):
Utils.writeLog(tui.feedView.currentCategory)
if self.isList is True:
article_widget, article_idx = self.get_focus()
articleId = article_widget.attr_map[None]
@ -240,7 +259,6 @@ class RightPane(urwid.ListBox):
item_widget, item_idx = tui.feedView.get_focus()
if tui.feedView.isCategoryView:
tui.feedView.fill(tui.categories, tui.feedView.isCategoryView)
Utils.writeLog(tui.feedView.currentCategory)
tui.feedView.set_focus(item_idx)
if item_idx == 0:
tui.feedView.setCategoryArticles(('Favorites', 'Favorites'))
@ -307,7 +325,7 @@ class RightPane(urwid.ListBox):
try:
if self.isList is False:
self.isList = True
self.fill(tui.articles)
self.fill(tui.articles, tui.feedView.isCategoryView)
focusFeed, idx = tui.feedView.get_focus()
tui.rightBox.set_title(tui.feedView.processAttrMap(focusFeed.attr_map)[1])
self.set_focus(self.articlePosition)
@ -429,7 +447,7 @@ class TUI(urwid.Frame):
item = self.feedView.processAttrMap(focus_widget.attr_map)[0]
name = self.feedView.processAttrMap(focus_widget.attr_map)[1]
self.articles = self.cache.getArticlesFromCategory(item, self.show_read)
self.articleView.fill(self.articles)
self.articleView.fill(self.articles, True)
self.feedView.setArticlesPaneTitle(name)
except BaseException:
pass

25
Cache.py
Unescape View File

@ -52,7 +52,9 @@ class Cache:
timestamp integer,
date text,
content text,
url text
url text,
origin text,
foreign key (origin) references feeds (id)
)
"""
create_links = """create table if not exists links (
@ -96,7 +98,6 @@ class Cache:
def getArticle(self, id, is_fav):
cur = self.conn.cursor()
Utils.writeLog(is_fav)
if is_fav:
cur.execute("""select title,content,url from favorites where id = ?""", (id,))
else:
@ -131,11 +132,11 @@ class Cache:
inc = -1
else:
inc = 1
cur.execute("""select title, timestamp, date, content, url from articles where id = ?""", (id,))
title, timestamp, date, content, url = cur.fetchone()
cur.execute("""insert into favorites(id, title, timestamp, date, content, url) values(:id, :title, :timestamp, :date
,:content, :url)""", {"id": id, "title": title, "timestamp": timestamp, "date": date, "content": content,
"url": url})
cur.execute("""select title, timestamp, date, content, url, origin from articles where id = ?""", (id,))
title, timestamp, date, content, url, origin = cur.fetchone()
cur.execute("""insert into favorites(id, title, timestamp, date, content, url, origin) values(:id, :title, :timestamp, :date
,:content, :url, :origin)""", {"id": id, "title": title, "timestamp": timestamp, "date": date, "content": content,
"url": url, "origin": origin})
cur.execute("""update categories set unread_count = unread_count + ? where id = ?""", (inc, "Favorites",))
if self.api.toggleArticleStarred(id, is_favorite):
self.conn.commit()
@ -155,10 +156,12 @@ class Cache:
def getArticlesFromCategory(self, category_id, is_read):
cur = self.conn.cursor()
Utils.writeLog(category_id)
if category_id == "Favorites":
cur.execute("""select * from favorites order by timestamp desc""")
cur.execute("""select *, (select name from feeds where id = origin) as origin_name from favorites order by timestamp desc""")
else:
cur.execute("""select * from articles where category_id = ? and is_read = ? order by timestamp desc""", (category_id, is_read,))
cur.execute("""select *, (select name from feeds where id = origin) as origin_name from articles where
category_id = ? and is_read = ? order by timestamp desc""", (category_id, is_read,))
return cur.fetchall()
def getCategories(self, show_read):
@ -219,9 +222,9 @@ class Cache:
self.conn.commit()
for favorite in favorites:
favObj = Article(favorite)
cur.execute("""insert or ignore into favorites(id,title,timestamp,date,content,url) values(:id,:t,:ts,:d,:c,:u)""",
cur.execute("""insert or ignore into favorites(id,title,timestamp,date,content,url,origin) values(:id,:t,:ts,:d,:c,:u,:o)""",
{"id": favObj.id, "t": favObj.title, "ts": favObj.timestamp, "d": favObj.date,
"c": favObj.text, "u": favObj.url})
"c": favObj.text, "u": favObj.url, "o": favObj.origin})
for link in favObj.links:
cur.execute("""insert or ignore into links(id,url) values(?,?)""", (favObj.id, link))
self.conn.commit()

6
RedditCommentsParser.py
Unescape View File

@ -1,12 +1,16 @@
from bs4 import BeautifulSoup
import httpx
import Utils
class RedditComments:
def __init__(self, link):
page = httpx.get(link)
Utils.writeLog(link)
page = httpx.get(link, follow_redirects=True)
Utils.writeLog(page)
content = page.text
self.soup = BeautifulSoup(content)
Utils.writeLog(self.soup)
self.commentObjects = self.soup.find_all("div", "Comment")
self.comments = []

Write Preview
Loading…
Cancel
Save