iFixing the deletion of feeds. - zs - Zeitungsschau rss to email converter	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
1Log	/scm/zs//log.gph	gopher.r-36.net	70
1Files	/scm/zs//files.gph	gopher.r-36.net	70
1Refs	/scm/zs//refs.gph	gopher.r-36.net	70
1LICENSE	/scm/zs//file/LICENSE.gph	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1commit 8b3f51dc70e6367c695df26990b403d397c26346	/scm/zs//commit/8b3f51dc70e6367c695df26990b403d397c26346.gph	gopher.r-36.net	70
1parent a8d6277ef2b6adfd085a13ac1d01bd0a054a47a7	/scm/zs//commit/a8d6277ef2b6adfd085a13ac1d01bd0a054a47a7.gph	gopher.r-36.net	70
hAuthor: Christoph Lohmann <20h@r-36.net>	URL:mailto:20h@r-36.net	gopher.r-36.net	70
iDate:   Fri,  2 May 2014 17:15:13 +0200	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iFixing the deletion of feeds.	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iDiffstat:	Err	gopher.r-36.net	70
i  config.mk                           |       3 ++-	Err	gopher.r-36.net	70
i  feeddb.py                           |       3 +++	Err	gopher.r-36.net	70
i  zs.py                               |       7 ++++---	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
i3 files changed, 9 insertions(+), 4 deletions(-)	Err	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1diff --git a/config.mk b/config.mk	/scm/zs//file/config.mk.gph	gopher.r-36.net	70
i@@ -9,5 +9,6 @@ PREFIX = /usr/local	Err	gopher.r-36.net	70
i MANPREFIX = ${PREFIX}/share/man	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i # compiler and linker	Err	gopher.r-36.net	70
i-CC = nuitka --recurse-all	Err	gopher.r-36.net	70
i+CC = nuitka --recurse-all --recurse-directory --show-modules \	Err	gopher.r-36.net	70
i+     --show-progress	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
1diff --git a/feeddb.py b/feeddb.py	/scm/zs//file/feeddb.py.gph	gopher.r-36.net	70
i@@ -148,6 +148,9 @@ class feeddb(object):	Err	gopher.r-36.net	70
i         def delfeed(self, uri):	Err	gopher.r-36.net	70
i                 if uri in self.listfeeds():	Err	gopher.r-36.net	70
i                         del self.feeds[uri]	Err	gopher.r-36.net	70
i+                        return True	Err	gopher.r-36.net	70
i+                else:	Err	gopher.r-36.net	70
i+                        return False	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         def listactivefeeds(self):	Err	gopher.r-36.net	70
i                 rfeeds = []	Err	gopher.r-36.net	70
1diff --git a/zs.py b/zs.py	/scm/zs//file/zs.py.gph	gopher.r-36.net	70
i@@ -14,6 +14,7 @@ import feedemail	Err	gopher.r-36.net	70
i import urllib.error	Err	gopher.r-36.net	70
i import socket	Err	gopher.r-36.net	70
i import http.client	Err	gopher.r-36.net	70
i+import ssl	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i def sendfeed(db, ufeed):	Err	gopher.r-36.net	70
i         feedemail.send(ufeed, db.cfg["email"], db.cfg["smtphost"], \	Err	gopher.r-36.net	70
i@@ -139,8 +140,7 @@ def main(args):	Err	gopher.r-36.net	70
i                 db.addfeed(args[2])	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         elif args[1] == "list":	Err	gopher.r-36.net	70
i-                for f in db.listfeeds():	Err	gopher.r-36.net	70
i-                        print(f)	Err	gopher.r-36.net	70
i+                print("\n".join(db.listfeeds()))	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         elif args[1] == "listuuids":	Err	gopher.r-36.net	70
i                 if len(args) < 3:	Err	gopher.r-36.net	70
i@@ -165,7 +165,8 @@ def main(args):	Err	gopher.r-36.net	70
i         elif args[1] == "del":	Err	gopher.r-36.net	70
i                 if len(args) < 3:	Err	gopher.r-36.net	70
i                         usage(args[0])	Err	gopher.r-36.net	70
i-                db.delfeed(args[1])	Err	gopher.r-36.net	70
i+                if db.delfeed(args[2]) == True:	Err	gopher.r-36.net	70
i+                        print("'%s' has been deleted." % (args[2]))	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         elif args[1] == "reset":	Err	gopher.r-36.net	70
i                 if len(args) < 3:	Err	gopher.r-36.net	70
.