0.6.1-7, fix for broken feeds
[feedingit] / src / FeedingIt.py
index 5a654dd..b30d0e9 100644 (file)
 # ============================================================================
 # Name        : FeedingIt.py
 # Author      : Yves Marcoz
-# Version     : 0.2.2
+# Version     : 0.6.0
 # Description : Simple RSS Reader
 # ============================================================================
 
 import gtk
-import feedparser
-import pango
+from pango import FontDescription
 import hildon
-import gtkhtml2
-import time
-import dbus
-import pickle
-from os.path import isfile, isdir
-from os import mkdir
-import sys   
-import urllib2
+#import gtkhtml2
+#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 Listing
+from opml import GetOpmlData, ExportOpmlData
+
+from urllib2 import install_opener, build_opener
+
+from socket import setdefaulttimeout
+timeout = 5
+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)
+
 
-from rss import *
-   
 class AddWidgetWizard(hildon.WizardDialog):
     
-    def __init__(self, parent, urlIn):
+    def __init__(self, parent, urlIn, titleIn=None):
         # Create a Notebook
         self.notebook = gtk.Notebook()
 
@@ -55,6 +104,8 @@ class AddWidgetWizard(hildon.WizardDialog):
         label = gtk.Label("Enter Feed Name:")
         vbox.pack_start(label)
         vbox.pack_start(self.nameEntry)
+        if not titleIn == None:
+            self.nameEntry.set_text(titleIn)
         self.notebook.append_page(vbox, None)
         
         self.urlEntry = hildon.Entry(gtk.HILDON_SIZE_AUTO)
@@ -99,72 +150,83 @@ class AddWidgetWizard(hildon.WizardDialog):
             return False
         else:
             return True
-
-class GetImage(threading.Thread):
-    def __init__(self, url):
-        threading.Thread.__init__(self)
-        self.url = url
-    
-    def run(self):
-        f = urllib2.urlopen(self.url)
-        self.data = f.read()
-        f.close()
-
         
-class Download(threading.Thread):
-    def __init__(self, listing, key):
-        threading.Thread.__init__(self)
+class Download(Thread):
+    def __init__(self, listing, key, config):
+        Thread.__init__(self)
         self.listing = listing
         self.key = key
+        self.config = config
         
     def run (self):
-        self.listing.updateFeed(self.key)
+        (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):
+        
+        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)
 
-        
-class DownloadDialog():
-    def __init__(self, parent, listing, listOfKeys):
-        self.listOfKeys = listOfKeys[:]
-        self.listing = listing
-        self.total = len(self.listOfKeys)
-        self.current = 0            
-        
-        if self.total>0:
-            self.progress = gtk.ProgressBar()
-            self.waitingWindow = hildon.Note("cancel", parent, "Downloading",
-                                 progressbar=self.progress)
-            self.progress.set_text("Downloading")
-            self.fraction = 0
-            self.progress.set_fraction(self.fraction)
-            # 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.5)
-            self.waitingWindow.destroy()
-        
     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.)
             #print x, k, fin, fraction
-            self.progress.set_fraction(fraction)
-            
+            self.set_fraction(fraction)
+
             if len(self.listOfKeys)>0:
                 self.current = self.current+1
                 key = self.listOfKeys.pop()
-                download = Download(self.listing, key)
+                #if self.single == True:
+                    # Check if the feed is being displayed
+                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.waitingWindow.destroy()
+                #self.destroy()
+                try:
+                    del self.update_lock
+                except:
+                    pass
+                self.emit("download-done", "success")
                 return False 
         return True
     
@@ -176,17 +238,27 @@ class SortList(gtk.Dialog):
         
         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_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_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)
@@ -223,10 +295,8 @@ class SortList(gtk.Dialog):
         #self.show_all()
 
     def refreshList(self, selected=None, offset=0):
