diff --git a/nbresnote.py b/nbresnote.py index 49c1854ae6b6160980f4b9ae0f5cbc8959b2db3f..1d096d241ee832c42827d4ed88052117cd7e6219 100644 --- a/nbresnote.py +++ b/nbresnote.py @@ -1,6 +1,6 @@ import json, base64, os, pickle, datetime, string, re -__version__ = "0.1.4" +__version__ = "0.1.7" ### from ipynb extract markdown and noted output for document organization class nbparser: @@ -16,7 +16,7 @@ class nbparser: self.notebook = json.loads("\n".join(open(path).readlines())) self.outroot = os.path.join(output_root,"source") self.opath = os.path.join(self.outroot, self.folder, self.basename) - os.makedirs(self.opath, exist_ok = True) + self.TOC, self.source = [],[] self.fig, self.code = [], [] self.table = [] @@ -109,6 +109,7 @@ class nbparser: self.save_fig(self.outputpath(fname), data['data'][key]) def save_fig(self, fname, base64fig): + os.makedirs(self.opath, exist_ok = True) with open(fname,"wb") as f: f.write(base64.b64decode(base64fig)) @@ -196,7 +197,7 @@ class nbparser: return s def source_convert(self): - source = [line if not line =="!TOC" else self.toc_source() for line in self.source] # Table of Contents + source = [line if not line =="!TOC" else self.toc_source() for line in self.source if line] # Table of Contents source = "\n\n".join(source) # double bracket to ref @@ -217,10 +218,10 @@ class nbparser: def write_markdown(self): source = self.source_convert() - - ### Write markdown - with open(self.fname,"w") as f: - f.write(source) + if source: + ### Write markdown + with open(self.fname,"w") as f: + f.write(source) def toc_source(TOC): @@ -243,7 +244,8 @@ def daily_note(note_path, check): source = pickle.load(f) mod, record = modified_check(source, check) - write_daily(note_path, mod, record) + if mod: + write_daily(note_path, mod, record) def modified_check(source, check): mod = {} @@ -299,7 +301,12 @@ rm __tmp__files cd wiki git add * +if [ `git diff --cached --name-only| wc -l` -eq 0 ] +then +echo "nothing to commit" +else git commit -m "Auto commit from nbresnote `date +%F`" +fi """ pushsource = """#!/bin/bash