diff --git a/files/file_version.py b/files/file_version.py
index 06fc656..3f2f8f2 100755
--- a/files/file_version.py
+++ b/files/file_version.py
@@ -12,7 +12,7 @@ def get_options():
action = "store_false",
dest = "move",
default = True,
- help = "Copy file instead of copying",
+ help = "Copy file instead of moving",
)
parser.add_argument(
'-d',
@@ -112,10 +112,7 @@ if __name__ == "__main__":
else:
new_name = get_version_name(opts.file)
if not opts.quiet:
- print("%s -> %s"%(
- opts.file,
- new_name
- ))
+ print(new_name)
test_existing(new_name, opts.force)
if opts.move:
os.rename(opts.file, new_name)
diff --git a/web/SimpleWebPage.py b/web/SimpleWebPage.py
index d236fff..007daee 100755
--- a/web/SimpleWebPage.py
+++ b/web/SimpleWebPage.py
@@ -1,16 +1,17 @@
#!/usr/bin/env python
# coding=utf-8
-''' A script that creates an index for a folder.
+''' A script that creates an index for a folder.
'''
import os,sys,time
import urllib
-VERSION="20160116"
-IMAGE_EXTENSIONS=['png','gif','jpg','jpeg','tif','tiff']
+
+VERSION = "20181206"
+IMAGE_EXTENSIONS = ['png', 'gif', 'jpg', 'jpeg', 'tif', 'tiff']
def setup():
''' Setup the command line options '''
- from argparse import ArgumentParser
+ from argparse import ArgumentParser
parser=ArgumentParser()
parser.add_argument("-f",action="store_true",dest="overwrite",default=False,
help="Overwrite existing index file.")
@@ -27,11 +28,12 @@ def setup():
parser.add_argument("--version",action='version', version=VERSION)
parser.add_argument("path",type=str,action="store",default=os.path.abspath('.'),nargs='?',
help="Root path of the index")
- options=parser.parse_args()
- options.path=os.path.abspath(options.path)
- if options.title==None:
- options.title=os.path.basename(options.path)
- return options
+
+ options = parser.parse_args()
+ options.path = os.path.abspath(options.path)
+ if options.title == None:
+ options.title = os.path.basename(options.path)
+ return options
def setup2HTML(opts):
return ''%";".join([
@@ -42,18 +44,18 @@ def setup2HTML(opts):
])
def HTML2setup(opts):
- f=open(os.path.join(opts.path,opts.filename), 'rt')
- try:
+ f = open(os.path.join(opts.path,opts.filename), 'rt')
+ try:
for l in f.readlines():
- if l.find('name="SimpleWebPageSetup"')>-1:
- content=l[l.find('name="SimpleWebPageSetup"'):]
+ if l.find('name="SimpleWebPageSetup"') > -1:
+ content = l[l.find('name="SimpleWebPageSetup"'):]
for s in content.split('"')[3].split(";"):
- (k,v)=s.split('=',1)
- if k=='hidden': opts.hidden=v=="True"
- if k=='parent': opts.parent=v=="True"
- if k=='title': opts.title=urllib.unquote(v)
- if k=='images': opts.images=v=="True"
- print("Reading options from existing "+opts.filename)
+ (k,v) = s.split('=',1)
+ if k == 'hidden': opts.hidden = v == "True"
+ if k == 'parent': opts.parent = v == "True"
+ if k == 'title': opts.title = urllib.unquote(v)
+ if k == 'images': opts.images = v == "True"
+ print("Reading options from existing " + opts.filename)
break
except:
pass
@@ -65,70 +67,133 @@ def generate_index(opts):
if not opts.overwrite:
print(opts.filename+" exists")
sys.exit(1)
- opts=HTML2setup(opts)
+ opts = HTML2setup(opts)
files = [ f for f in files if f != opts.filename]
if not opts.hidden:
files = [ f for f in files if not f.startswith(".")]
dirs = [ d for d in dirs if not d.startswith(".")]
- f=open(os.path.join(path,opts.filename),'wt')
+ f = open(os.path.join(path,opts.filename),'wt')
dirs.sort()
files.sort()
f.write(get_header(opts))
if opts.parent:
- f.write(get_pathlink(path,'..'))
+ f.write(get_pathlink(path, '..'))
for di in dirs:
- f.write(get_pathlink(path,di))
+ f.write(get_pathlink(path, di))
for fi in files:
- f.write(get_filelink(path,fi,opts.images))
+ f.write(get_filelink(path, fi, opts.images))
f.write(get_footer())
f.close()
return
def get_filelink(path,fname,images=False):
- if os.path.islink(os.path.join(path,fname)) and not os.path.exists(os.path.join(path,fname)):
- (fsize,fsstr,fsstrb,fdstr)=(0,"NA","NA","NA")
+ if os.path.islink(os.path.join(path, fname)) and not os.path.exists(os.path.join(path, fname)):
+ (fsize, fsstr, fsstrb, fdstr)=(0, "NA", "NA", "NA")
else:
- fsize=os.path.getsize(os.path.join(path,fname))
- fsstr=sizeof(fsize)
- fsstrb=str(fsize)
- fdate=time.localtime(os.path.getmtime(os.path.join(path,fname)))
- fdstr=time.strftime("%Y/%m/%d %H:%M:%S",fdate)
+ fsize = os.path.getsize(os.path.join(path, fname))
+ fsstr = sizeof(fsize)
+ fsstrb = str(fsize)
+ fdate = time.localtime(os.path.getmtime(os.path.join(path, fname)))
+ fdstr = time.strftime("%Y/%m/%d %H:%M:%S", fdate)
if images and is_imagefile(fname):
- fname_str=get_imagestr(fname)
+ fname_str = get_imagestr(fname)
else:
- fname_str=fname
- return '| '+fname_str+' | '+fsstr+' | '+fsstrb+' | '+fdstr+' |
\n'
+ fname_str = fname
+ return '| %s | %s | %s | %s |
\n'%(
+ urllib.quote(fname),
+ fname_str,
+ fsstr,
+ fsstrb,
+ fdstr
+ )
def get_imagestr(fname):
- return '+' "'+fname+'")
'
+ return '
'%(
+ urllib.quote(fname),
+ fname
+ )
def get_pathlink(path,dname):
- fdate=time.localtime(os.path.getmtime(os.path.join(path,dname)))
- fdstr=time.strftime("%Y/%m/%d %H:%M:%S",fdate)
- return '| '+dname+' | [DIR] | 0 | '+fdstr+' |
\n'
+ fdate = time.localtime(os.path.getmtime(os.path.join(path, dname)))
+ fdstr = time.strftime("%Y/%m/%d %H:%M:%S", fdate)
+ return '| ↳ %s/ | [DIR] | 0 | %s |
\n'%(
+ urllib.quote(dname),
+ dname,
+ fdstr
+ )
def get_header(opts):
header='''
-
- '''+setup2HTML(opts)+'''
- Index of '''+opts.title+'''
+
+ ''' + setup2HTML(opts) + '''
+ ''' + opts.title + '''