-        #x = self.treeview.get_visible_rect().x
-        rect = self.treeview.get_visible_rect()
-        y = rect.y+rect.height
-        #self.pannableArea.jump_to(-1, 0)
+        #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])
@@ -236,7 +306,6 @@ class SortList(gtk.Dialog):
         if not selected == None:
             self.treeview.get_selection().select_iter(selectedItem)
             self.treeview.scroll_to_cell(self.treeview.get_model().get_path(selectedItem))
-            #self.pannableArea.jump_to(-1, y+offset)
         self.pannableArea.show_all()
 
     def getSelectedItem(self):
@@ -263,26 +332,12 @@ class SortList(gtk.Dialog):
         if not key == None:
             self.listing.moveUp(key)
             self.refreshList(key, -10)
-        #placement = self.pannableArea.get_placement()
-        #placement = self.treeview.get_visible_rect().y
-        #self.displayFeeds(key)
-        
-        #self.treeview.scroll_to_point(-1, y)
-        #self.pannableArea.set_placement(placement)
 
     def buttonDown(self, button):
         key = self.getSelectedItem()
         if not key == None:
             self.listing.moveDown(key)
-            #(before, after) = self.findIndex(key)
-            #self.treestore.move_after(iter, after)
-            #self.treeview.set_model(self.treestore)
-            #self.treeview.show_all()
             self.refreshList(key, 10)
-            
-        #placement = self.pannableArea.get_placement()
-        #self.displayFeeds(key)
-        #self.pannableArea.set_placement(placement)
 
     def buttonDelete(self, button):
         key = self.getSelectedItem()
@@ -290,103 +345,231 @@ class SortList(gtk.Dialog):
             self.listing.removeFeed(key)
         self.refreshList()
 
+    def buttonEdit(self, button):
+        key = self.getSelectedItem()
+        if not key == None:
+            wizard = AddWidgetWizard(self, self.listing.getFeedUrl(key), self.listing.getFeedTitle(key))
+            ret = wizard.run()
+            if ret == 2:
+                (title, url) = wizard.getData()
+                if (not title == '') and (not url == ''):
+                    self.listing.editFeed(key, title, url)
+            wizard.destroy()
+        self.refreshList()
+
     def buttonDone(self, *args):
         self.destroy()
+        
+    def buttonAdd(self, button, urlIn="http://"):
+        wizard = AddWidgetWizard(self, urlIn)
+        ret = wizard.run()
+        if ret == 2:
+            (title, url) = wizard.getData()
+            if (not title == '') and (not url == ''): 
+               self.listing.addFeed(title, url)
+        wizard.destroy()
+        self.refreshList()
                
 
 class DisplayArticle(hildon.StackableWindow):
-    def __init__(self, title, text, index):
+    def __init__(self, feed, id, key, config, listing):
         hildon.StackableWindow.__init__(self)
-        self.index = index
-        self.text = text
-        self.set_title(title)
-        self.images = []
-        
-        # Init the article display    
-        self.view = gtkhtml2.View()
+        #self.imageDownloader = ImageDownloader()
+        self.feed = feed
+        self.listing=listing
+        self.key = key
+        self.id = id
+        #self.set_title(feed.getTitle(id))
+        self.set_title(self.listing.getFeedTitle(key))
+        self.config = config
+        self.set_for_removal = False
+        
+        # Init the article display
+        #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)
         self.pannable_article = hildon.PannableArea()
         self.pannable_article.add(self.view)
         #self.pannable_article.set_property("mov-mode", hildon.MOVEMENT_MODE_BOTH)
-        self.pannable_article.connect('horizontal-movement', self.gesture)
-        self.document = gtkhtml2.Document()
-        self.view.set_document(self.document)
-        self.document.connect("link_clicked", self._signal_link_clicked)
-        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.gestureId = self.pannable_article.connect('horizontal-movement', self.gesture)
+
+        #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.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("Display Images")
-        button.connect("clicked", self.reloadArticle)
+        button.set_label("Allow Horizontal Scrolling")
+        button.connect("clicked", self.horiz_scrolling_button)
+        menu.append(button)
         
