moonq/q-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiple file support. TOC print while presentation

Browse Source
This commit is contained in:
Ville Rantanen
2017-03-07 13:43:34 +02:00
parent b940b5a125
commit f7b0333ae4
1 changed files with 95 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
reporting/markslider.py
View File

@@ -20,7 +20,7 @@
'''Markslider: a slideshow engine based on markdown.''' '''Markslider: a slideshow engine based on markdown.'''
__author__ = "Ville Rantanen <ville.q.rantanen@gmail.com>" __author__ = "Ville Rantanen <ville.q.rantanen@gmail.com>"
__version__ = "0.8" __version__ = "0.9"
import sys,os,argparse,re import sys,os,argparse,re
from argparse import ArgumentParser from argparse import ArgumentParser
@@ -49,12 +49,14 @@ class EndProgram( Exception ):
class slide_reader: class slide_reader:
""" Class for reading files. """ """ Class for reading files. """
def __init__(self,filename,opts): def __init__(self,files,opts):
self.filename=filename self.filename=files[0]
self.files=files
self.reader=None self.reader=None
self.opts=opts self.opts=opts
self.pages=0 self.pages=0
self.page=0 self.page=0
self.file_start_page=[]
self.width=None self.width=None
self.height=None self.height=None
self.max_width=None self.max_width=None
@@ -69,9 +71,11 @@ class slide_reader:
def read(self): def read(self):
''' Read a file, set pages and data ''' ''' Read a file, set pages and data '''
f=open(self.filename,'r')
self.pages=0 self.pages=0
self.data=[] self.data=[]
self.file_start_page=[]
for fname in self.files:
f=open(fname,'r')
new_page=[] new_page=[]
first_slide_found=False first_slide_found=False
for row in f: for row in f:
@@ -93,7 +97,8 @@ class slide_reader:
new_page.extend(self.generate_content(row)) new_page.extend(self.generate_content(row))
if len(new_page)>0: if len(new_page)>0:
self.data.append(new_page) self.data.append(new_page)
f.close()
self.file_start_page.append(len(self.data))
self.toc() self.toc()
self.pages=len(self.data) self.pages=len(self.data)
self.inc_page_no(0) self.inc_page_no(0)
@@ -106,6 +111,11 @@ class slide_reader:
def get_data(self): def get_data(self):
return self.data return self.data
def get_current_filename(self):
for i,offset in enumerate(self.file_start_page):
if offset>=self.page:
return self.files[i]
return "NA"
def get_filename(self): def get_filename(self):
return self.filename return self.filename
@@ -148,9 +158,9 @@ class slide_reader:
def get_max_width(self): def get_max_width(self):
return self.max_width return self.max_width
def toc(self): def get_toc(self):
if self.opts.toc: title=self.opts.toc if self.opts.toc else "Table of Contents"
TOC=["# "+self.opts.toc,""] TOC=["# "+title,""]
for h1,page in enumerate(self.data[(self.opts.toc_page-1):]): for h1,page in enumerate(self.data[(self.opts.toc_page-1):]):
title=page[0].strip("# ") title=page[0].strip("# ")
TOC.append("%d. %s"%(h1+1,title)) TOC.append("%d. %s"%(h1+1,title))
@@ -169,6 +179,11 @@ class slide_reader:
if re.search("^####[^#]", line): if re.search("^####[^#]", line):
subh=[ subh[0], subh[1], subh[2]+1 ] subh=[ subh[0], subh[1], subh[2]+1 ]
TOC.append(" %d.%d.%d.%d. %s"%(h1+1,subh[0],subh[1],subh[2],title)) TOC.append(" %d.%d.%d.%d. %s"%(h1+1,subh[0],subh[1],subh[2],title))
return TOC
def toc(self):
if self.opts.toc:
TOC=self.get_toc()
self.data.insert(self.opts.toc_page-1,TOC) self.data.insert(self.opts.toc_page-1,TOC)
def generate_content(self,s): def generate_content(self,s):
@@ -229,9 +244,10 @@ class slide_reader:
def get_interactive_help_text(): def get_interactive_help_text():
return ''' left/right,page up/down,home,end return ''' left/right,page up/down,home,end
change page change page
q exit browser c list contents (toc)
M modify file with VIM M modify file with VIM
r reload the file q exit browser
r reload the presentation
s toggle status bar s toggle status bar
t toggle timer (reqs. --timer switch) t toggle timer (reqs. --timer switch)
,/. scroll page ,/. scroll page
@@ -279,11 +295,9 @@ Keyboard shortcuts:
execution.add_argument("-E",action="store_true",dest="execute_read",default=False, execution.add_argument("-E",action="store_true",dest="execute_read",default=False,
help="Execute commands in ``> tags at file read time. WARNING: Potentially very dangerous to run others' slides with this switch!") help="Execute commands in ``> tags at file read time. WARNING: Potentially very dangerous to run others' slides with this switch!")
control.add_argument("--exit",action="store_true",dest="exit_last",default=False, control.add_argument("--exit",action="store_true",dest="exit_last",default=False,
help="Exit after last slide.") help="Exit after last slide.")
control.add_argument("-s",action="store_false",dest="menu",default=True, control.add_argument("-s",action="store_false",dest="menu",default=True,
help="Disable status bar.") help="Disable status bar.")
control.add_argument("--timer",action="store",dest="slideTimer",default=False, type=int, control.add_argument("--timer",action="store",dest="slideTimer",default=False, type=int,
@@ -298,8 +312,8 @@ Keyboard shortcuts:
content.add_argument("--toc-depth",action="store",dest="toc_depth",default=2, type=int, content.add_argument("--toc-depth",action="store",dest="toc_depth",default=2, type=int,
choices=xrange(1,5), choices=xrange(1,5),
help="Table of contents display depth. default: %(const)s") help="Table of contents display depth. default: %(const)s")
parser.add_argument("filename",type=str, parser.add_argument("files",type=str, nargs='+',
help="File to show") help="File(s) to show")
opts=parser.parse_args() opts=parser.parse_args()
opts.slideShow=not not opts.slideTimer opts.slideShow=not not opts.slideTimer
if opts.screenshots: if opts.screenshots:
@@ -370,7 +384,7 @@ def menu_print(reader,opts):
colorify("${y}%d${Z}/%d %s|%s"%( colorify("${y}%d${Z}/%d %s|%s"%(
1+reader.get_page_no(), 1+reader.get_page_no(),
reader.get_pages(), reader.get_pages(),
reader.get_filename(), os.path.basename(reader.get_current_filename()),
"slideshow" if opts.slideShow else ""), "slideshow" if opts.slideShow else ""),
opts)) opts))
@@ -386,6 +400,28 @@ def print_help(reader,opts):
sys.stdout.write(bc.pos(opts.size[0], opts.size[1])) sys.stdout.write(bc.pos(opts.size[0], opts.size[1]))
inkey=getch.get() inkey=getch.get()
def print_toc(reader,opts):
''' Create a window with TOC '''
text=reader.get_toc()
title=opts.toc if opts.toc else "Table of Contents"
maxlen=max([len(x) for x in text])
bc.posprint(3,3,"+"+"-"*maxlen+"+")
parsed=md_color.parse(text)
if opts.autocolor:
colored=md_color.colorize(parsed,not opts.color,opts.dark_colors)
else:
if opts.color:
colored=[bc.color_string(row[1]) for row in parsed]
else:
colored=[bc.nocolor_string(row[1]) for row in parsed]
for y,row in enumerate(colored):
bc.posprint(4+y,3,("|{:<"+str(maxlen)+"}|").format(" "))
bc.posprint(4+y,3,("|{:<"+str(maxlen)+"}").format(row))
bc.posprint(5+y,3,"+"+"-"*maxlen+"+")
sys.stdout.write(bc.pos(opts.size[0], opts.size[1]))
inkey=getch.get()
def offset_change(opts,reader,offset,new_offset): def offset_change(opts,reader,offset,new_offset):
''' Change the display position of page ''' ''' Change the display position of page '''
new_offset=(offset[0]+new_offset[0], offset[1]+new_offset[1]) new_offset=(offset[0]+new_offset[0], offset[1]+new_offset[1])
@@ -403,11 +439,11 @@ def getkeypress():
except: except:
return False return False
def browser(opts,filename): def browser(opts,files):
''' Main function for printing ''' ''' Main function for printing '''
try: try:
reader=slide_reader(filename,opts) reader=slide_reader(files,opts)
except: except:
print "Error in reading the file:" print "Error in reading the file:"
for o in sys.exc_info(): for o in sys.exc_info():
@@ -456,6 +492,8 @@ def browser(opts,filename):
if inkey==70 or inkey==52: # END if inkey==70 or inkey==52: # END
reader.last_page() reader.last_page()
offset=(0, 0) offset=(0, 0)
if inkey==ord('c'):
print_toc(reader,opts)
if inkey==ord('h'): if inkey==ord('h'):
print_help(reader,opts) print_help(reader,opts)
if inkey==ord('s'): if inkey==ord('s'):
@@ -527,6 +565,8 @@ def launch(reader,opts,offset):
Detects URLS and markdown images ![Alt text](/path/to/img.jpg) Detects URLS and markdown images ![Alt text](/path/to/img.jpg)
""" """
if not opts.execute: if not opts.execute:
bc.posprint(offset[1]-offset[0]+1,0,"Execution not enabled!")
inkey=getch.get()
return return
s=reader.get_current_page()[offset[1]] s=reader.get_current_page()[offset[1]]
urls = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', s) urls = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', s)
@@ -587,4 +627,4 @@ def take_screenshot(reader,opts):
bc=ansi.code() bc=ansi.code()
getch=getch() getch=getch()
opts=setup_options() opts=setup_options()
browser(opts,opts.filename) browser(opts,opts.files)