0.4.2-5 Edit feed option, loading screen

diff --git a/Makefile b/Makefile
index 65e3107..8e3cf13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,5 +21,7 @@ install:
        install data/40px.png ${DESTDIR}/usr/share/icons/hicolor/40x40/apps/feedingit.png
        install -d ${DESTDIR}/usr/share/icons/hicolor/26x26/apps/
        install data/26px.png ${DESTDIR}/usr/share/icons/hicolor/26x26/apps/feedingit.png
+       install -d ${DESTDIR}/usr/share/icons/hicolor/64x64/apps/
+       install data/64px.png ${DESTDIR}/usr/share/icons/hicolor/64x64/apps/feedingit.png
        install -d ${DESTDIR}/usr/share/dbus-1/services/
        install src/feedingit.service ${DESTDIR}/usr/share/dbus-1/services/
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index ccceaf4..eba0319 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+feedingit (0.4.2-5) unstable; urgency=low
+
+  * Background save of feeds to disk
+  * Added edit feed button
+  
+ -- Yves <yves@marcoz.org>  Tue, 27 Jan 2010 09:12:19 -0800
+
+feedingit (0.4.2-0) unstable; urgency=low
+
+  * Configuration of orientation
+  * Feed updates in the background
+  
+ -- Yves <yves@marcoz.org>  Tue, 27 Jan 2010 09:12:19 -0800
+
 feedingit (0.4.1-2) unstable; urgency=low
 
   * Changing waiting period for article windows animation

diff --git a/src/FeedingIt.py b/src/FeedingIt.py
index c0ac3d1..ad9b264 100644 (file)
--- a/src/FeedingIt.py
+++ b/src/FeedingIt.py
@@ -53,7 +53,7 @@ CONFIGDIR="/home/user/.feedingit/"
 
 class AddWidgetWizard(hildon.WizardDialog):
     
-    def __init__(self, parent, urlIn):
+    def __init__(self, parent, urlIn, titleIn=None):
         # Create a Notebook
         self.notebook = gtk.Notebook()
 
@@ -63,6 +63,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)
@@ -157,8 +159,9 @@ class Download(threading.Thread):
         self.listing.updateFeed(self.key, self.config.getExpiry())
 
         
-class DownloadDialog():
+class DownloadBar(gtk.ProgressBar):
     def __init__(self, parent, listing, listOfKeys, config):
+        gtk.ProgressBar.__init__(self)
         self.listOfKeys = listOfKeys[:]
         self.listing = listing
         self.total = len(self.listOfKeys)
@@ -166,22 +169,23 @@ class DownloadDialog():
         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.progress = gtk.ProgressBar()
+            #self.waitingWindow = hildon.Note("cancel", parent, "Downloading",
+            #                     progressbar=self.progress)
+            self.set_text("Downloading")
             self.fraction = 0
-            self.progress.set_fraction(self.fraction)
+            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:
+            #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()
-        
+            #    time.sleep(0.1)
+            #self.waitingWindow.destroy()
+
     def update_progress_bar(self):
         #self.progress_bar.pulse()
         if threading.activeCount() < 4:
@@ -190,18 +194,22 @@ class DownloadDialog():
             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, self.config)
-                download.start()
+                if not self.listing.getCurrentlyDisplayedFeed() == key:
+                    # Check if the feed is being displayed
+                    download = Download(self.listing, key, self.config)
+                    download.start()
                 return True
             elif threading.activeCount() > 1:
                 return True
             else:
-                self.waitingWindow.destroy()
+                #self.waitingWindow.destroy()
+                #self.destroy()
+                self.emit("download-done", "success")
                 return False 
         return True
     
@@ -222,6 +230,11 @@ class SortList(gtk.Dialog):
         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.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.set_label("Delete")
@@ -310,6 +323,19 @@ class SortList(gtk.Dialog):
             self.listing.removeFeed(key)
         self.refreshList()
 
+    def buttonEdit(self, button):
+        key = self.getSelectedItem()
+        if not key == None:
+            wizard = AddWidgetWizard(self.window, 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()
+        self.displayListing()
+
     def buttonDone(self, *args):
         self.destroy()
                
@@ -334,8 +360,11 @@ class DisplayArticle(hildon.StackableWindow):
         self.gestureId = 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)