+        button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+        button.set_label("Open in Browser")
+        button.connect("clicked", self._signal_link_clicked, self.feed.getExternalLink(self.id))
         menu.append(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)
         menu.show_all()
         
+        #self.event_box = gtk.EventBox()
+        #self.event_box.add(self.pannable_article)
         self.add(self.pannable_article)
         
-        self.show_all()
         
+        self.pannable_article.show_all()
+
         self.destroyId = self.connect("destroy", self.destroyWindow)
-        self.timeout_handler_id = gobject.timeout_add(300, self.reloadArticle)
         
-    def gesture(self, widget, direction, startx, starty):
-        if (direction == 3):
-            self.emit("article-next", self.index)
-        if (direction == 2):
-            self.emit("article-previous", self.index)
-        self.timeout_handler_id = gobject.timeout_add(200, self.destroyWindow)
+        self.view.connect("button_press_event", self.button_pressed)
+        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)
+        
+    def button_released(self, window, event):
+        x = self.coords[0] - event.x
+        y = self.coords[1] - event.y
+        
+        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 gesture(self, widget, direction, startx, starty):
+    #    if (direction == 3):
+    #        self.emit("article-next", self.index)
+    #    if (direction == 2):
+    #        self.emit("article-previous", self.index)
+        #print startx, starty
+        #self.timeout_handler_id = gobject.timeout_add(200, self.destroyWindow)
 
     def destroyWindow(self, *args):
-        self.emit("article-closed", self.index)
+        self.disconnect(self.destroyId)
+        if self.set_for_removal:
+            self.emit("article-deleted", self.id)
+        else:
+            self.emit("article-closed", self.id)
+        #self.imageDownloader.stopAll()
         self.destroy()
         
-    def reloadArticle(self, *widget):
-        if threading.activeCount() > 1:
+    def horiz_scrolling_button(self, *widget):
+        self.pannable_article.disconnect(self.gestureId)
+        self.pannable_article.set_property("mov-mode", hildon.MOVEMENT_MODE_BOTH)
+        
+    def archive_button(self, *widget):
+        # Call the listing.addArchivedArticle
+        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:
             # Image thread are still running, come back in a bit
-            return True
-        else:
-            for (stream, imageThread) in self.images:
-                imageThread.join()
-                stream.write(imageThread.data)
-                stream.close()
-            return False
-        self.show_all()
+    #        return True
+    #    else:
+    #        for (stream, imageThread) in self.images:
+    #            imageThread.join()
+    #            stream.write(imageThread.data)
+    #            stream.close()
+    #        return False
+    #    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.open_new_window(link)
 
-    def _signal_request_url(self, object, url, stream):
-        imageThread = GetImage(url)
-        imageThread.start()
-        self.images.append((stream, imageThread))
+    #def _signal_request_url(self, object, url, stream):
+        #print url
+    #    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):
+    def __init__(self, listing, feed, title, key, config, updateDbusHandler):
         hildon.StackableWindow.__init__(self)
         self.listing = listing
         self.feed = feed
         self.feedTitle = title
         self.set_title(title)
         self.key=key
+        self.config = config
+        self.updateDbusHandler = updateDbusHandler
+        
+        self.downloadDialog = False
+        
+        #self.listing.setCurrentlyDisplayedFeed(self.key)
+        
+        self.disp = False
         
         menu = hildon.AppMenu()
         button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         button.set_label("Update Feed")
         button.connect("clicked", self.button_update_clicked)
         menu.append(button)
+        
         button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         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()
         
@@ -395,105 +578,199 @@ class DisplayFeed(hildon.StackableWindow):
         self.connect("destroy", self.destroyWindow)
         
     def destroyWindow(self, *args):
