iAdd a silent option. - 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 4367ca12c328ba46f3870016280e39c0ef252a0b /scm/zs//commit/4367ca12c328ba46f3870016280e39c0ef252a0b.gph gopher.r-36.net 70 1parent ca39520c711aabb6ec7e506847c0be557771eddc /scm/zs//commit/ca39520c711aabb6ec7e506847c0be557771eddc.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 Oct 2015 16:59:35 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iAdd a silent option. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iThis option is useful for the cronjob output, where you only want to see if Err gopher.r-36.net 70 isomething changed. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i zs | 22 +++++++++++++--------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 13 insertions(+), 9 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/zs b/zs /scm/zs//file/zs.gph gopher.r-36.net 70 i@@ -31,7 +31,7 @@ def sendfeed(db, ufeed): Err gopher.r-36.net 70 i db.cfg["smtppassword"], db.cfg["smtpcmd"], \ Err gopher.r-36.net 70 i db.cfg["smtpuselocal"]) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-def run(db, selfeed=None, dryrun=False): Err gopher.r-36.net 70 i+def run(db, selfeed=None, dryrun=False, onlychanges=False): Err gopher.r-36.net 70 i feeduris = db.listfeeds() Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if feeduris != None and selfeed in feeduris: Err gopher.r-36.net 70 i@@ -44,7 +44,8 @@ def run(db, selfeed=None, dryrun=False): Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i retries = db.getretry(feeduri) Err gopher.r-36.net 70 i estr = None Err gopher.r-36.net 70 i- print("fetch %s" % (feeduri)) Err gopher.r-36.net 70 i+ if onlychanges != True: Err gopher.r-36.net 70 i+ print("fetch %s" % (feeduri)) Err gopher.r-36.net 70 i curfeed = None Err gopher.r-36.net 70 i try: Err gopher.r-36.net 70 i curfeed = feed.fetch(feeduri) Err gopher.r-36.net 70 i@@ -92,7 +93,7 @@ def run(db, selfeed=None, dryrun=False): Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i db.mergefeed(feeduri, curfeed) Err gopher.r-36.net 70 i ufeed = db.unreadarticles(feeduri) Err gopher.r-36.net 70 i- if len(ufeed["articles"]) > 0: Err gopher.r-36.net 70 i+ if len(ufeed["articles"]) > 0 and onlychanges != True: Err gopher.r-36.net 70 i print("cur %d unread %d" % (clen, \ Err gopher.r-36.net 70 i len(ufeed["articles"]))) Err gopher.r-36.net 70 i debug(ufeed) Err gopher.r-36.net 70 i@@ -102,7 +103,7 @@ def run(db, selfeed=None, dryrun=False): Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i def usage(app): Err gopher.r-36.net 70 i app = os.path.basename(app) Err gopher.r-36.net 70 i- sys.stderr.write("usage: %s [-dh] cmd\n" % (app)) Err gopher.r-36.net 70 i+ sys.stderr.write("usage: %s [-dhs] cmd\n" % (app)) Err gopher.r-36.net 70 i sys.exit(1) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i def main(args): Err gopher.r-36.net 70 i@@ -110,16 +111,19 @@ def main(args): Err gopher.r-36.net 70 i retval = 0 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i try: Err gopher.r-36.net 70 i- opts, largs = getopt.getopt(args[1:], "hd") Err gopher.r-36.net 70 i+ opts, largs = getopt.getopt(args[1:], "hds") Err gopher.r-36.net 70 i except getopt.GetoptError as err: Err gopher.r-36.net 70 i print(str(err)) Err gopher.r-36.net 70 i usage(args[0]) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ silent = False Err gopher.r-36.net 70 i for o, a in opts: Err gopher.r-36.net 70 i if o == "-h": Err gopher.r-36.net 70 i usage(args[0]) Err gopher.r-36.net 70 i elif o == "-d": Err gopher.r-36.net 70 i dodebug = True Err gopher.r-36.net 70 i+ elif o == "-s": Err gopher.r-36.net 70 i+ silent = True Err gopher.r-36.net 70 i else: Err gopher.r-36.net 70 i usage(args[0]) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -130,15 +134,15 @@ def main(args): Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if largs[0] == "run": Err gopher.r-36.net 70 i if len(largs) > 1: Err gopher.r-36.net 70 i- run(db, largs[1]) Err gopher.r-36.net 70 i+ run(db, largs[1], onlychanges=silent) Err gopher.r-36.net 70 i else: Err gopher.r-36.net 70 i- run(db) Err gopher.r-36.net 70 i+ run(db, onlychanges=silent) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i elif largs[0] == "dryrun": Err gopher.r-36.net 70 i if len(largs) > 1: Err gopher.r-36.net 70 i- run(db, largs[1], dryrun=True) Err gopher.r-36.net 70 i+ run(db, largs[1], dryrun=True, onlychanges=silent) Err gopher.r-36.net 70 i else: Err gopher.r-36.net 70 i- run(db, dryrun=True) Err gopher.r-36.net 70 i+ run(db, dryrun=True, onlychanges=silent) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i elif largs[0] == "cfg": Err gopher.r-36.net 70 i if len(largs) < 2: Err gopher.r-36.net 70 .