voussoir/else
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simpleserver updates.

Browse source
This commit is contained in:
Ethan Dalool 2019-12-10 12:46:45 -08:00
parent f3e62e9356
commit 6d3f196214
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
SimpleServer/simpleserver.py
View file

@ -159,9 +159,9 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
# pass # pass
def allowed(path): def allowed(path):
return path in ROOT_DIRECTORY return path == ROOT_DIRECTORY or path in ROOT_DIRECTORY
def anchor(path, display_name=None): def atag(path, display_name=None):
path.correct_case() path.correct_case()
if display_name is None: if display_name is None:
display_name = path.basename display_name = path.basename
@ -202,6 +202,10 @@ def generate_opendir(path):
if item.is_dir: if item.is_dir:
directories.append(item) directories.append(item)
else: else:
if item.basename.lower() == 'thumbs.db':
continue
if item.basename.lower() == 'desktop.ini':
continue
files.append(item) files.append(item)
items = directories + files items = directories + files
@ -212,7 +216,9 @@ def generate_opendir(path):
if path.absolute_path == ROOT_DIRECTORY.absolute_path: if path.absolute_path == ROOT_DIRECTORY.absolute_path:
# This is different than a permission check, we're seeing if they're # This is different than a permission check, we're seeing if they're
# actually at the top, in which case they don't need an up button. # actually at the top, in which case they don't need an up button.
pass entry = table_row(path, display_name='.', shaded=shaded)
table_rows.append(entry)
shaded = not shaded
else: else:
entry = table_row(path.parent, display_name='up', shaded=shaded) entry = table_row(path.parent, display_name='up', shaded=shaded)
table_rows.append(entry) table_rows.append(entry)
@ -223,10 +229,10 @@ def generate_opendir(path):
table_rows.append(entry) table_rows.append(entry)
shaded = not shaded shaded = not shaded
if len(items) > 0: # if len(items) > 0:
entry = table_row(path.replace_extension('.zip'), display_name='zip', shaded=shaded) # entry = table_row(path.replace_extension('.zip'), display_name='zip', shaded=shaded)
shaded = not shaded # shaded = not shaded
table_rows.append(entry) # table_rows.append(entry)
table_rows = '\n'.join(table_rows) table_rows = '\n'.join(table_rows)
text = OPENDIR_TEMPLATE.format(table_rows=table_rows) text = OPENDIR_TEMPLATE.format(table_rows=table_rows)
@ -272,10 +278,13 @@ def table_row(path, display_name=None, shaded=False):
else: else:
size = bytestring.bytestring(size) size = bytestring.bytestring(size)
bg = 'ddd' if shaded else 'fff'; bg = 'ddd' if shaded else 'fff'
anchor = atag(path, display_name=display_name)
row = form.format( row = form.format(
bg=bg, bg=bg,
anchor=anchor(path, display_name=display_name), anchor=anchor,
size=size, size=size,
) )
return row return row