+        #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()
-        self.feed.saveFeed()
+        #gobject.idle_add(self.feed.saveFeed, CONFIGDIR)
+        #self.listing.closeCurrentlyDisplayedFeed()
 
     def displayFeed(self):
         self.vboxFeed = gtk.VBox(False, 10)
         self.pannableFeed = hildon.PannableArea()
         self.pannableFeed.add_with_viewport(self.vboxFeed)
         self.pannableFeed.set_property("mov-mode", hildon.MOVEMENT_MODE_BOTH)
-        self.buttons = []
-        for index in range(self.feed.getNumberOfEntries()):
-            button = gtk.Button(self.feed.getTitle(index))
+        self.buttons = {}
+        for id in self.feed.getIds():
+            title = self.feed.getTitle(id)
+            
+            esc_title = unescape(title).replace("<em>","").replace("</em>","")
+            #title.replace("<em>","").replace("</em>","").replace("&amp;","&").replace("&mdash;", "-").replace("&#8217;", "'")
+            button = gtk.Button(esc_title)
             button.set_alignment(0,0)
             label = button.child
-            if self.feed.isEntryRead(index):
-                label.modify_font(pango.FontDescription("sans 16"))
+
+            if self.feed.isEntryRead(id):
+                #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:
-                label.modify_font(pango.FontDescription("sans bold 16"))
+                #print self.listing.getFont() + " bold"
+                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)
-            button.connect("clicked", self.button_clicked, index)
-            self.buttons.append(button)
+            button.connect("clicked", self.button_clicked, id)
+            self.buttons[id] = button
             
-            self.vboxFeed.pack_start(button, expand=False)           
-            index=index+1
+            self.vboxFeed.pack_start(button, expand=False)
 
         self.add(self.pannableFeed)
         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.feed, index, self.key, self.config, self.listing)
+        stack = hildon.WindowStack.get_default()
+        if previous:
+            tmp = stack.peek()
+            stack.pop_and_push(1, newDisp, tmp)
+            newDisp.show()
+            gobject.timeout_add(200, self.destroyArticle, tmp)
+            #print "previous"
+            self.disp = newDisp
+        elif next:
+            newDisp.show_all()
+            if type(self.disp).__name__ == "DisplayArticle":
+                gobject.timeout_add(200, self.destroyArticle, self.disp)
+            self.disp = newDisp
+        else:
+            self.disp = newDisp
+            self.disp.show_all()
         
-    def button_clicked(self, button, index):
-        self.disp = DisplayArticle(self.feedTitle, self.feed.getArticle(index), index)
         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("sans 16"))
-        index = (index+1) % self.feed.getNumberOfEntries()
-        self.button_clicked(object, index)
+        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("sans 16"))
-        index = (index-1) % self.feed.getNumberOfEntries()
-        self.button_clicked(object, index)
+        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("sans 16"))
+        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):
-        disp = DownloadDialog(self, self.listing, [self.key,] )       
-        #self.feed.updateFeed()
-        self.clear()
+        #bar = DownloadBar(self, self.listing, [self.key,], self.config ) 
+        if not type(self.downloadDialog).__name__=="DownloadBar":
+            self.pannableFeed.destroy()
+            self.vbox = gtk.VBox(False, 10)
+            self.downloadDialog = DownloadBar(self.window, self.listing, [self.key,], self.config, single=True )
+            self.downloadDialog.connect("download-done", self.onDownloadsDone)
+            self.vbox.pack_start(self.downloadDialog, expand=False, fill=False)
+            self.add(self.vbox)
+            self.show_all()
+            
+    def onDownloadsDone(self, *widget):
+        self.vbox.destroy()
+        self.feed = self.listing.getFeed(self.key)
         self.displayFeed()
+        self.updateDbusHandler.ArticleCountUpdated()
         
     def buttonReadAllClicked(self, button):
-        for index in range(self.feed.getNumberOfEntries()):
+        for index in self.feed.getIds():
             self.feed.setEntryRead(index)
             label = self.buttons[index].child
