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

markslider python3 upgrades

Browse Source
This commit is contained in:
q
2018-10-01 20:36:29 +03:00
parent 47b9b68328
commit f678da2330
6 changed files with 248 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
files/mvregex
View File

@@ -10,6 +10,7 @@ function helpexit() {
echo ' -n to match non-ascii and non-printable characters, and replace to [arg1]' echo ' -n to match non-ascii and non-printable characters, and replace to [arg1]'
echo ' -f to replace match [arg1] with format [arg2], ex: -f "[0-9]\+" "%04d"' echo ' -f to replace match [arg1] with format [arg2], ex: -f "[0-9]\+" "%04d"'
echo ' -p to replace problematic characters [^\w()[]-.] with [arg1]' echo ' -p to replace problematic characters [^\w()[]-.] with [arg1]'
echo ' -a to replace non-alphanumeric(+dot) characters [^\w.] with [arg1]'
exit exit
} }
@@ -44,6 +45,10 @@ do [[ "${!i}" = "-h" ]] && helpexit
SRC='[^]\[0-9a-zA-Z_.()-]' SRC='[^]\[0-9a-zA-Z_.()-]'
continue continue
} }
[[ "${!i}" = "-a" ]] && {
SRC='[^0-9a-zA-Z.]'
continue
}
[[ -z "$SRC" ]] && { [[ -z "$SRC" ]] && {
SRC="${!i}" SRC="${!i}"
continue continue

4
reporting/ansi.py
View File

@@ -57,6 +57,7 @@ class code:
def posprint(self, y,x,s): def posprint(self, y,x,s):
""" Print string at a location """ """ Print string at a location """
sys.stdout.write( self.pos(y,x) + str(s) ) sys.stdout.write( self.pos(y,x) + str(s) )
self.flush()
def clear(self): def clear(self):
sys.stdout.write( self.CLRSCR+self.pos(0,0) ) sys.stdout.write( self.CLRSCR+self.pos(0,0) )
@@ -102,7 +103,8 @@ class code:
def get_keys(self): def get_keys(self):
return self.color_keys return self.color_keys
def flush(self):
sys.stdout.flush()
def demo(): def demo():

2
reporting/markslider.packager.sh
View File

@@ -7,7 +7,7 @@ rm -rf markslider
mkdir -p markslider/scripts markslider/markslider mkdir -p markslider/scripts markslider/markslider
cp -v ansi.py md_color.py markslider.py markslider/markslider/ cp -v ansi.py md_color.py markslider.py markslider/markslider/
echo '#!/usr/bin/env python2 echo '#!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import re import re
import sys import sys

230
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.9" __version__ = "1.0"
import sys,os,argparse,re,datetime import sys,os,argparse,re,datetime
from argparse import ArgumentParser from argparse import ArgumentParser
@@ -45,25 +45,26 @@ class getch:
class EndProgram( Exception ): class EndProgram( Exception ):
''' Nice exit ''' ''' Nice exit '''
print('')
pass pass
class slide_reader: class slide_reader:
""" Class for reading files. """ """ Class for reading files. """
def __init__(self,files,opts): def __init__(self,files,opts):
self.filename=files[0] self.filename = files[0]
self.files=files 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.file_start_page = []
self.width=None self.width = None
self.height=None self.height = None
self.max_width=None self.max_width = None
self.max_height=None self.max_height = None
self.data=[] self.data = []
self.re_image_convert=re.compile("(.*)(!\[.*\])\((.*)\)>") self.re_image_convert = re.compile("(.*)(!\[.*\])\((.*)\)>")
self.re_command=re.compile("(.*)`(.*)`>(.*)") self.re_command = re.compile("(.*)`(.*)`>(.*)")
#~ self.control_chars = ''.join(map(unichr, range(0,32) + range(127,160))) #~ self.control_chars = ''.join(map(unichr, range(0,32) + range(127,160)))
#~ self.control_char_re = re.compile('[%s]' % re.escape(self.control_chars)) #~ self.control_char_re = re.compile('[%s]' % re.escape(self.control_chars))
self.read() self.read()
@@ -71,10 +72,10 @@ class slide_reader:
def read(self): def read(self):
''' Read a file, set pages and data ''' ''' Read a file, set pages and data '''
self.pages=0 self.pages = 0
self.data=[] self.data = []
self.file_start_page=[] self.file_start_page = []
first_slide_found=False first_slide_found = False
for fname in self.files: for fname in self.files:
first_slide_found=False first_slide_found=False
f=open(fname,'r') f=open(fname,'r')
@@ -82,9 +83,9 @@ class slide_reader:
for row in f: for row in f:
if not row: if not row:
continue continue
row=row.decode('utf-8').rstrip("\n\r ") row=row.rstrip("\n\r ")
# find end of show # find end of show
if row==EOS: if row == EOS:
break break
# find header to start a new page # find header to start a new page
if row.startswith("#") and not row.startswith("##"): if row.startswith("#") and not row.startswith("##"):
@@ -201,7 +202,7 @@ class slide_reader:
command=self.re_command.match(s) command=self.re_command.match(s)
if command !=None: if command !=None:
return self.launch(command) return self.launch(command)
image=self.re_image_convert.match(s) image = self.re_image_convert.match(s)
if image != None: if image != None:
return self.convert_image(image) return self.convert_image(image)
return [s] return [s]
@@ -210,13 +211,13 @@ class slide_reader:
""" Launch in a string using tags `command`> """ Launch in a string using tags `command`>
Remove empty lines from beginning and end of stdout. Remove empty lines from beginning and end of stdout.
""" """
#~ if not self.opts.execute_read: output = subprocess.check_output(
#~ return [s] command.group(2).strip(),
#~ if s.find("`>")==-1: shell = True
#~ return [s] )
#~ command=self.re_command.match(s) if type(output) == bytes:
#~ if command != None: output = output.decode('utf-8')
output = subprocess.check_output(command.group(2).strip(),shell=True).split("\n") output = output.split("\n")
while len(output[0].strip())==0: while len(output[0].strip())==0:
if len(output)==1: return [""] if len(output)==1: return [""]
del output[0] del output[0]
@@ -235,7 +236,13 @@ class slide_reader:
""" """
#~ 2=title #~ 2=title
#~ 3=image command #~ 3=image command
output = subprocess.check_output("convert %s JPEG:- | jp2a --colors --width=70 -"%image.group(3),shell=True).split("\n") output = subprocess.check_output(
"convert %s JPEG:- | jp2a --colors --width=70 -"%( image.group(3),),
shell=True
)
if type(output) == bytes:
output = output.decode('utf-8')
output = output.split("\n")
while len(output[0].strip())==0: while len(output[0].strip())==0:
if len(output)==1: return [""] if len(output)==1: return [""]
del output[0] del output[0]
@@ -273,7 +280,7 @@ Special syntaxes:
* Text after a "# End of Slides" is not shown * Text after a "# End of Slides" is not shown
* Execute shell: ` command -switch `! Beware of malicious code! * Execute shell: ` command -switch `! Beware of malicious code!
* Execute and print output: ` command `> Beware of malicious code! * Execute and print output: ` command `> Beware of malicious code!
* Convert images to ASCII, with jp2a: ![](file.jpg) * Convert images to ASCII, with jp2a: ![](file.jpg)>
Keyboard shortcuts: Keyboard shortcuts:
'''+get_interactive_help_text() '''+get_interactive_help_text()
@@ -333,55 +340,67 @@ Keyboard shortcuts:
def page_print(reader,opts,offset): def page_print(reader,opts,offset):
''' Print a page ''' ''' Print a page '''
page=reader.get_current_page() page = reader.get_current_page()
scrsize=opts.size scrsize = opts.size
# clear page # clear page
bc.clear() bc.clear()
if opts.center: # Placeholder for 80x25 center alignment if opts.center: # Placeholder for 80x25 center alignment
align_width=reader.get_max_width() align_width = reader.get_max_width()
align_x_offset=scrsize[1]/2-align_width/2 align_x_offset = scrsize[1]/2-align_width/2
align_pad=" "*align_x_offset align_pad = " "*align_x_offset
align_y_offset=scrsize[0]/2-reader.get_max_height()/2 align_y_offset = scrsize[0]/2 - reader.get_max_height()/2
bc.down_line(align_y_offset) bc.down_line(align_y_offset)
else: else:
align_pad="" align_pad = ""
# Print header # Print header
if opts.dark_colors: if opts.dark_colors:
coloring="${b}${U}" coloring = "${b}${U}"
else: else:
coloring="${U}${Y}" coloring = "${U}${Y}"
print(align_pad+colorify(coloring+page[0],opts)+bc.Z) print(
align_pad +
colorify(
coloring + page[0],
opts) +
bc.Z
)
if (sys.version_info < (3, 0)):
# python2 magic
page = [row.decode('utf-8') for row in page]
# Print page rows # Print page rows
if not opts.wrap: if not opts.wrap:
page=[cut_line(row,scrsize[1]-1) for row in page] page = [cut_line(row,scrsize[1]-1) for row in page]
parsed=md_color.parse(page) parsed = md_color.parse(page)
if opts.autocolor: if opts.autocolor:
colored=md_color.colorize(parsed,not opts.color,opts.dark_colors) colored = md_color.colorize(
parsed,
not opts.color,
opts.dark_colors
)
else: else:
if opts.color: if opts.color:
colored=[bc.color_string(row[1]) for row in parsed] colored=[bc.color_string(row[1]) for row in parsed]
else: else:
colored=[bc.nocolor_string(row[1]) for row in parsed] colored=[bc.nocolor_string(row[1]) for row in parsed]
r=0 r = 0
for row_i in range(len(page)): for row_i in range(len(page)):
if row_i==0: continue if row_i == 0: continue
if row_i<offset[0]: continue if row_i < offset[0]: continue
row=page[row_i] row = page[row_i]
#page[1+offset[0]:]: #page[1+offset[0]:]:
if opts.wrap: if opts.wrap:
row_lines=int(float(len(row))/scrsize[1]) row_lines = int(float(len(row))/scrsize[1])
else: else:
row_lines=0 row_lines = 0
row_lines=0 row_lines = 0
colored_row=colored[row_i]#=colorify(row,opts) colored_row = colored[row_i]#=colorify(row,opts)
if offset[1]==r+1+offset[0]: if offset[1] == r + 1 + offset[0]:
colored_row=add_highlight(row,opts) colored_row = add_highlight(row,opts)
sys.stdout.write(align_pad+colored_row) sys.stdout.write(align_pad + colored_row)
if r>=scrsize[0]-2: if r >= scrsize[0] - 2:
break break
r+=row_lines+1 r += row_lines + 1
sys.stdout.write("\n") sys.stdout.write("\n")
sys.stdout.flush() sys.stdout.flush()
return return
@@ -398,8 +417,17 @@ def print_menu(reader,opts):
def print_time(opts): def print_time(opts):
now=datetime.datetime.now() now=datetime.datetime.now()
bc.posprint( opts.size[0], opts.size[1]-5, bc.posprint(
colorify("%02d:%02d"%(now.hour,now.minute),opts)) opts.size[0],
opts.size[1]-5,
colorify(
"%02d:%02d"%(
now.hour,
now.minute
),
opts
)
)
def print_help(reader,opts): def print_help(reader,opts):
''' Create a window with help message ''' ''' Create a window with help message '''
@@ -588,24 +616,35 @@ 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!") bc.posprint(
inkey=getch.get() 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)
images = re.findall('!\[[^]]+\]\([^\)]+\)', s) images = re.findall('!\[[^]]+\]\([^\)]+\)', s)
if s.find("`")==-1 and len(urls)==0 and len(images)==0: # sanity check
if s.find("`") == -1 and len(urls) == 0 and len(images) == 0:
return return
run_command=re.match("(.*)`(.*)`!(.*)",s) run_command=re.match("(.*)`(.*)`!(.*)",s)
show_command=re.match("(.*)`(.*)`>(.*)",s) show_command=re.match("(.*)`(.*)`>(.*)",s)
if show_command != None: if show_command != None:
output = subprocess.check_output(show_command.group(2).strip(),shell=True).split("\n") output = subprocess.check_output(
show_command.group(2).strip(),
shell = True
)
if type(output) == bytes:
output = output.decode('utf-8')
output = output.split("\n")
while len(output[0].strip())==0: while len(output[0].strip())==0:
if len(output)==1: return [""] if len(output)==1: return
del output[0] del output[0]
while len(output[-1].strip())==0: while len(output[-1].strip())==0:
if len(output)==1: return [""] if len(output)==1: return
del output[-1] del output[-1]
for y,l in enumerate(output): for y,l in enumerate(output):
bc.posprint(y+offset[1]-offset[0]+2,0,' '*len(l)) bc.posprint(y+offset[1]-offset[0]+2,0,' '*len(l))
@@ -614,22 +653,37 @@ def launch(reader,opts,offset):
inkey=getch.get() inkey=getch.get()
return return
if run_command != None: if run_command != None:
subprocess.call(run_command.group(2), subprocess.call(
shell=True,executable="/bin/bash") run_command.group(2),
shell = True,
executable = "/bin/bash"
)
inkey=getch.get() inkey=getch.get()
return return
# Open URLS last # Open URLS last
if len(urls)>0: if len(urls)>0:
# Remove ) at the end of url: [name](link) markdown syntax # Remove ) at the end of url: [name](link) markdown syntax
subprocess.call("xdg-open '%s' &"%(urls[0].rstrip(")"),), subprocess.call(
stdout=subprocess.PIPE,stderr=subprocess.PIPE, "%s '%s' &"%(
shell=True) get_open_command(),
urls[0].rstrip(")"),
),
stdout = subprocess.PIPE,
stderr = subprocess.PIPE,
shell = True
)
return return
if len(images)>0: if len(images)>0:
image = re.sub('.*\(([^\)]+)\).*', "\\1",images[0]) image = re.sub('.*\(([^\)]+)\).*', "\\1",images[0])
subprocess.call("xdg-open '%s' &"%(image,), subprocess.call(
stdout=subprocess.PIPE,stderr=subprocess.PIPE, "%s '%s' &"%(
shell=True) get_open_command(),
image,
),
stdout = subprocess.PIPE,
stderr = subprocess.PIPE,
shell = True
)
return return
return return
@@ -642,16 +696,32 @@ def modify_file(reader,offset):
row+=len(reader.data[page]) row+=len(reader.data[page])
if (page+1) in row_restarts: if (page+1) in row_restarts:
row=1 row=1
subprocess.call("vim +%d -c 'exe \"normal! zt\"' -c %d %s"%(row,row+offset[1],reader.get_current_filename()), subprocess.call(
shell=True) "vim +%d -c 'exe \"normal! zt\"' -c %d %s"%(
row,
row + offset[1],
reader.get_current_filename()
),
shell = True
)
def take_screenshot(reader,opts): def take_screenshot(reader,opts):
out_file=os.path.join(opts.screenshots,"slide%03d.png"%(reader.page+1)) out_file=os.path.join(opts.screenshots,"slide%03d.png"%(reader.page+1))
if not os.path.exists(opts.screenshots): if not os.path.exists(opts.screenshots):
os.mkdir(opts.screenshots) os.mkdir(opts.screenshots)
subprocess.call("sleep 0.5; import -window $WINDOWID '%s'"%(out_file,), subprocess.call(
stdout=subprocess.PIPE,stderr=subprocess.PIPE, "sleep 0.5; import -window $WINDOWID '%s'"%(out_file,),
shell=True) stdout = subprocess.PIPE,
stderr = subprocess.PIPE,
shell = True
)
def get_open_command():
if sys.platform.startswith("darwin"):
return "open"
else:
return "xdg-open"
def main(): def main():

BIN
reporting/markslider.tar.gz
View File

Binary file not shown.

87
reporting/md_color.py
View File

@@ -11,9 +11,9 @@ __version__ = "0.3"
''' Rules modified from mistune project ''' ''' Rules modified from mistune project '''
def setup_options(): def setup_options():
bc=ansi.code() bc = ansi.code()
''' Create command line options ''' ''' Create command line options '''
usage=''' usage = '''
Markdown syntax color in ansi codes. Markdown syntax color in ansi codes.
Special syntaxes: Special syntaxes:
Colors: insert string ${C}, where C is one of %s. Colors: insert string ${C}, where C is one of %s.
@@ -21,8 +21,10 @@ Any ANSI control code: ${3A}, ${1;34;42m}, etc..
'''%(" ".join(bc.get_keys())) '''%(" ".join(bc.get_keys()))
parser=ArgumentParser(description=usage, parser = ArgumentParser(
epilog=__author__) description = usage,
epilog = __author__
)
parser.add_argument("-v","--version",action="version",version=__version__) parser.add_argument("-v","--version",action="version",version=__version__)
parser.add_argument("-D",action="store_true",dest="debug",default=False, parser.add_argument("-D",action="store_true",dest="debug",default=False,
@@ -122,6 +124,45 @@ def md_re_compile(d):
sys.exit(1) sys.exit(1)
return n return n
def read_data2(fp):
data = []
# Read data
for row in f:
if not row:
continue
row = row.decode('utf-8').rstrip("\n\r ")
data.append(row)
return data
def read_data3(fp):
data = []
# Read data
for row in f:
if not row:
continue
row = row.rstrip("\n\r ")
data.append(row)
return data
def write_colored2(colored, opts):
for c in colored:
sys.stdout.write(c.encode('utf-8'))
if opts.zero:
sys.stdout.write(bc.Z)
sys.stdout.write("\n")
if opts.zero_final:
sys.stdout.write(bc.Z.encode('utf-8'))
def write_colored3(colored, opts):
for c in colored:
sys.stdout.write(c)
if opts.zero:
sys.stdout.write(bc.Z)
sys.stdout.write("\n")
if opts.zero_final:
sys.stdout.write(bc.Z)
# re: regular expression, bc: bright colors, bcc: continue with this color after inline # re: regular expression, bc: bright colors, bcc: continue with this color after inline
# dc: dark colors, dcc: continued color after inline # dc: dark colors, dcc: continued color after inline
@@ -185,8 +226,8 @@ inline_match_str={
'checkbox': {'re':r'(\[[x ]\])', 'checkbox': {'re':r'(\[[x ]\])',
'bc':'${y}\\1','dc':'${r}\\1'}, # [x] [ ] 'bc':'${y}\\1','dc':'${r}\\1'}, # [x] [ ]
} }
inline_match=md_re_compile(inline_match_str) inline_match = md_re_compile(inline_match_str)
inlines=['bold1','bold2','code_special','code','image','link','underline','strikethrough', 'checkbox'] inlines = ['bold1','bold2','code_special','code','image','link','underline','strikethrough', 'checkbox']
if __name__ == "__main__": if __name__ == "__main__":
opts=setup_options() opts=setup_options()
@@ -211,26 +252,20 @@ if __name__ == "__main__":
inline_match_str=template['inline_match'] inline_match_str=template['inline_match']
inline_match=md_re_compile(inline_match_str) inline_match=md_re_compile(inline_match_str)
bc=ansi.code() bc = ansi.code()
if opts.filename=="-" or opts.filename==None: if opts.filename == "-" or opts.filename == None:
f=sys.stdin f = sys.stdin
else: else:
f=open(opts.filename,'r') f = open(opts.filename, 'r')
data=[] if (sys.version_info > (3, 0)):
# Read data data = read_data3(f)
for row in f: else:
if not row: data = read_data2(f)
continue
row=row.decode('utf-8').rstrip("\n\r ")
data.append(row)
data=parse(data) data = parse(data)
colored=colorize(data,not opts.color,opts.dark_colors,opts.debug) colored = colorize(data, not opts.color, opts.dark_colors, opts.debug)
for c in colored: if (sys.version_info > (3, 0)):
sys.stdout.write(c.encode('utf-8')) write_colored3(colored, opts)
if opts.zero: else:
sys.stdout.write(bc.Z) write_colored2(colored, opts)
sys.stdout.write("\n")
if opts.zero_final:
sys.stdout.write(bc.Z.encode('utf-8'))