+        if not key == "1295627ef630df9d239abeb0ba631c3f":
+            # 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)
@@ -425,13 +454,15 @@ class DisplayFeed(hildon.StackableWindow):
         self.key=key
         self.config = config
         
+        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)
+        #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")
@@ -447,7 +478,8 @@ class DisplayFeed(hildon.StackableWindow):
     def destroyWindow(self, *args):
         self.emit("feed-closed", self.key)
         self.destroy()
-        self.feed.saveFeed(CONFIGDIR)
+        gobject.idle_add(self.feed.saveFeed, CONFIGDIR)
+        self.listing.closeCurrentlyDisplayedFeed()
 
     def displayFeed(self):
         self.vboxFeed = gtk.VBox(False, 10)
@@ -484,17 +516,12 @@ class DisplayFeed(hildon.StackableWindow):
 
     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.ids = []
-        self.ids.append(newDisp.connect("article-closed", self.onArticleClosed))
-        self.ids.append(newDisp.connect("article-next", self.nextArticle))
-        self.ids.append(newDisp.connect("article-previous", self.previousArticle))
         stack = hildon.WindowStack.get_default()
         if previous:
-            tmp = stack.pop(1)
-            stack.push_list([newDisp, tmp[0]])
-            #del tmp
-            newDisp.show_all()
-            gobject.timeout_add(500, self.destroyArticle, tmp[0])
+            tmp = stack.peek()
+            stack.pop_and_push(1, newDisp, tmp)
+            newDisp.show()
+            gobject.timeout_add(200, self.destroyArticle, tmp)
             #print "previous"
             self.disp = newDisp
             
@@ -511,12 +538,7 @@ class DisplayFeed(hildon.StackableWindow):
             #self.disp = newDisp
             newDisp.show_all()
             if type(self.disp).__name__ == "DisplayArticle":
-                #tmp = stack.pop(2)
-                #stack.push(self.disp)
-                #stack.pop_and_push(1)
-                #self.disp.hide()
-                #print "Done"
-                gobject.timeout_add(500, self.destroyArticle, self.disp)
+                gobject.timeout_add(200, self.destroyArticle, self.disp)
             self.disp = newDisp
             #self.disp.show_all()
             #if not self.disp == False:
@@ -524,6 +546,11 @@ class DisplayFeed(hildon.StackableWindow):
         else:
             self.disp = newDisp
             self.disp.show_all()
+        
+        self.ids = []
+        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 destroyArticle(self, handle):
         handle.destroyWindow()
@@ -545,11 +572,11 @@ class DisplayFeed(hildon.StackableWindow):
         label.modify_font(pango.FontDescription(self.config.getReadFont()))
         self.buttons[index].show()
 
-    def button_update_clicked(self, button):
-        disp = DownloadDialog(self, self.listing, [self.key,], self.config )       
+    #def button_update_clicked(self, button):
+    #    bar = DownloadBar(self, self.listing, [self.key,], self.config )       
         #self.feed.updateFeed()
-        self.clear()
-        self.displayFeed()
+    #    self.clear()
+    #    self.displayFeed()
         
     def buttonReadAllClicked(self, button):
         for index in range(self.feed.getNumberOfEntries()):
@@ -561,13 +588,23 @@ class DisplayFeed(hildon.StackableWindow):
 
 class FeedingIt:
     def __init__(self):
-        self.listing = Listing(CONFIGDIR)
-        
         # Init the windows
         self.window = hildon.StackableWindow()
-        self.config = Config(self.window, CONFIGDIR+"config.ini")
         self.window.set_title("FeedingIt")