-            label.modify_font(pango.FontDescription("sans 16"))
+            label.modify_font(FontDescription(self.config.getReadFont()))
+            label.modify_fg(gtk.STATE_NORMAL, read_color) # gtk.gdk.color_parse("white"))
             self.buttons[index].show()
 
 
 class FeedingIt:
     def __init__(self):
-        self.listing = Listing()
-        
         # Init the windows
         self.window = hildon.StackableWindow()
         self.window.set_title("FeedingIt")
-        FremantleRotation("FeedingIt", main_window=self.window)
+        hildon.hildon_gtk_window_set_progress_indicator(self.window, 1)
+        self.mainVbox = gtk.VBox(False,10)
+        self.pannableListing = gtk.Label("Loading...")
+        self.mainVbox.pack_start(self.pannableListing)
+        self.window.add(self.mainVbox)
+        self.window.show_all()
+        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, app=self)
+        self.orientation.set_mode(self.config.getOrientation())
+        
         menu = hildon.AppMenu()
         # Create a button and add it to the menu
         button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         button.set_label("Update All Feeds")
         button.connect("clicked", self.button_update_clicked, "All")
         menu.append(button)
-        button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
-        button.set_label("Add Feed")
-        button.connect("clicked", self.button_add_clicked)
-        menu.append(button)
         
         button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
-        button.set_label("Delete Feed")
-        button.connect("clicked", self.button_delete_clicked)
+        button.set_label("Mark All As Read")
+        button.connect("clicked", self.button_markAll)
         menu.append(button)
         
         button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         button.set_label("Organize Feeds")
         button.connect("clicked", self.button_organize_clicked)
         menu.append(button)
+
+        button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+        button.set_label("Preferences")
+        button.connect("clicked", self.button_preferences_clicked)
+        menu.append(button)
+       
+        button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+        button.set_label("Import Feeds")
+        button.connect("clicked", self.button_import_clicked)
+        menu.append(button)
+        
+        button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+        button.set_label("Export Feeds")
+        button.connect("clicked", self.button_export_clicked)
+        menu.append(button)
         
         self.window.set_app_menu(menu)
         menu.show_all()
@@ -501,16 +778,36 @@ class FeedingIt:
         self.feedWindow = hildon.StackableWindow()
         self.articleWindow = hildon.StackableWindow()
 
-        self.displayListing() 
-        
-    def button_organize_clicked(self, button):
-        org = SortList(self.window, self.listing)
-        org.run()
-        org.destroy()
-        self.listing.saveConfig()
         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 id in feed.getIds():
+                feed.setEntryRead(id)
+            feed.saveUnread(CONFIGDIR)
+            self.listing.updateUnread(key, feed.getNumberOfUnreadItems())
+        self.refreshList()
+
+    def button_export_clicked(self, button):
+        opml = ExportOpmlData(self.window, self.listing)
         
-    def button_add_clicked(self, button, urlIn="http://"):
+    def button_import_clicked(self, button):
+        opml = GetOpmlData(self.window)
+        feeds = opml.getData()
+        for (title, url) in feeds:
+            self.listing.addFeed(title, url)
+        self.displayListing()
+
+    def addFeed(self, urlIn="http://"):
         wizard = AddWidgetWizard(self.window, urlIn)
         ret = wizard.run()
         if ret == 2:
@@ -519,41 +816,34 @@ class FeedingIt:
                self.listing.addFeed(title, url)
         wizard.destroy()
         self.displayListing()
-        
-    def button_update_clicked(self, button, key):
-        disp = DownloadDialog(self.window, self.listing, self.listing.getListOfFeeds() )           
-        self.displayListing()
 
-    def button_delete_clicked(self, button):
-        self.pickerDialog = hildon.PickerDialog(self.window)
-        #HildonPickerDialog
-        self.pickerDialog.set_selector(self.create_selector())
-        self.pickerDialog.show_all()
+    def button_organize_clicked(self, button):
+        org = SortList(self.window, self.listing)
+        org.run()
+        org.destroy()
+        self.listing.saveConfig()
+        self.displayListing()
         
