From 9e084bfe7f987f0bf1b319834c3265bff7e97f36 Mon Sep 17 00:00:00 2001
From: cedricbonhomme <devnull@localhost>
Date: Mon, 20 Jun 2011 19:27:27 +0200
Subject: It is now possible to change the logo of a feed anytime via the feed
 management page. The data base is automatically uptodated.

---
 pyAggr3g470r.py | 36 ++++++++++++++++++++++++++++++------
 utils.py        | 13 +++++++++++++
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index 57f2db1f..b9ee6d07 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -643,12 +643,21 @@ class Root:
         #  - feed name;
         #  - URL of the feed (not the site);
         html += "<br />\n<h1>Edit this feed</h1>\n"
-        html += """\n\n<form method=post action="/change_feed_name/"><input type="text" name="new_feed_name" value="" placeholder="Enter a new name." maxlength=2048 autocomplete="on" size="50" /><input type="hidden" name="feed_url" value="%s" /></form>\n""" % \
-                (feed.feed_link,)
-        html += """\n\n<form method=post action="/change_feed_url/"><input type="url" name="new_feed_url" value="" placeholder="Enter a new URL to retrieve articles." maxlength=2048 autocomplete="on" size="50" /><input type="hidden" name="old_feed_url" value="%s" /></form>\n""" % \
-                (feed.feed_link,)
-        html += """\n\n<form method=post action="/change_feed_logo/"><input type="url" name="new_feed_logo" value="" placeholder="Enter the URL of the logo." maxlength=2048 autocomplete="on" size="50" /><input type="hidden" name="feed_url" value="%s" /></form>\n""" % \
-                (feed.feed_link,)
+        html += '\n\n<form method=post action="/change_feed_name/">' + \
+                '<input type="text" name="new_feed_name" value="" ' + \
+                'placeholder="Enter a new name." maxlength=2048 autocomplete="on" size="50" />' + \
+                """<input type="hidden" name="feed_url" value="%s" /></form>\n""" % \
+                    (feed.feed_link,)
+        html += '\n\n<form method=post action="/change_feed_url/">' + \
+                '<input type="url" name="new_feed_url" value="" ' + \
+                'placeholder="Enter a new URL to retrieve articles." maxlength=2048 autocomplete="on" size="50" />' + \
+                """<input type="hidden" name="old_feed_url" value="%s" /></form>\n""" % \
+                    (feed.feed_link,)
+        html += '\n\n<form method=post action="/change_feed_logo/">' + \
+                '<input type="url" name="new_feed_logo" value="" ' + \
+                'placeholder="Enter the URL of the logo." maxlength=2048 autocomplete="on" size="50" />' + \
+                """<input type="hidden" name="feed_url" value="%s" /></form>\n""" % \
+                    (feed.feed_link,)
 
         dic = {}
         dic[feed.feed_id] = self.feeds[feed.feed_id]
@@ -1137,6 +1146,21 @@ class Root:
         return html
 
     change_feed_name.exposed = True
+    
+    def change_feed_logo(self, feed_url, new_feed_logo):
+        """
+        Enables to change the name of a feed.
+        """
+        html = htmlheader()
+        html += htmlnav
+        html += """<div class="left inner">"""
+        utils.change_feed_logo(feed_url, new_feed_logo)
+        html += "<p>The logo of the feed has been changed.</p>"
+        html += "<hr />\n"
+        html += htmlfooter
+        return html
+
+    change_feed_logo.exposed = True
 
 
     def set_max_articles(self, max_nb_articles=1):
diff --git a/utils.py b/utils.py
index 96bfa2c5..dfcad598 100755
--- a/utils.py
+++ b/utils.py
@@ -291,6 +291,19 @@ def change_feed_name(feed_url, new_feed_name):
     except Exception, e:
         print e
 
+def change_feed_logo(feed_url, new_feed_logo):
+    """
+    Change the logo of a feed given in parameter.
+    """
+    try:
+        conn = sqlite3.connect(sqlite_base, isolation_level = None)
+        c = conn.cursor()
+        c.execute('UPDATE feeds SET feed_image_link="' + new_feed_logo + '" WHERE feed_link="' + feed_url +'"')
+        conn.commit()
+        c.close()
+    except Exception, e:
+        print e
+
 def remove_feed(feed_url):
     """
     Remove a feed from the file feed.lst and from the SQLite base.
-- 
cgit