-        FremantleRotation("FeedingIt", main_window=self.window)
+        hildon.hildon_gtk_window_set_progress_indicator(self.window, 1)
+        self.pannableListing = gtk.Label("Loading...")
+        self.window.add(self.pannableListing)
+        self.window.show_all()
+        self.config = Config(self.window, CONFIGDIR+"config.ini")
+        gobject.idle_add(self.createWindow)
+        
+    def createWindow(self):
+        self.listing = Listing(CONFIGDIR)
+        
+        self.downloadDialog = False
+        self.orientation = FremantleRotation("FeedingIt", main_window=self.window)
+        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)
@@ -603,12 +640,13 @@ class FeedingIt:
         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)
 
 
     def button_export_clicked(self, button):
@@ -635,16 +673,26 @@ class FeedingIt:
             (title, url) = wizard.getData()
             if (not title == '') and (not url == ''): 
                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.config )           
+        if not type(self.downloadDialog).__name__=="DownloadBar":
+            self.downloadDialog = DownloadBar(self.window, self.listing, self.listing.getListOfFeeds(), self.config )
+            self.downloadDialog.connect("download-done", self.onDownloadsDone)
+            self.vboxListing.pack_start(self.downloadDialog)
+            self.pannableListing.show_all()
+        #self.displayListing()
+
+    def onDownloadsDone(self, *widget):
+        self.downloadDialog.destroy()
+        self.downloadDialog = False
         self.displayListing()
 
     def button_preferences_clicked(self, button):
         dialog = self.config.createDialog()
-        dialog.connect("destroy", self.checkAutoUpdate)
+        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 +"?")
@@ -667,7 +715,9 @@ 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)
             button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT,
                               hildon.BUTTON_ARRANGEMENT_VERTICAL)
@@ -675,8 +725,11 @@ class FeedingIt:
                             + str(self.listing.getFeedNumberOfUnreadItems(key)) + " 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.vboxListing.pack_end(button) #, expand=False)
             self.buttons[key] = button
+            
+        if type(self.downloadDialog).__name__=="DownloadBar":
+            self.vboxListing.pack_start(self.downloadDialog)
         self.window.add(self.pannableListing)
         self.window.show_all()
 
@@ -695,6 +748,10 @@ class FeedingIt:
         gtk.main()
         self.listing.saveConfig()
 
+    def prefsClosed(self, *widget):
+        self.orientation.set_mode(self.config.getOrientation())
+        self.checkAutoUpdate()
+
     def checkAutoUpdate(self, *widget):
         if self.config.isAutoUpdateEnabled():
             if not self.autoupdate:
