diff --git a/advanced.html b/advanced.html index 222f9eed..b3a9408b 100644 --- a/advanced.html +++ b/advanced.html @@ -7,7 +7,7 @@ - Advanced Usage — jrnl 1.6.5 documentation + Advanced Usage — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle index 4ad44a67..85e93043 100644 Binary files a/docs/_build/doctrees/environment.pickle and b/docs/_build/doctrees/environment.pickle differ diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree index 3967c2cf..3e303c30 100644 Binary files a/docs/_build/doctrees/index.doctree and b/docs/_build/doctrees/index.doctree differ diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo index acbf0d69..c69487a0 100644 --- a/docs/_build/html/.buildinfo +++ b/docs/_build/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 8f6d857a8d7bdd64dbca4bbbad00b7ad +config: cdd3d9dc24c56f542788a30876de826e tags: fbb0d17656682115ca4d033fb2f83ba1 diff --git a/docs/_build/html/advanced.html b/docs/_build/html/advanced.html index 222f9eed..b3a9408b 100644 --- a/docs/_build/html/advanced.html +++ b/docs/_build/html/advanced.html @@ -7,7 +7,7 @@ - Advanced Usage — jrnl 1.6.5 documentation + Advanced Usage — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/html/encryption.html b/docs/_build/html/encryption.html index bd63df57..e3af408a 100644 --- a/docs/_build/html/encryption.html +++ b/docs/_build/html/encryption.html @@ -7,7 +7,7 @@ - Encryption — jrnl 1.6.5 documentation + Encryption — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/html/export.html b/docs/_build/html/export.html index 4b676893..6bc00ebd 100644 --- a/docs/_build/html/export.html +++ b/docs/_build/html/export.html @@ -7,7 +7,7 @@ - Import and Export — jrnl 1.6.5 documentation + Import and Export — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html index a846762e..21b80821 100644 --- a/docs/_build/html/genindex.html +++ b/docs/_build/html/genindex.html @@ -9,7 +9,7 @@ - Index — jrnl 1.6.5 documentation + Index — jrnl 1.6.6 documentation @@ -17,7 +17,7 @@ - + diff --git a/docs/_build/html/installation.html b/docs/_build/html/installation.html index 2e533428..fd217d9c 100644 --- a/docs/_build/html/installation.html +++ b/docs/_build/html/installation.html @@ -7,7 +7,7 @@ - Getting started — jrnl 1.6.5 documentation + Getting started — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv index 0369af57..d824b8a4 100644 Binary files a/docs/_build/html/objects.inv and b/docs/_build/html/objects.inv differ diff --git a/docs/_build/html/overview.html b/docs/_build/html/overview.html index d5f31d1e..22489a56 100644 --- a/docs/_build/html/overview.html +++ b/docs/_build/html/overview.html @@ -7,7 +7,7 @@ - Overview — jrnl 1.6.5 documentation + Overview — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/html/recipes.html b/docs/_build/html/recipes.html index 8e859b5a..cef4180f 100644 --- a/docs/_build/html/recipes.html +++ b/docs/_build/html/recipes.html @@ -7,7 +7,7 @@ - FAQ — jrnl 1.6.5 documentation + FAQ — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html index 00ee48b5..d3799117 100644 --- a/docs/_build/html/search.html +++ b/docs/_build/html/search.html @@ -7,7 +7,7 @@ - Search — jrnl 1.6.5 documentation + Search — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js index 68881ecb..95847d28 100644 --- a/docs/_build/html/searchindex.js +++ b/docs/_build/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({objects:{},terms:{all:[6,0,4,7,5],default_minut:7,steve:[6,7],follow:[6,7],privat:7,depend:1,"2013_06_03_a":4,readabl:[5,4],yve:3,program:2,alberto:3,under:7,sha256:2,thursdai:7,everi:2,string:6,"3am":6,fals:7,faq:[0,3],veri:7,cyan:7,recip:[0,3],flatmat:3,level:7,did:5,list:[6,0,4,5],vector:2,dayon:[0,7,5],timeformat:7,initialis:2,ten:6,sync:[5,7],sign:6,pass:7,what:[0,5],access:7,melo:3,"new":[2,1],ever:2,told:1,hash:2,gener:4,chang:[6,2,3,7],decid:2,bodi:1,met:6,path:7,valu:7,wait:7,convers:2,vacat:5,prior:3,behav:7,chcp:3,implement:7,control:[6,7],linewrap:7,apr:6,app:7,vim:7,releas:0,xdg_config_hom:7,instal:[0,3,1],txt:[6,2,7],mobil:7,quickstart:[0,1],from:[6,5,7],would:7,memori:5,doubl:6,two:6,todai:6,websit:7,live:7,call:1,type:[1,7],until:[6,3,1],more:7,sort:4,flat:7,python:[2,7],henc:7,flag:7,known:[0,3],word:5,hous:1,gabriel:4,work:[6,3,7],can:[1,5,3,4,2,6,7],meet:7,overrid:7,prompt:[6,1,7],fabul:5,tag:[6,0,3,4,7],want:[6,2,3,1,7],plist:7,gcc:1,multipl:7,anoth:2,occur:[6,3,4],write:[6,5,1,7,2],how:[6,5,3,7],instead:7,simpl:[5,4,7],after:7,sundai:6,reflect:5,befor:[6,3,7],beauti:4,date:[6,4,7],end:7,github:4,issu:[0,3],"switch":6,combin:[6,0,3],jrnl:[0,1,2,3,4,5,6,7],enter:[6,2],exclus:6,frontend:7,help:5,becaus:6,untouch:2,still:5,digest:2,perfect:5,gtd:5,thank:3,fix:3,window:3,drawback:7,requir:1,them:[6,5],good:5,"return":1,food:7,timestamp:[6,0,7],dai:[6,5,4,7],initi:2,"break":6,mention:3,macvim:7,now:[6,7],choic:6,name:4,beach:6,crypto:2,separ:7,mode:6,each:[3,4,7],januari:3,unicod:3,my_entri:[6,4],mean:[6,3,7],compil:1,replac:2,individu:[4,7],timelin:4,meta:7,year:[6,5],our:7,girl:5,todo:5,special:[6,5],out:3,variabl:7,encod:3,load:7,your:[0,1,2,4,5,6,7],content:[0,4],print:[6,3,4],lubric:6,occurr:[0,3],advanc:[0,7],given:6,reason:[6,1],base:5,ask:[2,1],"byte":2,bash:7,launch:[6,7],put:5,keep:[6,0,5],filter:[6,0,3],thing:[5,3],isn:5,summari:3,imposs:7,frequent:4,first:[2,3,1,7],origin:2,directli:[6,5],mvim:7,wast:5,mai:5,alreadi:2,done:5,open:2,fanci:5,differ:7,convent:6,width:7,top:7,least:[5,7],too:5,tom:6,"final":3,store:[0,2,5],shell:[6,3,7],option:[6,5,3,1,7],specifi:[6,2,4,7],"short":[3,4],haven:5,ipad:5,hashlib:2,grep:3,whenev:[6,2],charact:[3,7],project:6,sai:7,comput:2,argument:[6,4],dash:6,packag:3,have:[5,1,7,2],seem:7,imagin:5,built:7,equival:6,note:[6,1,7],also:[6,5,1,7,2],without:6,which:[6,3],environ:3,singl:[6,7],sure:[6,7],unless:1,track:[6,5],favourit:[6,3],who:5,most:[6,3,4,7],render:4,cipher:2,icloud:7,why:[0,4,5],don:[6,2,7],doc:7,later:2,doe:[3,7],pipe:3,"10am":7,clean:1,pouplard:3,text:[0,4,2,7,5],find:3,current:2,onli:[6,5,3,4],explicitli:1,locat:[6,7],just:[6,5,1,7],pretti:4,configur:[6,0,1,7],should:[2,1],jan:3,folder:[5,7],hit:1,"2013_06_07_dinner":4,get:[0,1,5,3,4,7],jrnl_conf:7,endless:7,bar:6,noon:6,sha:2,integr:[0,7],contain:[6,3],buscemi:6,where:[3,1],view:[6,0],set:7,habit:5,see:[6,7],result:[1,7],close:7,best:6,wonder:6,someth:3,sublim:7,won:[2,7],"import":[6,0,4,2],kei:[2,7],complement:5,entir:4,solv:3,both:[6,3,7],instant:5,howev:7,forgotten:5,pdf:4,com:7,comment:7,assur:5,simpli:[6,2],point:[2,7],overview:[0,5],arbitrarili:6,dayoneapp:7,suppli:[6,7],my_recip:7,assum:6,stamp:1,quotat:7,three:7,mark:[6,1,7],json:[0,4,7],much:5,interpret:[1,7],basic:[6,0],my_journ:2,life:6,decrypt:[0,7,2],ani:[6,2],"5u8ns4gx82":7,last:[6,7],present:7,look:[6,4,1,7],jrnl_config:7,plain:[5,2],plain_text_copi:2,defin:7,"while":7,abov:4,"_no_":6,pinki:6,readm:4,non:3,ascii:3,sever:4,make:[6,5,4,1,7],mayb:2,same:[2,3,4],funni:6,html:4,sentenc:1,document:[5,7],extern:[1,7],yesterdai:[6,1],recent:3,off:7,entri:[0,1,3,4,6,7],markup:4,well:1,spent:1,person:5,exampl:[4,7],command:[6,0,4,7,5],thi:[1,5,3,4,2,6,7],choos:2,everyth:[6,1,7],latest:6,summer:5,execut:7,codepag:3,rest:1,markdown:[0,4],human:[5,4],languag:4,had:6,add:6,book:1,input:[6,7],save:7,smart:[6,0],applic:[5,7],march:6,format:[4,7],read:[5,2],intuit:7,five:6,bit:5,password:[0,2],like:[6,4,3,1,7],specif:7,filenam:2,whitespac:6,manual:[0,1,7,2],either:6,output:[4,7],old:5,often:3,some:3,dead:7,"export":[6,0,4],worlddomin:6,librari:[1,7],avoid:7,leav:2,anna:6,refer:7,limitless:5,run:[2,3,1],journal:[0,1,2,3,4,5,6,7],usag:[6,0,7],tagsymbol:7,although:[6,7],"_jrnl_":[3,7],"6am":6,plai:5,surround:6,chop:7,mondai:6,within:3,profession:5,compos:[6,0,1,7],wrap:7,my_password:2,subl:7,mere:7,wai:[6,7],aren:5,support:[2,7],"long":[5,7],start:[6,0,1,7],reli:3,editor:[6,1,7],keychain:[0,2],mode_cbc:2,line:[6,0,3,7,5],"true":7,count:4,made:5,algorithm:2,whether:[2,1,7],wish:1,displai:[6,3,4,7],below:7,highlight:7,problem:3,default_hour:7,creat:[4,1,7],pycyrypto:1,exist:2,file:[0,1,2,4,5,6,7],pip:1,happen:6,again:2,mutual:6,encrypt:[0,1,2,3,5,7],titl:[4,1],when:[5,2],virtual:3,"default":7,other:4,sick:1,peopl:[6,5],you:[1,5,3,4,2,6,7],intention:6,nice:[5,4],pineappl:6,star:[6,0,3],symbol:[6,7],asterisk:6,consid:5,dropbox:[5,7],pycrypto:[3,1],directori:4,time:[1,5,4,2,6,7],scroll:7},objtypes:{},titles:["jrnl: The command-line journal","Getting started","Encryption","FAQ","Import and Export","Overview","Basic Usage","Advanced Usage"],objnames:{},filenames:["index","installation","encryption","recipes","export","overview","usage","advanced"]}) \ No newline at end of file +Search.setIndex({objects:{},terms:{all:[6,0,4,7,2],default_minut:7,steve:[6,7],follow:[6,7],privat:7,depend:1,"2013_06_03_a":4,readabl:[2,4],yve:3,program:5,alberto:3,under:7,sha256:5,thursdai:7,everi:5,string:6,"3am":6,fals:7,faq:[0,3],veri:7,untouch:5,recip:[0,3],flatmat:3,level:7,did:2,list:[6,0,4,2],vector:5,dayon:[0,7,2],timeformat:7,initialis:5,ten:6,sync:[2,7],sign:6,pass:7,what:[0,2],access:7,melo:3,"new":[5,1],ever:5,told:1,hash:5,gener:4,chang:[6,5,3,7],decid:5,bodi:1,met:6,path:7,valu:7,wait:7,convers:5,vacat:2,prior:3,behav:7,chcp:3,implement:7,control:[6,7],linewrap:7,apr:6,app:7,vim:7,ask:[5,1],xdg_config_hom:7,instal:[0,3,1],txt:[6,5,7],mobil:7,quickstart:[0,1],from:[6,2,7],would:7,memori:2,doubl:6,two:6,todai:6,websit:7,live:7,call:1,type:[1,7],until:[6,3,1],more:7,sort:4,flat:7,python:[5,7],henc:7,flag:7,known:[0,3],word:2,hous:1,gabriel:4,work:[6,3,7],can:[1,5,3,4,2,6,7],meet:7,overrid:7,prompt:[6,1,7],fabul:2,tag:[6,0,3,4,7],want:[6,5,3,1,7],plist:7,gcc:1,multipl:7,anoth:5,occur:[6,3,4],write:[6,5,1,7,2],how:[6,2,3,7],instead:7,beach:6,after:7,sundai:6,reflect:2,befor:[6,3,7],beauti:4,mai:2,end:7,"short":[3,4],issu:[0,3],"switch":6,environ:3,jrnl:[0,1,2,3,4,5,6,7],enter:[6,5],exclus:6,frontend:7,help:2,becaus:6,cyan:7,still:2,digest:5,perfect:2,gtd:2,thank:3,fix:3,window:3,drawback:7,requir:1,them:[6,2],good:2,"return":1,food:7,timestamp:[6,0,7],dai:[6,2,4,7],initi:5,"break":6,mention:3,macvim:7,now:[6,7],choic:6,name:4,simpl:[2,4,7],crypto:5,separ:7,mode:6,each:[3,4,7],januari:3,unicod:3,my_entri:[6,4],mean:[6,3,7],compil:1,replac:5,individu:[4,7],timelin:4,meta:7,year:[6,2],our:7,girl:2,todo:2,special:[6,2],out:3,variabl:7,mere:7,content:[0,4],print:[6,3,4],lubric:6,occurr:[0,3],advanc:[0,7],given:6,reason:[6,1],base:2,releas:0,"byte":5,bash:7,launch:[6,7],put:2,keep:[6,0,2],filter:[6,0,3],thing:[2,3],isn:2,summari:3,imposs:7,frequent:4,first:[5,3,1,7],origin:5,directli:[6,2],mvim:7,wast:2,date:[6,4,7],alreadi:5,done:2,open:5,fanci:2,differ:7,convent:6,start:[6,0,1,7],top:7,least:[2,7],too:2,tom:6,"final":3,store:[0,2,5],shell:[6,3,7],option:[6,2,3,1,7],specifi:[6,5,4,7],github:4,haven:2,ipad:2,hashlib:5,grep:3,whenev:[6,5],charact:[3,7],project:6,sai:7,comput:5,ani:[6,5],dash:6,packag:3,have:[5,1,7,2],seem:7,imagin:2,built:7,equival:6,note:[6,1,7],also:[6,5,1,7,2],exampl:[4,7],which:[6,3],combin:[6,0,3],singl:[6,7],sure:[6,7],unless:1,track:[6,2],favourit:[6,3],who:2,most:[6,3,4,7],render:4,cipher:5,icloud:7,why:[0,4,2],don:[6,5,7],doc:7,later:5,doe:[3,7],pipe:3,"10am":7,clean:1,pouplard:3,summer:2,text:[2,0,4,7,5],find:3,current:5,onli:[6,2,3,4],explicitli:1,locat:[6,7],execut:7,pretti:4,configur:[6,0,1,7],should:[5,1],jan:3,folder:[2,7],hit:1,"2013_06_07_dinner":4,get:[0,1,2,3,4,7],jrnl_conf:7,endless:7,bar:6,sha:5,integr:[0,7],contain:[6,3],buscemi:6,where:[3,1],view:[6,0],set:7,habit:2,see:[6,7],result:[1,7],close:7,best:6,wonder:6,profession:2,someth:3,sublim:7,won:[5,7],"import":[6,0,4,5],kei:[5,7],complement:2,entir:4,solv:3,both:[6,3,7],instant:2,howev:7,forgotten:2,pdf:4,com:7,comment:7,assur:2,simpli:[6,5],point:[5,7],overview:[0,2],arbitrarili:6,dayoneapp:7,suppli:[6,7],my_recip:7,assum:6,stamp:1,quotat:7,three:7,mark:[6,1,7],json:[0,4,7],much:2,interpret:[1,7],basic:[6,0],my_journ:5,life:6,wish:1,pycyrypto:1,argument:[6,4],"5u8ns4gx82":7,last:[6,7],present:7,look:[6,4,1,7],jrnl_config:7,plain:[5,2],plain_text_copi:5,defin:7,"while":7,abov:4,"_no_":6,pinki:6,readm:4,non:3,ascii:3,sever:4,make:[6,4,1,7,2],format:[4,7],same:[5,3,4],funni:6,html:4,sentenc:1,document:[2,7],extern:[1,7],yesterdai:[6,1],recent:3,off:7,entri:[0,1,3,4,6,7],markup:4,well:1,spent:1,person:2,without:6,command:[6,0,4,7,2],thi:[1,5,3,4,2,6,7],choos:5,everyth:[6,1,7],latest:6,load:7,just:[6,2,1,7],codepag:3,rest:1,markdown:[0,4],human:[2,4],languag:4,had:6,add:6,other:4,input:[6,7],save:7,smart:[6,0],applic:[2,7],march:6,mayb:5,read:[5,2],intuit:7,five:6,bit:2,password:[0,5],like:[6,4,3,1,7],specif:7,filenam:5,whitespac:6,manual:[0,1,7,5],either:6,output:[4,7],old:2,often:3,some:3,dead:7,"export":[6,0,4],librari:[1,7],avoid:7,leav:5,anna:6,refer:7,limitless:2,run:[5,3,1],journal:[0,1,2,3,4,5,6,7],usag:[6,0,7],tagsymbol:7,although:[6,7],"_jrnl_":[3,7],"6am":6,plai:2,surround:6,chop:7,consid:2,within:3,encod:3,compos:[6,0,1,7],wrap:7,my_password:5,subl:7,your:[0,1,2,4,5,6,7],wai:[6,7],aren:2,support:[5,7],"long":[2,7],width:7,reli:3,editor:[6,1,7],keychain:[0,5],mode_cbc:5,line:[6,0,3,7,2],"true":7,count:4,made:2,pycrypto:[3,1],whether:[5,1,7],worlddomin:6,displai:[6,3,4,7],below:7,highlight:7,problem:3,default_hour:7,creat:[4,1,7],decrypt:[0,7,5],exist:5,file:[0,1,2,4,5,6,7],pip:1,happen:6,again:5,mutual:6,encrypt:[0,1,2,3,5,7],titl:[4,1],when:[5,2],virtual:3,"default":7,book:1,sick:1,peopl:[6,2],you:[1,5,3,4,2,6,7],intention:6,nice:[2,4],pineappl:6,star:[6,0,3],symbol:[6,7],asterisk:6,mondai:6,dropbox:[2,7],algorithm:5,directori:4,scroll:7,time:[1,5,4,2,6,7],noon:6},objtypes:{},titles:["jrnl: The command-line journal","Getting started","Overview","FAQ","Import and Export","Encryption","Basic Usage","Advanced Usage"],objnames:{},filenames:["index","installation","overview","recipes","export","encryption","usage","advanced"]}) \ No newline at end of file diff --git a/docs/_build/html/usage.html b/docs/_build/html/usage.html index 2968e9d5..0aeb93f1 100644 --- a/docs/_build/html/usage.html +++ b/docs/_build/html/usage.html @@ -7,7 +7,7 @@ - Basic Usage — jrnl 1.6.5 documentation + Basic Usage — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/encryption.html b/encryption.html index bd63df57..e3af408a 100644 --- a/encryption.html +++ b/encryption.html @@ -7,7 +7,7 @@ - Encryption — jrnl 1.6.5 documentation + Encryption — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/export.html b/export.html index 4b676893..6bc00ebd 100644 --- a/export.html +++ b/export.html @@ -7,7 +7,7 @@ - Import and Export — jrnl 1.6.5 documentation + Import and Export — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/genindex.html b/genindex.html index a846762e..21b80821 100644 --- a/genindex.html +++ b/genindex.html @@ -9,7 +9,7 @@ - Index — jrnl 1.6.5 documentation + Index — jrnl 1.6.6 documentation @@ -17,7 +17,7 @@ - + diff --git a/installation.html b/installation.html index 2e533428..fd217d9c 100644 --- a/installation.html +++ b/installation.html @@ -7,7 +7,7 @@ - Getting started — jrnl 1.6.5 documentation + Getting started — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/jrnl/Entry.pyc b/jrnl/Entry.pyc index 6b684aa7..430bd812 100644 Binary files a/jrnl/Entry.pyc and b/jrnl/Entry.pyc differ diff --git a/jrnl/Journal.pyc b/jrnl/Journal.pyc index 159cf35b..5ed2925a 100644 Binary files a/jrnl/Journal.pyc and b/jrnl/Journal.pyc differ diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 81d5e4ab..ca25074f 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -7,11 +7,11 @@ jrnl is a simple journal application for your command line. """ __title__ = 'jrnl' -__version__ = '1.6.5' +__version__ = '1.6.6' __author__ = 'Manuel Ebert' __license__ = 'MIT License' __copyright__ = 'Copyright 2013 Manuel Ebert' from . import Journal -from . import jrnl -from .jrnl import cli +from . import cli +from .cli import run diff --git a/jrnl/__init__.pyc b/jrnl/__init__.pyc index 86f78e11..1fb4e09a 100644 Binary files a/jrnl/__init__.pyc and b/jrnl/__init__.pyc differ diff --git a/jrnl/cli.py b/jrnl/cli.py new file mode 100644 index 00000000..b53d7b33 --- /dev/null +++ b/jrnl/cli.py @@ -0,0 +1,241 @@ +#!/usr/bin/env python +# encoding: utf-8 + +""" + jrnl + + license: MIT, see LICENSE for more details. +""" + +try: + from . import Journal + from . import util + from . import exporters + from . import install + from . import __version__ +except (SystemError, ValueError): + import Journal + import util + import exporters + import install +import jrnl +import os +import tempfile +import subprocess +import argparse +import sys + +xdg_config = os.environ.get('XDG_CONFIG_HOME') +CONFIG_PATH = os.path.join(xdg_config, "jrnl") if xdg_config else os.path.expanduser('~/.jrnl_config') +PYCRYPTO = install.module_exists("Crypto") + + +def parse_args(args=None): + parser = argparse.ArgumentParser() + parser.add_argument('-v', '--version', dest='version', action="store_true", help="prints version information and exits") + + composing = parser.add_argument_group('Composing', 'To write an entry simply write it on the command line, e.g. "jrnl yesterday at 1pm: Went to the gym."') + composing.add_argument('text', metavar='', nargs="*") + + reading = parser.add_argument_group('Reading', 'Specifying either of these parameters will display posts of your journal') + reading.add_argument('-from', dest='start_date', metavar="DATE", help='View entries after this date') + reading.add_argument('-until', '-to', dest='end_date', metavar="DATE", help='View entries before this date') + reading.add_argument('-and', dest='strict', action="store_true", help='Filter by tags using AND (default: OR)') + reading.add_argument('-starred', dest='starred', action="store_true", help='Show only starred entries') + reading.add_argument('-n', dest='limit', default=None, metavar="N", help='Shows the last n entries matching the filter', nargs="?", type=int) + + exporting = parser.add_argument_group('Export / Import', 'Options for transmogrifying your journal') + exporting.add_argument('--short', dest='short', action="store_true", help='Show only titles or line containing the search tags') + exporting.add_argument('--tags', dest='tags', action="store_true", help='Returns a list of all tags and number of occurences') + exporting.add_argument('--export', metavar='TYPE', dest='export', help='Export your journal to Markdown, JSON or Text', default=False, const=None) + exporting.add_argument('-o', metavar='OUTPUT', dest='output', help='The output of the file can be provided when using with --export', default=False, const=None) + exporting.add_argument('--encrypt', metavar='FILENAME', dest='encrypt', help='Encrypts your existing journal with a new password', nargs='?', default=False, const=None) + exporting.add_argument('--decrypt', metavar='FILENAME', dest='decrypt', help='Decrypts your journal and stores it in plain text', nargs='?', default=False, const=None) + exporting.add_argument('--delete-last', dest='delete_last', help='Deletes the last entry from your journal file.', action="store_true") + + return parser.parse_args(args) + +def guess_mode(args, config): + """Guesses the mode (compose, read or export) from the given arguments""" + compose = True + export = False + if args.decrypt is not False or args.encrypt is not False or args.export is not False or any((args.short, args.tags, args.delete_last)): + compose = False + export = True + elif any((args.start_date, args.end_date, args.limit, args.strict, args.starred)): + # Any sign of displaying stuff? + compose = False + elif args.text and all(word[0] in config['tagsymbols'] for word in " ".join(args.text).split()): + # No date and only tags? + compose = False + + return compose, export + +def get_text_from_editor(config): + tmpfile = os.path.join(tempfile.gettempdir(), "jrnl") + subprocess.call(config['editor'].split() + [tmpfile]) + if os.path.exists(tmpfile): + with open(tmpfile) as f: + raw = f.read() + os.remove(tmpfile) + else: + util.prompt('[Nothing saved to file]') + raw = '' + + return raw + + +def encrypt(journal, filename=None): + """ Encrypt into new file. If filename is not set, we encrypt the journal file itself. """ + password = util.getpass("Enter new password: ") + journal.make_key(password) + journal.config['encrypt'] = True + journal.write(filename) + if util.yesno("Do you want to store the password in your keychain?", default=True): + util.set_keychain(journal.name, password) + util.prompt("Journal encrypted to {0}.".format(filename or journal.config['journal'])) + +def decrypt(journal, filename=None): + """ Decrypts into new file. If filename is not set, we encrypt the journal file itself. """ + journal.config['encrypt'] = False + journal.config['password'] = "" + journal.write(filename) + util.prompt("Journal decrypted to {0}.".format(filename or journal.config['journal'])) + +def touch_journal(filename): + """If filename does not exist, touch the file""" + if not os.path.exists(filename): + util.prompt("[Journal created at {0}]".format(filename)) + open(filename, 'a').close() + +def update_config(config, new_config, scope, force_local=False): + """Updates a config dict with new values - either global if scope is None + or config['journals'][scope] is just a string pointing to a journal file, + or within the scope""" + if scope and type(config['journals'][scope]) is dict: # Update to journal specific + config['journals'][scope].update(new_config) + elif scope and force_local: # Convert to dict + config['journals'][scope] = {"journal": config['journals'][scope]} + config['journals'][scope].update(new_config) + else: + config.update(new_config) + +def run(manual_args=None): + if not os.path.exists(CONFIG_PATH): + config = install.install_jrnl(CONFIG_PATH) + else: + config = util.load_and_fix_json(CONFIG_PATH) + install.upgrade_config(config, config_path=CONFIG_PATH) + + original_config = config.copy() + # check if the configuration is supported by available modules + if config['encrypt'] and not PYCRYPTO: + util.prompt("According to your jrnl_conf, your journal is encrypted, however PyCrypto was not found. To open your journal, install the PyCrypto package from http://www.pycrypto.org.") + sys.exit(1) + + args = parse_args(manual_args) + + if args.version: + print("{0} version {1}".format(jrnl.__title__, jrnl.__version__)) + sys.exit(0) + + # If the first textual argument points to a journal file, + # use this! + journal_name = args.text[0] if (args.text and args.text[0] in config['journals']) else 'default' + if journal_name is not 'default': + args.text = args.text[1:] + journal_conf = config['journals'].get(journal_name) + if type(journal_conf) is dict: # We can override the default config on a by-journal basis + config.update(journal_conf) + else: # But also just give them a string to point to the journal file + config['journal'] = journal_conf + config['journal'] = os.path.expanduser(config['journal']) + touch_journal(config['journal']) + mode_compose, mode_export = guess_mode(args, config) + + # open journal file or folder + if os.path.isdir(config['journal']): + if config['journal'].strip("/").endswith(".dayone") or \ + "entries" in os.listdir(config['journal']): + journal = Journal.DayOne(**config) + else: + util.prompt("[Error: {0} is a directory, but doesn't seem to be a DayOne journal either.".format(config['journal'])) + sys.exit(1) + else: + journal = Journal.Journal(journal_name, **config) + + if "win32" in sys.platform: + # for Windows systems + _exit_multiline_code = "on a blank line, press Ctrl+Z and then Enter" + else: + # for *nix systems (and others?) + _exit_multiline_code = "press Ctrl+D" + + if mode_compose and not args.text: + if not sys.stdin.isatty(): + # Piping data into jrnl + raw = util.py23_read() + elif config['editor']: + raw = get_text_from_editor(config) + else: + raw = util.py23_read("[Compose Entry; " + _exit_multiline_code + " to finish writing]\n") + if raw: + args.text = [raw] + else: + mode_compose = False + + # Writing mode + if mode_compose: + raw = " ".join(args.text).strip() + if util.PY2 and type(raw) is not unicode: + raw = raw.decode(sys.getfilesystemencoding()) + entry = journal.new_entry(raw) + util.prompt("[Entry added to {0} journal]".format(journal_name)) + journal.write() + else: + journal.filter(tags=args.text, + start_date=args.start_date, end_date=args.end_date, + strict=args.strict, + short=args.short, + starred=args.starred) + journal.limit(args.limit) + + # Reading mode + if not mode_compose and not mode_export: + print(journal.pprint()) + + # Various export modes + elif args.short: + print(journal.pprint(short=True)) + + elif args.tags: + print(exporters.to_tag_list(journal)) + + elif args.export is not False: + print(exporters.export(journal, args.export, args.output)) + + elif (args.encrypt is not False or args.decrypt is not False) and not PYCRYPTO: + util.prompt("PyCrypto not found. To encrypt or decrypt your journal, install the PyCrypto package from http://www.pycrypto.org.") + + elif args.encrypt is not False: + encrypt(journal, filename=args.encrypt) + # Not encrypting to a separate file: update config! + if not args.encrypt: + update_config(original_config, {"encrypt": True}, journal_name, force_local=True) + install.save_config(original_config, config_path=CONFIG_PATH) + + elif args.decrypt is not False: + decrypt(journal, filename=args.decrypt) + # Not decrypting to a separate file: update config! + if not args.decrypt: + update_config(original_config, {"encrypt": False}, journal_name, force_local=True) + install.save_config(original_config, config_path=CONFIG_PATH) + + elif args.delete_last: + last_entry = journal.entries.pop() + util.prompt("[Deleted Entry:]") + print(last_entry.pprint()) + journal.write() + +if __name__ == "__main__": + run() diff --git a/jrnl/cli.pyc b/jrnl/cli.pyc index f24ccbff..4ca701d1 100644 Binary files a/jrnl/cli.pyc and b/jrnl/cli.pyc differ diff --git a/jrnl/exporters.pyc b/jrnl/exporters.pyc index f37c5ffe..cdaed67f 100644 Binary files a/jrnl/exporters.pyc and b/jrnl/exporters.pyc differ diff --git a/jrnl/install.pyc b/jrnl/install.pyc index 50f116b9..02a3541c 100644 Binary files a/jrnl/install.pyc and b/jrnl/install.pyc differ diff --git a/jrnl/jrnl.pyc b/jrnl/jrnl.pyc index bec81628..84085653 100644 Binary files a/jrnl/jrnl.pyc and b/jrnl/jrnl.pyc differ diff --git a/jrnl/util.pyc b/jrnl/util.pyc index e46f218f..8eeb2096 100644 Binary files a/jrnl/util.pyc and b/jrnl/util.pyc differ diff --git a/objects.inv b/objects.inv index 0369af57..d824b8a4 100644 Binary files a/objects.inv and b/objects.inv differ diff --git a/overview.html b/overview.html index d5f31d1e..22489a56 100644 --- a/overview.html +++ b/overview.html @@ -7,7 +7,7 @@ - Overview — jrnl 1.6.5 documentation + Overview — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/recipes.html b/recipes.html index 8e859b5a..cef4180f 100644 --- a/recipes.html +++ b/recipes.html @@ -7,7 +7,7 @@ - FAQ — jrnl 1.6.5 documentation + FAQ — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/search.html b/search.html index 00ee48b5..d3799117 100644 --- a/search.html +++ b/search.html @@ -7,7 +7,7 @@ - Search — jrnl 1.6.5 documentation + Search — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - + diff --git a/searchindex.js b/searchindex.js index 68881ecb..95847d28 100644 --- a/searchindex.js +++ b/searchindex.js @@ -1 +1 @@ -Search.setIndex({objects:{},terms:{all:[6,0,4,7,5],default_minut:7,steve:[6,7],follow:[6,7],privat:7,depend:1,"2013_06_03_a":4,readabl:[5,4],yve:3,program:2,alberto:3,under:7,sha256:2,thursdai:7,everi:2,string:6,"3am":6,fals:7,faq:[0,3],veri:7,cyan:7,recip:[0,3],flatmat:3,level:7,did:5,list:[6,0,4,5],vector:2,dayon:[0,7,5],timeformat:7,initialis:2,ten:6,sync:[5,7],sign:6,pass:7,what:[0,5],access:7,melo:3,"new":[2,1],ever:2,told:1,hash:2,gener:4,chang:[6,2,3,7],decid:2,bodi:1,met:6,path:7,valu:7,wait:7,convers:2,vacat:5,prior:3,behav:7,chcp:3,implement:7,control:[6,7],linewrap:7,apr:6,app:7,vim:7,releas:0,xdg_config_hom:7,instal:[0,3,1],txt:[6,2,7],mobil:7,quickstart:[0,1],from:[6,5,7],would:7,memori:5,doubl:6,two:6,todai:6,websit:7,live:7,call:1,type:[1,7],until:[6,3,1],more:7,sort:4,flat:7,python:[2,7],henc:7,flag:7,known:[0,3],word:5,hous:1,gabriel:4,work:[6,3,7],can:[1,5,3,4,2,6,7],meet:7,overrid:7,prompt:[6,1,7],fabul:5,tag:[6,0,3,4,7],want:[6,2,3,1,7],plist:7,gcc:1,multipl:7,anoth:2,occur:[6,3,4],write:[6,5,1,7,2],how:[6,5,3,7],instead:7,simpl:[5,4,7],after:7,sundai:6,reflect:5,befor:[6,3,7],beauti:4,date:[6,4,7],end:7,github:4,issu:[0,3],"switch":6,combin:[6,0,3],jrnl:[0,1,2,3,4,5,6,7],enter:[6,2],exclus:6,frontend:7,help:5,becaus:6,untouch:2,still:5,digest:2,perfect:5,gtd:5,thank:3,fix:3,window:3,drawback:7,requir:1,them:[6,5],good:5,"return":1,food:7,timestamp:[6,0,7],dai:[6,5,4,7],initi:2,"break":6,mention:3,macvim:7,now:[6,7],choic:6,name:4,beach:6,crypto:2,separ:7,mode:6,each:[3,4,7],januari:3,unicod:3,my_entri:[6,4],mean:[6,3,7],compil:1,replac:2,individu:[4,7],timelin:4,meta:7,year:[6,5],our:7,girl:5,todo:5,special:[6,5],out:3,variabl:7,encod:3,load:7,your:[0,1,2,4,5,6,7],content:[0,4],print:[6,3,4],lubric:6,occurr:[0,3],advanc:[0,7],given:6,reason:[6,1],base:5,ask:[2,1],"byte":2,bash:7,launch:[6,7],put:5,keep:[6,0,5],filter:[6,0,3],thing:[5,3],isn:5,summari:3,imposs:7,frequent:4,first:[2,3,1,7],origin:2,directli:[6,5],mvim:7,wast:5,mai:5,alreadi:2,done:5,open:2,fanci:5,differ:7,convent:6,width:7,top:7,least:[5,7],too:5,tom:6,"final":3,store:[0,2,5],shell:[6,3,7],option:[6,5,3,1,7],specifi:[6,2,4,7],"short":[3,4],haven:5,ipad:5,hashlib:2,grep:3,whenev:[6,2],charact:[3,7],project:6,sai:7,comput:2,argument:[6,4],dash:6,packag:3,have:[5,1,7,2],seem:7,imagin:5,built:7,equival:6,note:[6,1,7],also:[6,5,1,7,2],without:6,which:[6,3],environ:3,singl:[6,7],sure:[6,7],unless:1,track:[6,5],favourit:[6,3],who:5,most:[6,3,4,7],render:4,cipher:2,icloud:7,why:[0,4,5],don:[6,2,7],doc:7,later:2,doe:[3,7],pipe:3,"10am":7,clean:1,pouplard:3,text:[0,4,2,7,5],find:3,current:2,onli:[6,5,3,4],explicitli:1,locat:[6,7],just:[6,5,1,7],pretti:4,configur:[6,0,1,7],should:[2,1],jan:3,folder:[5,7],hit:1,"2013_06_07_dinner":4,get:[0,1,5,3,4,7],jrnl_conf:7,endless:7,bar:6,noon:6,sha:2,integr:[0,7],contain:[6,3],buscemi:6,where:[3,1],view:[6,0],set:7,habit:5,see:[6,7],result:[1,7],close:7,best:6,wonder:6,someth:3,sublim:7,won:[2,7],"import":[6,0,4,2],kei:[2,7],complement:5,entir:4,solv:3,both:[6,3,7],instant:5,howev:7,forgotten:5,pdf:4,com:7,comment:7,assur:5,simpli:[6,2],point:[2,7],overview:[0,5],arbitrarili:6,dayoneapp:7,suppli:[6,7],my_recip:7,assum:6,stamp:1,quotat:7,three:7,mark:[6,1,7],json:[0,4,7],much:5,interpret:[1,7],basic:[6,0],my_journ:2,life:6,decrypt:[0,7,2],ani:[6,2],"5u8ns4gx82":7,last:[6,7],present:7,look:[6,4,1,7],jrnl_config:7,plain:[5,2],plain_text_copi:2,defin:7,"while":7,abov:4,"_no_":6,pinki:6,readm:4,non:3,ascii:3,sever:4,make:[6,5,4,1,7],mayb:2,same:[2,3,4],funni:6,html:4,sentenc:1,document:[5,7],extern:[1,7],yesterdai:[6,1],recent:3,off:7,entri:[0,1,3,4,6,7],markup:4,well:1,spent:1,person:5,exampl:[4,7],command:[6,0,4,7,5],thi:[1,5,3,4,2,6,7],choos:2,everyth:[6,1,7],latest:6,summer:5,execut:7,codepag:3,rest:1,markdown:[0,4],human:[5,4],languag:4,had:6,add:6,book:1,input:[6,7],save:7,smart:[6,0],applic:[5,7],march:6,format:[4,7],read:[5,2],intuit:7,five:6,bit:5,password:[0,2],like:[6,4,3,1,7],specif:7,filenam:2,whitespac:6,manual:[0,1,7,2],either:6,output:[4,7],old:5,often:3,some:3,dead:7,"export":[6,0,4],worlddomin:6,librari:[1,7],avoid:7,leav:2,anna:6,refer:7,limitless:5,run:[2,3,1],journal:[0,1,2,3,4,5,6,7],usag:[6,0,7],tagsymbol:7,although:[6,7],"_jrnl_":[3,7],"6am":6,plai:5,surround:6,chop:7,mondai:6,within:3,profession:5,compos:[6,0,1,7],wrap:7,my_password:2,subl:7,mere:7,wai:[6,7],aren:5,support:[2,7],"long":[5,7],start:[6,0,1,7],reli:3,editor:[6,1,7],keychain:[0,2],mode_cbc:2,line:[6,0,3,7,5],"true":7,count:4,made:5,algorithm:2,whether:[2,1,7],wish:1,displai:[6,3,4,7],below:7,highlight:7,problem:3,default_hour:7,creat:[4,1,7],pycyrypto:1,exist:2,file:[0,1,2,4,5,6,7],pip:1,happen:6,again:2,mutual:6,encrypt:[0,1,2,3,5,7],titl:[4,1],when:[5,2],virtual:3,"default":7,other:4,sick:1,peopl:[6,5],you:[1,5,3,4,2,6,7],intention:6,nice:[5,4],pineappl:6,star:[6,0,3],symbol:[6,7],asterisk:6,consid:5,dropbox:[5,7],pycrypto:[3,1],directori:4,time:[1,5,4,2,6,7],scroll:7},objtypes:{},titles:["jrnl: The command-line journal","Getting started","Encryption","FAQ","Import and Export","Overview","Basic Usage","Advanced Usage"],objnames:{},filenames:["index","installation","encryption","recipes","export","overview","usage","advanced"]}) \ No newline at end of file +Search.setIndex({objects:{},terms:{all:[6,0,4,7,2],default_minut:7,steve:[6,7],follow:[6,7],privat:7,depend:1,"2013_06_03_a":4,readabl:[2,4],yve:3,program:5,alberto:3,under:7,sha256:5,thursdai:7,everi:5,string:6,"3am":6,fals:7,faq:[0,3],veri:7,untouch:5,recip:[0,3],flatmat:3,level:7,did:2,list:[6,0,4,2],vector:5,dayon:[0,7,2],timeformat:7,initialis:5,ten:6,sync:[2,7],sign:6,pass:7,what:[0,2],access:7,melo:3,"new":[5,1],ever:5,told:1,hash:5,gener:4,chang:[6,5,3,7],decid:5,bodi:1,met:6,path:7,valu:7,wait:7,convers:5,vacat:2,prior:3,behav:7,chcp:3,implement:7,control:[6,7],linewrap:7,apr:6,app:7,vim:7,ask:[5,1],xdg_config_hom:7,instal:[0,3,1],txt:[6,5,7],mobil:7,quickstart:[0,1],from:[6,2,7],would:7,memori:2,doubl:6,two:6,todai:6,websit:7,live:7,call:1,type:[1,7],until:[6,3,1],more:7,sort:4,flat:7,python:[5,7],henc:7,flag:7,known:[0,3],word:2,hous:1,gabriel:4,work:[6,3,7],can:[1,5,3,4,2,6,7],meet:7,overrid:7,prompt:[6,1,7],fabul:2,tag:[6,0,3,4,7],want:[6,5,3,1,7],plist:7,gcc:1,multipl:7,anoth:5,occur:[6,3,4],write:[6,5,1,7,2],how:[6,2,3,7],instead:7,beach:6,after:7,sundai:6,reflect:2,befor:[6,3,7],beauti:4,mai:2,end:7,"short":[3,4],issu:[0,3],"switch":6,environ:3,jrnl:[0,1,2,3,4,5,6,7],enter:[6,5],exclus:6,frontend:7,help:2,becaus:6,cyan:7,still:2,digest:5,perfect:2,gtd:2,thank:3,fix:3,window:3,drawback:7,requir:1,them:[6,2],good:2,"return":1,food:7,timestamp:[6,0,7],dai:[6,2,4,7],initi:5,"break":6,mention:3,macvim:7,now:[6,7],choic:6,name:4,simpl:[2,4,7],crypto:5,separ:7,mode:6,each:[3,4,7],januari:3,unicod:3,my_entri:[6,4],mean:[6,3,7],compil:1,replac:5,individu:[4,7],timelin:4,meta:7,year:[6,2],our:7,girl:2,todo:2,special:[6,2],out:3,variabl:7,mere:7,content:[0,4],print:[6,3,4],lubric:6,occurr:[0,3],advanc:[0,7],given:6,reason:[6,1],base:2,releas:0,"byte":5,bash:7,launch:[6,7],put:2,keep:[6,0,2],filter:[6,0,3],thing:[2,3],isn:2,summari:3,imposs:7,frequent:4,first:[5,3,1,7],origin:5,directli:[6,2],mvim:7,wast:2,date:[6,4,7],alreadi:5,done:2,open:5,fanci:2,differ:7,convent:6,start:[6,0,1,7],top:7,least:[2,7],too:2,tom:6,"final":3,store:[0,2,5],shell:[6,3,7],option:[6,2,3,1,7],specifi:[6,5,4,7],github:4,haven:2,ipad:2,hashlib:5,grep:3,whenev:[6,5],charact:[3,7],project:6,sai:7,comput:5,ani:[6,5],dash:6,packag:3,have:[5,1,7,2],seem:7,imagin:2,built:7,equival:6,note:[6,1,7],also:[6,5,1,7,2],exampl:[4,7],which:[6,3],combin:[6,0,3],singl:[6,7],sure:[6,7],unless:1,track:[6,2],favourit:[6,3],who:2,most:[6,3,4,7],render:4,cipher:5,icloud:7,why:[0,4,2],don:[6,5,7],doc:7,later:5,doe:[3,7],pipe:3,"10am":7,clean:1,pouplard:3,summer:2,text:[2,0,4,7,5],find:3,current:5,onli:[6,2,3,4],explicitli:1,locat:[6,7],execut:7,pretti:4,configur:[6,0,1,7],should:[5,1],jan:3,folder:[2,7],hit:1,"2013_06_07_dinner":4,get:[0,1,2,3,4,7],jrnl_conf:7,endless:7,bar:6,sha:5,integr:[0,7],contain:[6,3],buscemi:6,where:[3,1],view:[6,0],set:7,habit:2,see:[6,7],result:[1,7],close:7,best:6,wonder:6,profession:2,someth:3,sublim:7,won:[5,7],"import":[6,0,4,5],kei:[5,7],complement:2,entir:4,solv:3,both:[6,3,7],instant:2,howev:7,forgotten:2,pdf:4,com:7,comment:7,assur:2,simpli:[6,5],point:[5,7],overview:[0,2],arbitrarili:6,dayoneapp:7,suppli:[6,7],my_recip:7,assum:6,stamp:1,quotat:7,three:7,mark:[6,1,7],json:[0,4,7],much:2,interpret:[1,7],basic:[6,0],my_journ:5,life:6,wish:1,pycyrypto:1,argument:[6,4],"5u8ns4gx82":7,last:[6,7],present:7,look:[6,4,1,7],jrnl_config:7,plain:[5,2],plain_text_copi:5,defin:7,"while":7,abov:4,"_no_":6,pinki:6,readm:4,non:3,ascii:3,sever:4,make:[6,4,1,7,2],format:[4,7],same:[5,3,4],funni:6,html:4,sentenc:1,document:[2,7],extern:[1,7],yesterdai:[6,1],recent:3,off:7,entri:[0,1,3,4,6,7],markup:4,well:1,spent:1,person:2,without:6,command:[6,0,4,7,2],thi:[1,5,3,4,2,6,7],choos:5,everyth:[6,1,7],latest:6,load:7,just:[6,2,1,7],codepag:3,rest:1,markdown:[0,4],human:[2,4],languag:4,had:6,add:6,other:4,input:[6,7],save:7,smart:[6,0],applic:[2,7],march:6,mayb:5,read:[5,2],intuit:7,five:6,bit:2,password:[0,5],like:[6,4,3,1,7],specif:7,filenam:5,whitespac:6,manual:[0,1,7,5],either:6,output:[4,7],old:2,often:3,some:3,dead:7,"export":[6,0,4],librari:[1,7],avoid:7,leav:5,anna:6,refer:7,limitless:2,run:[5,3,1],journal:[0,1,2,3,4,5,6,7],usag:[6,0,7],tagsymbol:7,although:[6,7],"_jrnl_":[3,7],"6am":6,plai:2,surround:6,chop:7,consid:2,within:3,encod:3,compos:[6,0,1,7],wrap:7,my_password:5,subl:7,your:[0,1,2,4,5,6,7],wai:[6,7],aren:2,support:[5,7],"long":[2,7],width:7,reli:3,editor:[6,1,7],keychain:[0,5],mode_cbc:5,line:[6,0,3,7,2],"true":7,count:4,made:2,pycrypto:[3,1],whether:[5,1,7],worlddomin:6,displai:[6,3,4,7],below:7,highlight:7,problem:3,default_hour:7,creat:[4,1,7],decrypt:[0,7,5],exist:5,file:[0,1,2,4,5,6,7],pip:1,happen:6,again:5,mutual:6,encrypt:[0,1,2,3,5,7],titl:[4,1],when:[5,2],virtual:3,"default":7,book:1,sick:1,peopl:[6,2],you:[1,5,3,4,2,6,7],intention:6,nice:[2,4],pineappl:6,star:[6,0,3],symbol:[6,7],asterisk:6,mondai:6,dropbox:[2,7],algorithm:5,directori:4,scroll:7,time:[1,5,4,2,6,7],noon:6},objtypes:{},titles:["jrnl: The command-line journal","Getting started","Overview","FAQ","Import and Export","Encryption","Basic Usage","Advanced Usage"],objnames:{},filenames:["index","installation","overview","recipes","export","encryption","usage","advanced"]}) \ No newline at end of file diff --git a/usage.html b/usage.html index 2968e9d5..0aeb93f1 100644 --- a/usage.html +++ b/usage.html @@ -7,7 +7,7 @@ - Basic Usage — jrnl 1.6.5 documentation + Basic Usage — jrnl 1.6.6 documentation @@ -15,7 +15,7 @@ - +