-    def create_selector(self):
-        selector = hildon.TouchSelector(text=True)
-        # Selection multiple
-        #selector.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE)
-        self.mapping = {}
-        selector.connect("changed", self.selection_changed)
+    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.mainVbox.show_all()
+        #self.displayListing()
+
+    def onDownloadsDone(self, *widget):
+        self.downloadDialog.destroy()
+        self.downloadDialog = False
+        #self.displayListing()
+        self.refreshList()
+        self.updateDbusHandler.UpdateFinished()
+        self.updateDbusHandler.ArticleCountUpdated()
 
-        for key in self.listing.getListOfFeeds():
-            title=self.listing.getFeedTitle(key)
-            selector.append_text(title)
-            self.mapping[title]=key
-
-        return selector
-
-    def selection_changed(self, widget, data):
-        current_selection = widget.get_current_text()
-        #print 'Current selection: %s' % current_selection
-        #print "To Delete: %s" % self.mapping[current_selection]
-        self.pickerDialog.destroy()
-        if self.show_confirmation_note(self.window, current_selection):
-            self.listing.removeFeed(self.mapping[current_selection])
-            self.listing.saveConfig()
-        del self.mapping
-        self.displayListing()
+    def button_preferences_clicked(self, button):
+        dialog = self.config.createDialog()
+        dialog.connect("destroy", self.prefsClosed)
 
     def show_confirmation_note(self, parent, title):
         note = hildon.Note("confirmation", parent, "Are you sure you want to delete " + title +"?")
@@ -568,7 +858,7 @@ class FeedingIt:
         
     def displayListing(self):
         try:
-            self.window.remove(self.pannableListing)
+            self.mainVbox.remove(self.pannableListing)
         except:
             pass
         self.vboxListing = gtk.VBox(False,10)
@@ -576,46 +866,128 @@ class FeedingIt:
         self.pannableListing.add_with_viewport(self.vboxListing)
 
         self.buttons = {}
-        for key in self.listing.getListOfFeeds():
+        list = self.listing.getListOfFeeds()[:]
+        #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
-        self.window.add(self.pannableListing)
+     
+        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(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)
-        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.buttons[key].set_text(self.listing.getFeedTitle(key), self.listing.getFeedUpdateTime(key) + " / " 
-                            + str(self.listing.getFeedNumberOfUnreadItems(key)) + " Unread Items")
-        self.buttons[key].show()
+        #self.listing.saveConfig()
+        #del self.feed_lock
+        gobject.idle_add(self.onFeedClosedTimeout)
+        self.refreshList()
+        #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()
         self.listing.saveConfig()
-
+        del self.app_lock
+
+    def prefsClosed(self, *widget):
+        self.orientation.set_mode(self.config.getOrientation())
+        self.checkAutoUpdate()
+
+    def checkAutoUpdate(self, *widget):
+        interval = int(self.config.getUpdateInterval()*3600000)
+        if self.config.isAutoUpdateEnabled():
+            if self.autoupdate == False:
+                self.autoupdateId = gobject.timeout_add(interval, self.automaticUpdate)
+                self.autoupdate = interval
+            elif not self.autoupdate == interval:
+                # If auto-update is enabled, but not at the right frequency
+                gobject.source_remove(self.autoupdateId)
+                self.autoupdateId = gobject.timeout_add(interval, self.automaticUpdate)
+                self.autoupdate = interval
+        else:
+            if not self.autoupdate == False:
+                gobject.source_remove(self.autoupdateId)
+                self.autoupdate = False
+
+    def automaticUpdate(self, *widget):
+        # 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 self.listing.getFeedNumberOfUnreadItems(key) > 0:
+                status += self.listing.getFeedTitle(key) + ": \t" +  str(self.listing.getFeedNumberOfUnreadItems(key)) + " Unread Items\n"
+        if status == "":
+            status = "No unread items"
+        return status
 
 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,))
     gobject.threads_init()
     if not isdir(CONFIGDIR):
         try:
             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()