@@ -717,6 +774,7 @@ if __name__ == "__main__":
     gobject.signal_new("article-closed", 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:

diff --git a/src/config.py b/src/config.py
index 91be2dc..0f9263c 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -29,9 +29,9 @@ import ConfigParser
 import gobject
 
 section = "FeedingIt"
-ranges = { "updateInterval":[0.02, 0.5, 1, 2, 4, 12, 24], "expiry":[24, 48, 72], "fontSize":range(12,24) }
-titles = {"updateInterval":"Auto-update Interval", "expiry":"Expiry For Articles", "fontSize":"Font Size For Article Listing"}
-subtitles = {"updateInterval":"Update every %s hours", "expiry":"Delete articles after %s hours", "fontSize":"%s pixels"}
+ranges = { "updateInterval":[0.02, 0.5, 1, 2, 4, 12, 24], "expiry":[24, 48, 72], "fontSize":range(12,24), "orientation":["Automatic", "Landscape", "Portrait"]}
+titles = {"updateInterval":"Auto-update Interval", "expiry":"Expiry For Articles", "fontSize":"Font Size For Article Listing", "orientation":"Display Orientation"}
+subtitles = {"updateInterval":"Update every %s hours", "expiry":"Delete articles after %s hours", "fontSize":"%s pixels", "orientation":"%s"}
 
 class Config():
     def __init__(self, parent, configFilename):
@@ -45,7 +45,7 @@ class Config():
         self.window = gtk.Dialog("Preferences", self.parent)
         #self.vbox = gtk.VBox(False, 10)
         self.buttons = {}
-        for setting in ["fontSize", "expiry", "updateInterval"]:
+        for setting in ["fontSize", "expiry", "orientation", "updateInterval",]:
             picker = hildon.PickerButton(gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
             selector = self.create_selector(ranges[setting], setting)
             picker.set_selector(selector)
@@ -100,11 +100,13 @@ class Config():
             self.config["expiry"] = configParser.getint(section, "expiry")
             self.config["autoupdate"] = configParser.getboolean(section, "autoupdate")
             self.config["updateInterval"] = configParser.getfloat(section, "updateInterval")
+            self.config["orientation"] = configParser.get(section, "orientation")
         except:
             self.config["fontSize"] = 16
             self.config["expiry"] = 24
             self.config["autoupdate"] = False
             self.config["updateInterval"] = 4
+            self.config["orientation"] = "Automatic"
         
     def saveConfig(self):
         configParser = ConfigParser.RawConfigParser()
@@ -113,6 +115,7 @@ class Config():
         configParser.set(section, 'expiry', str(self.config["expiry"]))
         configParser.set(section, 'autoupdate', str(self.config["autoupdate"]))
         configParser.set(section, 'updateInterval', str(self.config["updateInterval"]))
+        configParser.set(section, 'orientation', str(self.config["orientation"]))
 
         # Writing our configuration file
         file = open(self.configFilename, 'wb')
@@ -144,4 +147,6 @@ class Config():
     def getReadFont(self):
         return "sans %s" % self.config["fontSize"]
     def getUnreadFont(self):
-        return "sans bold %s" % self.config["fontSize"]
\ No newline at end of file
+        return "sans bold %s" % self.config["fontSize"]
+    def getOrientation(self):
+        return ranges["orientation"].index(self.config["orientation"])
\ No newline at end of file

diff --git a/src/portrait.py b/src/portrait.py
index 6d43b0e..8e30393 100644 (file)
--- a/src/portrait.py
+++ b/src/portrait.py
@@ -23,10 +23,6 @@ import dbus.glib
 import hildon
 import osso
 
-# Replace this with your own gettext() functionality
-#import gpodder
-#_ = gpodder.gettext
-
 
 class FremantleRotation(object):
     """thp's screen rotation for Maemo 5
@@ -43,7 +39,7 @@ class FremantleRotation(object):
     AUTOMATIC, NEVER, ALWAYS = range(3)
 
     # Human-readable captions for the above constants
-    #MODE_CAPTIONS = (_('Automatic'), _('Landscape'), _('Portrait'))
+    MODE_CAPTIONS = ("Automatic", "Landscape", "Portrait")
 
     # Privately-used constants
     _PORTRAIT, _LANDSCAPE = ('portrait', 'landscape')
@@ -67,9 +63,9 @@ class FremantleRotation(object):
         self._main_window = main_window
         self._stack = hildon.WindowStack.get_default()
         self._mode = -1
-        self._last_dbus_orientation = None
         app_id = '-'.join((app_name, self.__class__.__name__))
         self._osso_context = osso.Context(app_id, version, False)
+        self._last_dbus_orientation = self._get_current_orientation()
         program = hildon.Program.get_instance()
         program.connect('notify::is-topmost', self._on_topmost_changed)
         system_bus = dbus.Bus.get_system()
@@ -79,6 +75,18 @@ class FremantleRotation(object):
                 path='/com/nokia/mce/signal')
         self.set_mode(mode)
 
+    def _get_current_orientation(self):
+        """Return the current orientation
+        
+        Returns portrait if in portrait mode for sure, landscape if
+        in landscape mode or unknown.
+        """
+        if self._send_mce_request('get_device_orientation', True) \
+                == self._PORTRAIT:
+            return self._PORTRAIT
+        else:
+            return self._LANDSCAPE
+
     def get_mode(self):
         """Get the currently-set rotation mode
 
@@ -114,12 +122,13 @@ class FremantleRotation(object):
 
             self._mode = new_mode
 
-    def _send_mce_request(self, request):
+    def _send_mce_request(self, request, wait_reply=False):
         rpc = osso.Rpc(self._osso_context)
-        rpc.rpc_run(self._MCE_SERVICE, \
-                    self._MCE_REQUEST_PATH, \
-                    self._MCE_REQUEST_IF, \
-                    request, \
+        return rpc.rpc_run(self._MCE_SERVICE,
+                    self._MCE_REQUEST_PATH,
+                    self._MCE_REQUEST_IF,
+                    request,
+                    wait_reply=wait_reply,
                     use_system_bus=True)
 
     def _on_topmost_changed(self, program, property_spec):
@@ -168,5 +177,4 @@ class FremantleRotation(object):
             else:
                 # Ignore orientation changes for non-automatic modes, but save
                 # the current orientation for "automatic" mode later on
-                self._last_dbus_orientation = orientation
-
+                self._last_dbus_orientation = orientation
\ No newline at end of file

diff --git a/src/rss.py b/src/rss.py
index 58a14d1..9d1834f 100644 (file)
--- a/src/rss.py
+++ b/src/rss.py
@@ -47,6 +47,9 @@ class Feed:
         self.url = url
         self.updateTime = "Never"
 
+    def editFeed(self, url):
+        self.url = url
+
     def saveFeed(self, configdir):
         file = open(configdir+getId(self.name), "w")
         pickle.dump(self, file )
@@ -143,8 +146,10 @@ class Feed:
         entry = self.entries[index]
         if entry.has_key('content'):
             content = entry.content[0].value
-        else:
+        elif entry.has_key('summary'):
             content = entry.get('summary', '')
+        else:
+            content = entry.get('description', '')
         return content
     
     def getArticle(self, index):
@@ -177,6 +182,7 @@ class ArchivedArticles(Feed):
         entry["downloaded"] = False
         entry["summary"] = '<a href=\"' + link + '\">' + title + "</a>"
         entry["updated_parsed"] = updated_parsed
+        entry["time"] = time.time()
         self.entries.append(entry)
         self.readItems[self.getUniqueId(len(self.entries)-1)] = False
         self.countUnread = self.countUnread + 1
@@ -190,14 +196,16 @@ class ArchivedArticles(Feed):
                     f = urllib2.urlopen(entry["link"])
                     entry["summary"] = f.read()
                     f.close()
-                    entry["downloaded"] = True
-                    entry["time"] = time.time()
+                    if len(entry["summary"]) > 0:
+                        entry["downloaded"] = True
+                        entry["time"] = time.time()
                 except:
                     pass
             currentTime = time.time()
             expiry = float(expiryTime) * 3600
             if currentTime - entry["time"] > expiry:
                 self.entries.remove(entry)
+        self.updateTime = time.asctime()
         self.saveFeed(configdir)
 
     def getArticle(self, index):
@@ -231,6 +239,7 @@ class Listing:
                 self.loadFeed(key)
             except:
                 self.sortedKeys.remove(key)
+        self.closeCurrentlyDisplayedFeed()
         #self.saveConfig()
 
     def addArchivedArticle(self, key, index):
@@ -261,6 +270,11 @@ class Listing:
             
     def updateFeed(self, key, expiryTime=24):
         self.feeds[key].updateFeed(self.configdir, expiryTime)
+        
+    def editFeed(self, key, url, title):
+        self.listOfFeeds[key]["title"] = title
+        self.listOfFeeds[key]["url"] = url
+        self.feeds[key].editFeed(url)
             
     def getFeed(self, key):
         return self.feeds[key]
@@ -286,6 +300,9 @@ class Listing:
             self.sortedKeys.append(getId(title))
             self.saveConfig()
             self.feeds[getId(title)] = Feed(title, url)
+            return True
+        else:
+            return False
         
     def removeFeed(self, key):
         del self.listOfFeeds[key]
@@ -309,4 +326,11 @@ class Listing:
         index = self.sortedKeys.index(key)
         index2 = (index+1)%len(self.sortedKeys)
         self.sortedKeys[index] = self.sortedKeys[index2]
-        self.sortedKeys[index2] = key
\ No newline at end of file
+        self.sortedKeys[index2] = key
+        
+    def setCurrentlyDisplayedFeed(self, key):
+        self.currentlyDisplayedFeed = key
+    def closeCurrentlyDisplayedFeed(self):
+        self.currentlyDisplayedFeed = False
+    def getCurrentlyDisplayedFeed(self):
+        return self.currentlyDisplayedFeed
\ No newline at end of file