# ============================================================================
# Name : FeedingIt.py
# Author : Yves Marcoz
-# Version : 0.5.0
+# Version : 0.6.0
# Description : Simple RSS Reader
# ============================================================================
import gtk
-import feedparser
-import pango
+from pango import FontDescription
import hildon
#import gtkhtml2
-try:
- import webkit
- has_webkit=True
-except:
- import gtkhtml2
- has_webkit=False
-import time
-import dbus
-import pickle
-from os.path import isfile, isdir
-from os import mkdir
-import sys
-import urllib2
+#try:
+from webkit import WebView
+# has_webkit=True
+#except:
+# import gtkhtml2
+# has_webkit=False
+from os.path import isfile, isdir, exists
+from os import mkdir, remove, stat
import gobject
from portrait import FremantleRotation
-import threading
-import thread
+from threading import Thread, activeCount
from feedingitdbus import ServerObject
+from updatedbus import UpdateServerObject, get_lock
from config import Config
+from cgi import escape
-from rss import *
+from rss import Listing
from opml import GetOpmlData, ExportOpmlData
-
-import socket
+
+from urllib2 import install_opener, build_opener
+
+from socket import setdefaulttimeout
timeout = 5
-socket.setdefaulttimeout(timeout)
+setdefaulttimeout(timeout)
+del timeout
+
+color_style = gtk.rc_get_style_by_paths(gtk.settings_get_default() , 'GtkButton', 'osso-logical-colors', gtk.Button)
+unread_color = color_style.lookup_color('ActiveTextColor')
+read_color = color_style.lookup_color('DefaultTextColor')
+del color_style
CONFIGDIR="/home/user/.feedingit/"
+LOCK = CONFIGDIR + "update.lock"
+
+from re import sub
+from htmlentitydefs import name2codepoint
+
+##
+# Removes HTML or XML character references and entities from a text string.
+#
+# @param text The HTML (or XML) source text.
+# @return The plain text, as a Unicode string, if necessary.
+# http://effbot.org/zone/re-sub.htm#unescape-html
+def unescape(text):
+ def fixup(m):
+ text = m.group(0)
+ if text[:2] == "&#":
+ # character reference
+ try:
+ if text[:3] == "&#x":
+ return unichr(int(text[3:-1], 16))
+ else:
+ return unichr(int(text[2:-1]))
+ except ValueError:
+ pass
+ else:
+ # named entity
+ try:
+ text = unichr(name2codepoint[text[1:-1]])
+ except KeyError:
+ pass
+ return text # leave as is
+ return sub("&#?\w+;", fixup, text)
+
class AddWidgetWizard(hildon.WizardDialog):
return False
else:
return True
-
-class GetImage(threading.Thread):
- def __init__(self, url, stream):
- threading.Thread.__init__(self)
- self.url = url
- self.stream = stream
-
- def run(self):
- f = urllib2.urlopen(self.url)
- data = f.read()
- f.close()
- self.stream.write(data)
- self.stream.close()
-
-class ImageDownloader():
- def __init__(self):
- self.images = []
- self.downloading = False
-
- def queueImage(self, url, stream):
- self.images.append((url, stream))
- if not self.downloading:
- self.downloading = True
- gobject.timeout_add(50, self.checkQueue)
-
- def checkQueue(self):
- for i in range(4-threading.activeCount()):
- if len(self.images) > 0:
- (url, stream) = self.images.pop()
- GetImage(url, stream).start()
- if len(self.images)>0:
- gobject.timeout_add(200, self.checkQueue)
- else:
- self.downloading=False
-
- def stopAll(self):
- self.images = []
-
-class Download(threading.Thread):
+class Download(Thread):
def __init__(self, listing, key, config):
- threading.Thread.__init__(self)
+ Thread.__init__(self)
self.listing = listing
self.key = key
self.config = config
def run (self):
- self.listing.updateFeed(self.key, self.config.getExpiry())
+ (use_proxy, proxy) = self.config.getProxy()
+ key_lock = get_lock(self.key)
+ if key_lock != None:
+ if use_proxy:
+ self.listing.updateFeed(self.key, self.config.getExpiry(), proxy=proxy, imageCache=self.config.getImageCache() )
+ else:
+ self.listing.updateFeed(self.key, self.config.getExpiry(), imageCache=self.config.getImageCache() )
+ del key_lock
class DownloadBar(gtk.ProgressBar):
def __init__(self, parent, listing, listOfKeys, config, single=False):
- gtk.ProgressBar.__init__(self)
- self.listOfKeys = listOfKeys[:]
- self.listing = listing
- self.total = len(self.listOfKeys)
- self.config = config
- self.current = 0
- self.single = single
-
- if self.total>0:
- #self.progress = gtk.ProgressBar()
- #self.waitingWindow = hildon.Note("cancel", parent, "Downloading",
- # progressbar=self.progress)
- self.set_text("Updating...")
- self.fraction = 0
- self.set_fraction(self.fraction)
- self.show_all()
- # Create a timeout
- self.timeout_handler_id = gobject.timeout_add(50, self.update_progress_bar)
- #self.waitingWindow.show_all()
- #response = self.waitingWindow.run()
- #self.listOfKeys = []
- #while threading.activeCount() > 1:
- # Wait for current downloads to finish
- # time.sleep(0.1)
- #self.waitingWindow.destroy()
+
+ update_lock = get_lock("update_lock")
+ if update_lock != None:
+ gtk.ProgressBar.__init__(self)
+ self.listOfKeys = listOfKeys[:]
+ self.listing = listing
+ self.total = len(self.listOfKeys)
+ self.config = config
+ self.current = 0
+ self.single = single
+ (use_proxy, proxy) = self.config.getProxy()
+ if use_proxy:
+ opener = build_opener(proxy)
+ opener.addheaders = [('User-agent', 'Mozilla/5.0 (compatible; Maemo 5;) FeedingIt 0.6.1')]
+ install_opener(opener)
+ else:
+ opener = build_opener()
+ opener.addheaders = [('User-agent', 'Mozilla/5.0 (compatible; Maemo 5;) FeedingIt 0.6.1')]
+ install_opener(opener)
+
+ if self.total>0:
+ self.set_text("Updating...")
+ self.fraction = 0
+ self.set_fraction(self.fraction)
+ self.show_all()
+ # Create a timeout
+ self.timeout_handler_id = gobject.timeout_add(50, self.update_progress_bar)
def update_progress_bar(self):
#self.progress_bar.pulse()
- if threading.activeCount() < 4:
- x = threading.activeCount() - 1
+ if activeCount() < 4:
+ x = activeCount() - 1
k = len(self.listOfKeys)
fin = self.total - k - x
fraction = float(fin)/float(self.total) + float(x)/(self.total*2.)
if len(self.listOfKeys)>0:
self.current = self.current+1
key = self.listOfKeys.pop()
- if (not self.listing.getCurrentlyDisplayedFeed() == key) or (self.single == True):
+ #if self.single == True:
# Check if the feed is being displayed
- download = Download(self.listing, key, self.config)
- download.start()
+ download = Download(self.listing, key, self.config)
+ download.start()
return True
- elif threading.activeCount() > 1:
+ elif activeCount() > 1:
return True
else:
#self.waitingWindow.destroy()
#self.destroy()
+ try:
+ del self.update_lock
+ except:
+ pass
self.emit("download-done", "success")
return False
return True
self.vbox2 = gtk.VBox(False, 10)
- button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
button.set_label("Move Up")
button.connect("clicked", self.buttonUp)
self.vbox2.pack_start(button, expand=False, fill=False)
- button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
button.set_label("Move Down")
button.connect("clicked", self.buttonDown)
self.vbox2.pack_start(button, expand=False, fill=False)
- button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
button.set_label("Add Feed")
button.connect("clicked", self.buttonAdd)
self.vbox2.pack_start(button, expand=False, fill=False)
- button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
button.set_label("Edit Feed")
button.connect("clicked", self.buttonEdit)
self.vbox2.pack_start(button, expand=False, fill=False)
- button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
button.set_label("Delete")
button.connect("clicked", self.buttonDelete)
self.vbox2.pack_start(button, expand=False, fill=False)
#self.show_all()
def refreshList(self, selected=None, offset=0):
- rect = self.treeview.get_visible_rect()
- y = rect.y+rect.height
+ #rect = self.treeview.get_visible_rect()
+ #y = rect.y+rect.height
self.treestore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
for key in self.listing.getListOfFeeds():
item = self.treestore.append([self.listing.getFeedTitle(key), key])
class DisplayArticle(hildon.StackableWindow):
- def __init__(self, title, text, link, index, key, listing, config):
+ def __init__(self, feed, id, key, config, listing):
hildon.StackableWindow.__init__(self)
- self.imageDownloader = ImageDownloader()
+ #self.imageDownloader = ImageDownloader()
+ self.feed = feed
self.listing=listing
self.key = key
- self.index = index
- self.text = text
- self.link = link
- self.set_title(title)
+ self.id = id
+ #self.set_title(feed.getTitle(id))
+ self.set_title(self.listing.getFeedTitle(key))
self.config = config
- self.images = []
+ self.set_for_removal = False
# Init the article display
- if self.config.getWebkitSupport():
- self.view = webkit.WebView()
+ #if self.config.getWebkitSupport():
+ self.view = WebView()
#self.view.set_editable(False)
- else:
- import gtkhtml2
- self.view = gtkhtml2.View()
- self.document = gtkhtml2.Document()
- self.view.set_document(self.document)
- self.document.connect("link_clicked", self._signal_link_clicked)
+ #else:
+ # import gtkhtml2
+ # self.view = gtkhtml2.View()
+ # self.document = gtkhtml2.Document()
+ # self.view.set_document(self.document)
+ # self.document.connect("link_clicked", self._signal_link_clicked)
self.pannable_article = hildon.PannableArea()
self.pannable_article.add(self.view)
#self.pannable_article.set_property("mov-mode", hildon.MOVEMENT_MODE_BOTH)
#self.gestureId = self.pannable_article.connect('horizontal-movement', self.gesture)
- if self.config.getWebkitSupport():
- if key=="ArchivedArticles":
- self.view.open("file://" + self.link)
- else:
- self.view.load_html_string(self.text, self.link) # "text/html", "utf-8", self.link)
- self.view.set_zoom_level(float(config.getArtFontSize())/10.)
- else:
- if not key == "ArchivedArticles":
+ #if self.config.getWebkitSupport():
+ contentLink = self.feed.getContentLink(self.id)
+ self.feed.setEntryRead(self.id)
+ #if key=="ArchivedArticles":
+ self.view.open("file://" + contentLink)
+ self.view.connect("motion-notify-event", lambda w,ev: True)
+ self.view.connect('load-started', self.load_started)
+ self.view.connect('load-finished', self.load_finished)
+
+ #else:
+ #self.view.load_html_string(self.text, contentLink) # "text/html", "utf-8", self.link)
+ self.view.set_zoom_level(float(config.getArtFontSize())/10.)
+ #else:
+ # if not key == "ArchivedArticles":
# Do not download images if the feed is "Archived Articles"
- self.document.connect("request-url", self._signal_request_url)
+ # self.document.connect("request-url", self._signal_request_url)
- self.document.clear()
- self.document.open_stream("text/html")
- self.document.write_stream(self.text)
- self.document.close_stream()
+ # self.document.clear()
+ # self.document.open_stream("text/html")
+ # self.document.write_stream(self.text)
+ # self.document.close_stream()
menu = hildon.AppMenu()
# Create a button and add it to the menu
button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
button.set_label("Open in Browser")
- button.connect("clicked", self._signal_link_clicked, self.link)
+ button.connect("clicked", self._signal_link_clicked, self.feed.getExternalLink(self.id))
menu.append(button)
- button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
- button.set_label("Add to Archived Articles")
- button.connect("clicked", self.archive_button)
+ if key == "ArchivedArticles":
+ button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button.set_label("Remove from Archived Articles")
+ button.connect("clicked", self.remove_archive_button)
+ else:
+ button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button.set_label("Add to Archived Articles")
+ button.connect("clicked", self.archive_button)
menu.append(button)
self.set_app_menu(menu)
self.destroyId = self.connect("destroy", self.destroyWindow)
self.view.connect("button_press_event", self.button_pressed)
- self.view.connect("button_release_event", self.button_released)
+ self.gestureId = self.view.connect("button_release_event", self.button_released)
#self.timeout_handler_id = gobject.timeout_add(300, self.reloadArticle)
+ def load_started(self, *widget):
+ hildon.hildon_gtk_window_set_progress_indicator(self, 1)
+
+ def load_finished(self, *widget):
+ hildon.hildon_gtk_window_set_progress_indicator(self, 0)
+
def button_pressed(self, window, event):
#print event.x, event.y
self.coords = (event.x, event.y)
x = self.coords[0] - event.x
y = self.coords[1] - event.y
- if (abs(y) < 20):
- if (x > 30):
- self.emit("article-previous", self.index)
- elif (x<-30):
- self.emit("article-next", self.index)
+ if (2*abs(y) < abs(x)):
+ if (x > 15):
+ self.emit("article-previous", self.id)
+ elif (x<-15):
+ self.emit("article-next", self.id)
#print x, y
#print "Released"
def destroyWindow(self, *args):
self.disconnect(self.destroyId)
- self.emit("article-closed", self.index)
- self.imageDownloader.stopAll()
+ if self.set_for_removal:
+ self.emit("article-deleted", self.id)
+ else:
+ self.emit("article-closed", self.id)
+ #self.imageDownloader.stopAll()
self.destroy()
def horiz_scrolling_button(self, *widget):
def archive_button(self, *widget):
# Call the listing.addArchivedArticle
- self.listing.addArchivedArticle(self.key, self.index)
+ self.listing.addArchivedArticle(self.key, self.id)
+
+ def remove_archive_button(self, *widget):
+ self.set_for_removal = True
#def reloadArticle(self, *widget):
# if threading.activeCount() > 1:
# self.show_all()
def _signal_link_clicked(self, object, link):
- bus = dbus.SystemBus()
+ import dbus
+ bus = dbus.SessionBus()
proxy = bus.get_object("com.nokia.osso_browser", "/com/nokia/osso_browser/request")
iface = dbus.Interface(proxy, 'com.nokia.osso_browser')
- iface.load_url(link)
+ iface.open_new_window(link)
- def _signal_request_url(self, object, url, stream):
+ #def _signal_request_url(self, object, url, stream):
#print url
- self.imageDownloader.queueImage(url, stream)
+ # self.imageDownloader.queueImage(url, stream)
#imageThread = GetImage(url)
#imageThread.start()
#self.images.append((stream, imageThread))
class DisplayFeed(hildon.StackableWindow):
- def __init__(self, listing, feed, title, key, config):
+ def __init__(self, listing, feed, title, key, config, updateDbusHandler):
hildon.StackableWindow.__init__(self)
self.listing = listing
self.feed = feed
self.set_title(title)
self.key=key
self.config = config
+ self.updateDbusHandler = updateDbusHandler
self.downloadDialog = False
- self.listing.setCurrentlyDisplayedFeed(self.key)
+ #self.listing.setCurrentlyDisplayedFeed(self.key)
self.disp = False
button.set_label("Mark All As Read")
button.connect("clicked", self.buttonReadAllClicked)
menu.append(button)
+
+ if key=="ArchivedArticles":
+ button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ button.set_label("Purge Read Articles")
+ button.connect("clicked", self.buttonPurgeArticles)
+ menu.append(button)
+
self.set_app_menu(menu)
menu.show_all()
self.connect("destroy", self.destroyWindow)
def destroyWindow(self, *args):
- self.feed.saveUnread(CONFIGDIR)
+ #self.feed.saveUnread(CONFIGDIR)
+ gobject.idle_add(self.feed.saveUnread, CONFIGDIR)
self.listing.updateUnread(self.key, self.feed.getNumberOfUnreadItems())
self.emit("feed-closed", self.key)
self.destroy()
#gobject.idle_add(self.feed.saveFeed, CONFIGDIR)
- self.listing.closeCurrentlyDisplayedFeed()
+ #self.listing.closeCurrentlyDisplayedFeed()
def displayFeed(self):
self.vboxFeed = gtk.VBox(False, 10)
self.pannableFeed.set_property("mov-mode", hildon.MOVEMENT_MODE_BOTH)
self.buttons = {}
for id in self.feed.getIds():
- button = gtk.Button(self.feed.getTitle(id))
+ title = self.feed.getTitle(id)
+
+ esc_title = unescape(title).replace("<em>","").replace("</em>","")
+ #title.replace("<em>","").replace("</em>","").replace("&","&").replace("—", "-").replace("’", "'")
+ button = gtk.Button(esc_title)
button.set_alignment(0,0)
label = button.child
+
if self.feed.isEntryRead(id):
- #label.modify_font(pango.FontDescription("sans 16"))
- label.modify_font(pango.FontDescription(self.config.getReadFont()))
- label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
+ #label.modify_font(FontDescription("sans 16"))
+ label.modify_font(FontDescription(self.config.getReadFont()))
+ label.modify_fg(gtk.STATE_NORMAL, read_color) # gtk.gdk.color_parse("white"))
else:
#print self.listing.getFont() + " bold"
- label.modify_font(pango.FontDescription(self.config.getUnreadFont()))
- label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("SkyBlue"))
- #label.modify_font(pango.FontDescription("sans bold 23"))
- #"sans bold 16"
+ label.modify_font(FontDescription(self.config.getUnreadFont()))
+ label.modify_fg(gtk.STATE_NORMAL, unread_color)
label.set_line_wrap(True)
label.set_size_request(self.get_size()[0]-50, -1)
self.show_all()
def clear(self):
- self.remove(self.pannableFeed)
+ self.pannableFeed.destroy()
+ #self.remove(self.pannableFeed)
def button_clicked(self, button, index, previous=False, next=False):
- newDisp = DisplayArticle(self.feedTitle, self.feed.getArticle(index), self.feed.getLink(index), index, self.key, self.listing, self.config)
+ #newDisp = DisplayArticle(self.feedTitle, self.feed.getArticle(index), self.feed.getLink(index), index, self.key, self.listing, self.config)
+ newDisp = DisplayArticle(self.feed, index, self.key, self.config, self.listing)
stack = hildon.WindowStack.get_default()
if previous:
tmp = stack.peek()
gobject.timeout_add(200, self.destroyArticle, tmp)
#print "previous"
self.disp = newDisp
-
- #stack.push(tmp)
- #if not self.disp == False:
- # self.disp.destroyWindow()
elif next:
- #print type(self.disp).__name__
-
- #self.disp.destroyWindow()
- #stack.pop_and_push(1,newDisp)
- #else:
- # stack.push(newDisp)
- #self.disp = newDisp
newDisp.show_all()
if type(self.disp).__name__ == "DisplayArticle":
gobject.timeout_add(200, self.destroyArticle, self.disp)
self.disp = newDisp
- #self.disp.show_all()
- #if not self.disp == False:
- # self.disp.destroyWindow()
else:
self.disp = newDisp
self.disp.show_all()
self.ids = []
+ if self.key == "ArchivedArticles":
+ self.ids.append(self.disp.connect("article-deleted", self.onArticleDeleted))
self.ids.append(self.disp.connect("article-closed", self.onArticleClosed))
self.ids.append(self.disp.connect("article-next", self.nextArticle))
self.ids.append(self.disp.connect("article-previous", self.previousArticle))
+ def buttonPurgeArticles(self, *widget):
+ self.clear()
+ self.feed.purgeReadArticles()
+ self.feed.saveUnread(CONFIGDIR)
+ self.feed.saveFeed(CONFIGDIR)
+ self.displayFeed()
+
def destroyArticle(self, handle):
handle.destroyWindow()
def nextArticle(self, object, index):
label = self.buttons[index].child
- label.modify_font(pango.FontDescription(self.config.getReadFont()))
- label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
+ label.modify_font(FontDescription(self.config.getReadFont()))
+ label.modify_fg(gtk.STATE_NORMAL, read_color) # gtk.gdk.color_parse("white"))
id = self.feed.getNextId(index)
self.button_clicked(object, id, next=True)
def previousArticle(self, object, index):
label = self.buttons[index].child
- label.modify_font(pango.FontDescription(self.config.getReadFont()))
- label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
+ label.modify_font(FontDescription(self.config.getReadFont()))
+ label.modify_fg(gtk.STATE_NORMAL, read_color) # gtk.gdk.color_parse("white"))
id = self.feed.getPreviousId(index)
self.button_clicked(object, id, previous=True)
def onArticleClosed(self, object, index):
label = self.buttons[index].child
- label.modify_font(pango.FontDescription(self.config.getReadFont()))
- label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
+ label.modify_font(FontDescription(self.config.getReadFont()))
+ label.modify_fg(gtk.STATE_NORMAL, read_color) # gtk.gdk.color_parse("white"))
self.buttons[index].show()
+
+ def onArticleDeleted(self, object, index):
+ self.clear()
+ self.feed.removeArticle(index)
+ self.feed.saveUnread(CONFIGDIR)
+ self.feed.saveFeed(CONFIGDIR)
+ self.displayFeed()
def button_update_clicked(self, button):
#bar = DownloadBar(self, self.listing, [self.key,], self.config )
self.vbox.destroy()
self.feed = self.listing.getFeed(self.key)
self.displayFeed()
- #self.feed.updateFeed()
- # self.clear()
- # self.displayFeed()
+ self.updateDbusHandler.ArticleCountUpdated()
def buttonReadAllClicked(self, button):
for index in self.feed.getIds():
self.feed.setEntryRead(index)
label = self.buttons[index].child
- label.modify_font(pango.FontDescription(self.config.getReadFont()))
- label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
+ label.modify_font(FontDescription(self.config.getReadFont()))
+ label.modify_fg(gtk.STATE_NORMAL, read_color) # gtk.gdk.color_parse("white"))
self.buttons[index].show()
self.mainVbox.pack_start(self.pannableListing)
self.window.add(self.mainVbox)
self.window.show_all()
- self.config = Config(self.window, CONFIGDIR+"config.ini", has_webkit)
+ self.config = Config(self.window, CONFIGDIR+"config.ini")
gobject.idle_add(self.createWindow)
def createWindow(self):
+ self.app_lock = get_lock("app_lock")
+ if self.app_lock == None:
+ self.pannableListing.set_label("Update in progress, please wait.")
+ gobject.timeout_add_seconds(3, self.createWindow)
+ return False
self.listing = Listing(CONFIGDIR)
self.downloadDialog = False
- self.orientation = FremantleRotation("FeedingIt", main_window=self.window)
+ self.orientation = FremantleRotation("FeedingIt", main_window=self.window, app=self)
self.orientation.set_mode(self.config.getOrientation())
menu = hildon.AppMenu()
self.window.set_app_menu(menu)
menu.show_all()
- #self.feedWindow = hildon.StackableWindow()
- #self.articleWindow = hildon.StackableWindow()
+ self.feedWindow = hildon.StackableWindow()
+ self.articleWindow = hildon.StackableWindow()
self.displayListing()
self.autoupdate = False
self.checkAutoUpdate()
hildon.hildon_gtk_window_set_progress_indicator(self.window, 0)
+ gobject.idle_add(self.enableDbus)
+
+ def enableDbus(self):
+ self.dbusHandler = ServerObject(self)
+ self.updateDbusHandler = UpdateServerObject(self)
def button_markAll(self, button):
for key in self.listing.getListOfFeeds():
feed = self.listing.getFeed(key)
- for index in range(feed.getNumberOfEntries()):
- feed.setEntryRead(index)
+ for id in feed.getIds():
+ feed.setEntryRead(id)
+ feed.saveUnread(CONFIGDIR)
+ self.listing.updateUnread(key, feed.getNumberOfUnreadItems())
self.refreshList()
def button_export_clicked(self, button):
def button_update_clicked(self, button, key):
if not type(self.downloadDialog).__name__=="DownloadBar":
+ self.updateDbusHandler.UpdateStarted()
self.downloadDialog = DownloadBar(self.window, self.listing, self.listing.getListOfFeeds(), self.config )
self.downloadDialog.connect("download-done", self.onDownloadsDone)
self.mainVbox.pack_end(self.downloadDialog, expand=False, fill=False)
self.downloadDialog = False
#self.displayListing()
self.refreshList()
+ self.updateDbusHandler.UpdateFinished()
+ self.updateDbusHandler.ArticleCountUpdated()
def button_preferences_clicked(self, button):
dialog = self.config.createDialog()
#list.reverse()
for key in list:
#button = gtk.Button(item)
+ unreadItems = self.listing.getFeedNumberOfUnreadItems(key)
button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT,
hildon.BUTTON_ARRANGEMENT_VERTICAL)
button.set_text(self.listing.getFeedTitle(key), self.listing.getFeedUpdateTime(key) + " / "
- + str(self.listing.getFeedNumberOfUnreadItems(key)) + " Unread Items")
+ + str(unreadItems) + " Unread Items")
button.set_alignment(0,0,1,1)
button.connect("clicked", self.buttonFeedClicked, self, self.window, key)
self.vboxListing.pack_start(button, expand=False)
self.buttons[key] = button
-
- #if type(self.downloadDialog).__name__=="DownloadBar":
- # self.vboxListing.pack_start(self.downloadDialog)
+
self.mainVbox.pack_start(self.pannableListing)
self.window.show_all()
+ gobject.idle_add(self.refreshList)
def refreshList(self):
for key in self.listing.getListOfFeeds():
if self.buttons.has_key(key):
button = self.buttons[key]
+ unreadItems = self.listing.getFeedNumberOfUnreadItems(key)
button.set_text(self.listing.getFeedTitle(key), self.listing.getFeedUpdateTime(key) + " / "
- + str(self.listing.getFeedNumberOfUnreadItems(key)) + " Unread Items")
+ + str(unreadItems) + " Unread Items")
+ label = button.child.child.get_children()[0].get_children()[1]
+ if unreadItems == 0:
+ label.modify_fg(gtk.STATE_NORMAL, read_color)
+ else:
+ label.modify_fg(gtk.STATE_NORMAL, unread_color)
else:
self.displayListing()
break
def buttonFeedClicked(widget, button, self, window, key):
- disp = DisplayFeed(self.listing, self.listing.getFeed(key), self.listing.getFeedTitle(key), key, self.config)
- disp.connect("feed-closed", self.onFeedClosed)
+ try:
+ self.feed_lock
+ except:
+ # If feed_lock doesn't exist, we can open the feed, else we do nothing
+ self.feed_lock = get_lock(key)
+ self.disp = DisplayFeed(self.listing, self.listing.getFeed(key), self.listing.getFeedTitle(key), key, self.config, self.updateDbusHandler)
+ self.disp.connect("feed-closed", self.onFeedClosed)
def onFeedClosed(self, object, key):
- #self.displayListing()
- self.listing.saveConfig()
+ #self.listing.saveConfig()
+ #del self.feed_lock
+ gobject.idle_add(self.onFeedClosedTimeout)
self.refreshList()
- #self.buttons[key].set_text(self.listing.getFeedTitle(key), self.listing.getFeedUpdateTime(key) + " / "
- # + str(self.listing.getFeedNumberOfUnreadItems(key)) + " Unread Items")
- #self.buttons[key].show()
+ #self.updateDbusHandler.ArticleCountUpdated()
+
+ def onFeedClosedTimeout(self):
+ self.listing.saveConfig()
+ del self.feed_lock
+ self.updateDbusHandler.ArticleCountUpdated()
def run(self):
self.window.connect("destroy", gtk.main_quit)
gtk.main()
- #for key in self.listing.getListOfFeeds():
- # self.listing.getFeed(key).saveFeed(CONFIGDIR)
self.listing.saveConfig()
+ del self.app_lock
def prefsClosed(self, *widget):
self.orientation.set_mode(self.config.getOrientation())
# Need to check for internet connection
# If no internet connection, try again in 10 minutes:
# gobject.timeout_add(int(5*3600000), self.automaticUpdate)
+ file = open("/home/user/.feedingit/feedingit_widget.log", "a")
+ from time import localtime, strftime
+ file.write("App: %s\n" % strftime("%a, %d %b %Y %H:%M:%S +0000", localtime()))
+ file.close()
self.button_update_clicked(None, None)
return True
+ def stopUpdate(self):
+ # Not implemented in the app (see update_feeds.py)
+ try:
+ self.downloadDialog.listOfKeys = []
+ except:
+ pass
+
def getStatus(self):
status = ""
for key in self.listing.getListOfFeeds():
if __name__ == "__main__":
gobject.signal_new("feed-closed", DisplayFeed, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
gobject.signal_new("article-closed", DisplayArticle, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
+ gobject.signal_new("article-deleted", DisplayArticle, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
gobject.signal_new("article-next", DisplayArticle, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
gobject.signal_new("article-previous", DisplayArticle, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
gobject.signal_new("download-done", DownloadBar, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
mkdir(CONFIGDIR)
except:
print "Error: Can't create configuration directory"
- sys.exit(1)
+ from sys import exit
+ exit(1)
app = FeedingIt()
- dbusHandler = ServerObject(app)
app.run()
projects / feedingit / blobdiff