Bug fix: when the database do not exists at first launch.

1 files changed, 8 insertions, 4 deletions

diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index 442cf08f..a9ffd87a 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -89,7 +89,7 @@ class Root:
                     target="_blank"><img src="%s" width="28" height="28" /></a></h2>\n""" % \
                         (rss_feed_id, \
                         self.feeds[rss_feed_id][5].encode('utf-8'), \
-                        self.feeds[rss_feed_id][3].encode('utf-8'), \
+                        utils.remove_html_tags(self.feeds[rss_feed_id][3].encode('utf-8')), \
                         self.feeds[rss_feed_id][4].encode('utf-8'), \
                         self.feeds[rss_feed_id][2].encode('utf-8'))
 
@@ -107,7 +107,8 @@ class Root:
                 html += article[1].encode('utf-8') + \
                         " - " + not_read_begin + \
                         """<a href="/description/%s:%s" rel="noreferrer" target="_blank">%s</a>""" % \
-                                (rss_feed_id, article[0].encode('utf-8'),article[2].encode('utf-8')) + \
+                                (rss_feed_id, article[0].encode('utf-8'), \
+                                    utils.remove_html_tags(article[2].encode('utf-8'))) + \
                         not_read_end + \
                         "<br />\n"
             html += "<br />\n"
@@ -605,8 +606,8 @@ class Root:
         When a change is detected, reload the base.
         """
         mon = gamin.WatchMonitor()
-        mon.watch_file(utils.sqlite_base, self.update)
         time.sleep(10)
+        mon.watch_file(utils.sqlite_base, self.update)
         ret = mon.event_pending()
         try:
             print "Watching %s" % utils.sqlite_base
@@ -647,7 +648,10 @@ if __name__ == '__main__':
     # Point of entry in execution mode
     LOCKER = threading.Lock()
     root = Root()
-    root.update()
+    if not os.path.isfile(utils.sqlite_base):
+        utils.create_base()
+    else:
+        root.update()
     try:
         import gamin
         thread_watch_base = threading.Thread(None, root.watch_base, None, ())