diff --git a/exporter.py b/exporter.py index 64836e4..9b617b9 100755 --- a/exporter.py +++ b/exporter.py @@ -120,6 +120,12 @@ print "Top level args may not be passed in stdin: " + top_level_args return True input = line_args.pop("input") + + if "out_dir" in args and not "out_dir" in line_args: + line_args["out_dir"] = args["out_dir"] + if "base_dir" in args and not "base_dir" in line_args: + line_args["base_dir"] = args["base_dir"] + for i in input: try: job = Job(in_file = i, **line_args) diff --git a/exporter.py b/exporter.py index 64836e4..9b617b9 100755 --- a/exporter.py +++ b/exporter.py @@ -120,6 +120,12 @@ print "Top level args may not be passed in stdin: " + top_level_args return True input = line_args.pop("input") + + if "out_dir" in args and not "out_dir" in line_args: + line_args["out_dir"] = args["out_dir"] + if "base_dir" in args and not "base_dir" in line_args: + line_args["base_dir"] = args["base_dir"] + for i in input: try: job = Job(in_file = i, **line_args) diff --git a/flash/Exporter.exe b/flash/Exporter.exe old mode 100644 new mode 100755 Binary files differ diff --git a/exporter.py b/exporter.py index 64836e4..9b617b9 100755 --- a/exporter.py +++ b/exporter.py @@ -120,6 +120,12 @@ print "Top level args may not be passed in stdin: " + top_level_args return True input = line_args.pop("input") + + if "out_dir" in args and not "out_dir" in line_args: + line_args["out_dir"] = args["out_dir"] + if "base_dir" in args and not "base_dir" in line_args: + line_args["base_dir"] = args["base_dir"] + for i in input: try: job = Job(in_file = i, **line_args) diff --git a/flash/Exporter.exe b/flash/Exporter.exe old mode 100644 new mode 100755 Binary files differ diff --git a/session.vim b/session.vim deleted file mode 100644 index 574e3ff..0000000 --- a/session.vim +++ /dev/null @@ -1,189 +0,0 @@ -let SessionLoad = 1 -if &cp | set nocp | endif -let s:cpo_save=&cpo -set cpo&vim -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? "\" : "\" -imap -nnoremap  :TmuxNavigateLeft -nnoremap :TmuxNavigateDown -nnoremap  :TmuxNavigateUp -nnoremap  :TmuxNavigateRight -nnoremap  :TmuxNavigatePrevious -nnoremap \d :YcmShowDetailedDiagnostic -vnoremap \c :call CopyMarkWithCursor("<", ">") -nnoremap \c :set opfunc=OpSysCopyMark g@ -vmap gx NetrwBrowseXVis -nmap gx NetrwBrowseX -vnoremap NetrwBrowseXVis :call netrw#BrowseXVis() -nnoremap NetrwBrowseX :call netrw#BrowseX(expand((exists("g:netrw_gx")? g:netrw_gx : '')),netrw#CheckIfRemote()) -inoremap  pumvisible() ? "\" : "\ " -let &cpo=s:cpo_save -unlet s:cpo_save -set autoindent -set backspace=indent,eol,start -set completefunc=youcompleteme#CompleteFunc -set completeopt=preview,menuone -set cpoptions=aAceFsB -set fileencodings=ucs-bom,utf-8,default,latin1 -set fillchars=vert:|,fold:-,vert:│ -set helplang=en -set hidden -set nomodeline -set printoptions=paper:letter -set ruler -set runtimepath=~/.vim,~/.vim/bundle/JustDo,~/.vim/bundle/YouCompleteMe,~/.vim/bundle/vim-easymotion,~/.vim/bundle/vim-tmux-navigator,~/.vim/bundle/yats.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after -set sessionoptions=blank,buffers,folds,help,options,tabpages,winsize,sesdir -set shortmess=filnxtToOc -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc -set wildignore=*.pyc -let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0 -let v:this_session=expand(":p") -silent only -exe "cd " . escape(expand(":p:h"), ' ') -if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' - let s:wipebuf = bufnr('%') -endif -set shortmess=aoO -badd +1 exporter.py -badd +1 driver.py -badd +1 job.py -badd +1 args.py -argglobal -silent! argdel * -edit exporter.py -set splitbelow splitright -set nosplitbelow -set nosplitright -wincmd t -set winheight=1 winwidth=1 -argglobal -setlocal keymap= -setlocal noarabic -setlocal autoindent -setlocal backupcopy= -setlocal nobinary -setlocal nobreakindent -setlocal breakindentopt= -setlocal bufhidden= -setlocal buflisted -setlocal buftype= -setlocal nocindent -setlocal cinkeys=0{,0},0),:,!^F,o,O,e -setlocal cinoptions= -setlocal cinwords=if,else,while,do,for,switch -setlocal colorcolumn= -setlocal comments=b:#,fb:- -setlocal commentstring=#\ %s -setlocal complete=.,w,b,u,t,i -setlocal concealcursor= -setlocal conceallevel=0 -setlocal completefunc=youcompleteme#CompleteFunc -setlocal nocopyindent -setlocal cryptmethod= -setlocal nocursorbind -setlocal nocursorcolumn -setlocal nocursorline -setlocal define= -setlocal dictionary= -setlocal nodiff -setlocal equalprg= -setlocal errorformat= -setlocal expandtab -if &filetype != 'python' -setlocal filetype=python -endif -setlocal fixendofline -setlocal foldcolumn=0 -setlocal foldenable -setlocal foldexpr=0 -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldmarker={{{,}}} -setlocal foldmethod=manual -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal foldtext=foldtext() -setlocal formatexpr= -setlocal formatoptions=tcq -setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* -setlocal grepprg= -setlocal iminsert=0 -setlocal imsearch=0 -setlocal include=^\\s*\\(from\\|import\\) -setlocal includeexpr=substitute(v:fname,'\\.','/','g') -setlocal indentexpr=GetPythonIndent(v:lnum) -setlocal indentkeys=0{,0},:,!^F,o,O,e,<:>,=elif,=except -setlocal noinfercase -setlocal iskeyword=@,48-57,_,192-255 -setlocal keywordprg=pydoc -setlocal nolinebreak -setlocal nolisp -setlocal lispwords= -setlocal nolist -setlocal makeprg= -setlocal matchpairs=(:),{:},[:] -setlocal nomodeline -setlocal modifiable -setlocal nrformats=bin,octal,hex -set number -setlocal number -setlocal numberwidth=4 -setlocal omnifunc=pythoncomplete#Complete -setlocal path= -setlocal nopreserveindent -setlocal nopreviewwindow -setlocal quoteescape=\\ -setlocal noreadonly -setlocal norelativenumber -setlocal norightleft -setlocal rightleftcmd=search -setlocal noscrollbind -setlocal shiftwidth=2 -setlocal noshortname -setlocal nosmartindent -setlocal softtabstop=2 -setlocal nospell -setlocal spellcapcheck=[.?!]\\_[\\])'\"\ \ ]\\+ -setlocal spellfile= -setlocal spelllang=en -setlocal statusline= -setlocal suffixesadd=.py -setlocal swapfile -setlocal synmaxcol=3000 -if &syntax != 'python' -setlocal syntax=python -endif -setlocal tabstop=8 -setlocal tagcase= -setlocal tags= -setlocal textwidth=0 -setlocal thesaurus= -setlocal noundofile -setlocal undolevels=-123456 -setlocal nowinfixheight -setlocal nowinfixwidth -setlocal wrap -setlocal wrapmargin=0 -silent! normal! zE -let s:l = 1 - ((0 * winheight(0) + 27) / 55) -if s:l < 1 | let s:l = 1 | endif -exe s:l -normal! zt -1 -normal! 0 -tabnext 1 -if exists('s:wipebuf') - silent exe 'bwipe ' . s:wipebuf -endif -unlet! s:wipebuf -set winheight=1 winwidth=20 shortmess=filnxtToOc -let s:sx = expand(":p:r")."x.vim" -if file_readable(s:sx) - exe "source " . fnameescape(s:sx) -endif -let &so = s:so_save | let &siso = s:siso_save -doautoall SessionLoadPost -unlet SessionLoad -" vim: set ft=vim :