From 9869257aaae5035102593ba9e1c56cb2642a5e96 Mon Sep 17 00:00:00 2001 From: q Date: Sun, 20 Dec 2015 12:31:29 +0200 Subject: [PATCH] reorganization, and output filename for SimpleWeb --- bin/FolderFlat | 2 +- bin/FolderSplit | 2 +- bin/diskfree-tracker | 2 +- bin/file_list | 2 +- bin/fimplate | 2 +- bin/image_list | 2 +- bin/mvregex | 2 +- bin/rm_bg | 2 +- FolderFlat => files/FolderFlat | 0 FolderSplit.py => files/FolderSplit.py | 0 {reporting => files}/diskfree-tracker | 0 file_list.py => files/file_list.py | 0 fimplate.py => files/fimplate.py | 0 image_list.py => files/image_list.py | 0 .../image_list_tagger.py | 0 mvregex => files/mvregex | 0 rm_bg => files/rm_bg | 0 web_serving/SimpleWebPage.py | 15 ++++++++------- 18 files changed, 16 insertions(+), 15 deletions(-) rename FolderFlat => files/FolderFlat (100%) rename FolderSplit.py => files/FolderSplit.py (100%) rename {reporting => files}/diskfree-tracker (100%) rename file_list.py => files/file_list.py (100%) rename fimplate.py => files/fimplate.py (100%) rename image_list.py => files/image_list.py (100%) rename image_list_tagger.py => files/image_list_tagger.py (100%) rename mvregex => files/mvregex (100%) rename rm_bg => files/rm_bg (100%) diff --git a/bin/FolderFlat b/bin/FolderFlat index bdd652c..5a639df 120000 --- a/bin/FolderFlat +++ b/bin/FolderFlat @@ -1 +1 @@ -../FolderFlat \ No newline at end of file +../files/FolderFlat \ No newline at end of file diff --git a/bin/FolderSplit b/bin/FolderSplit index 9646218..64a1a9f 120000 --- a/bin/FolderSplit +++ b/bin/FolderSplit @@ -1 +1 @@ -../FolderSplit.py \ No newline at end of file +../files/FolderSplit.py \ No newline at end of file diff --git a/bin/diskfree-tracker b/bin/diskfree-tracker index a99ee28..b06412a 120000 --- a/bin/diskfree-tracker +++ b/bin/diskfree-tracker @@ -1 +1 @@ -../reporting/diskfree-tracker \ No newline at end of file +../files/diskfree-tracker \ No newline at end of file diff --git a/bin/file_list b/bin/file_list index 6f4a5a5..e836e0b 120000 --- a/bin/file_list +++ b/bin/file_list @@ -1 +1 @@ -../file_list.py \ No newline at end of file +../files/file_list.py \ No newline at end of file diff --git a/bin/fimplate b/bin/fimplate index fc189b6..2283675 120000 --- a/bin/fimplate +++ b/bin/fimplate @@ -1 +1 @@ -../fimplate.py \ No newline at end of file +../files/fimplate.py \ No newline at end of file diff --git a/bin/image_list b/bin/image_list index 99ca263..2099132 120000 --- a/bin/image_list +++ b/bin/image_list @@ -1 +1 @@ -../image_list.py \ No newline at end of file +../files/image_list.py \ No newline at end of file diff --git a/bin/mvregex b/bin/mvregex index 4604c51..7ee46a5 120000 --- a/bin/mvregex +++ b/bin/mvregex @@ -1 +1 @@ -../mvregex \ No newline at end of file +../files/mvregex \ No newline at end of file diff --git a/bin/rm_bg b/bin/rm_bg index 611237d..567df06 120000 --- a/bin/rm_bg +++ b/bin/rm_bg @@ -1 +1 @@ -../rm_bg \ No newline at end of file +../files/rm_bg \ No newline at end of file diff --git a/FolderFlat b/files/FolderFlat similarity index 100% rename from FolderFlat rename to files/FolderFlat diff --git a/FolderSplit.py b/files/FolderSplit.py similarity index 100% rename from FolderSplit.py rename to files/FolderSplit.py diff --git a/reporting/diskfree-tracker b/files/diskfree-tracker similarity index 100% rename from reporting/diskfree-tracker rename to files/diskfree-tracker diff --git a/file_list.py b/files/file_list.py similarity index 100% rename from file_list.py rename to files/file_list.py diff --git a/fimplate.py b/files/fimplate.py similarity index 100% rename from fimplate.py rename to files/fimplate.py diff --git a/image_list.py b/files/image_list.py similarity index 100% rename from image_list.py rename to files/image_list.py diff --git a/image_list_tagger.py b/files/image_list_tagger.py similarity index 100% rename from image_list_tagger.py rename to files/image_list_tagger.py diff --git a/mvregex b/files/mvregex similarity index 100% rename from mvregex rename to files/mvregex diff --git a/rm_bg b/files/rm_bg similarity index 100% rename from rm_bg rename to files/rm_bg diff --git a/web_serving/SimpleWebPage.py b/web_serving/SimpleWebPage.py index f2913a5..2e61d1a 100755 --- a/web_serving/SimpleWebPage.py +++ b/web_serving/SimpleWebPage.py @@ -1,22 +1,23 @@ #!/usr/bin/python # coding=utf-8 -''' A script that creates index.html indexes for a folder. +''' A script that creates an index for a folder. ''' import os,sys,time import urllib -INDEXFILE='index.html' def setup(): ''' Setup the command line options ''' from argparse import ArgumentParser parser=ArgumentParser() parser.add_argument("-f",action="store_true",dest="overwrite",default=False, - help="Overwrite existing "+INDEXFILE) + help="Overwrite existing index file.") parser.add_argument("-H",action="store_true",dest="hidden",default=False, help="Show hidden files") parser.add_argument("-t",type=str,dest="title",default=None, help="Name for the title (Default: Folder name)") + parser.add_argument("-o",type=str,dest="filename",default="index.html", + help="Output filename (Default: index.html)") parser.add_argument("-p",action="store_false",dest="parent",default=True, help="Do no print .. link for parent folder.") parser.add_argument("startpath",type=str,action="store",default=os.path.abspath('.'),nargs='?', @@ -29,15 +30,15 @@ def setup(): def generate_index(opts): for path,dirs,files in os.walk(opts.startpath): - if INDEXFILE in files: + if opts.filename in files: if not opts.overwrite: - print(INDEXFILE+" exists") + print(opts.filename+" exists") sys.exit(1) - files = [ f for f in files if f != INDEXFILE] + 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,INDEXFILE),'wt') + f=open(os.path.join(path,opts.filename),'wt') dirs.sort() files.sort() f.write(get_header(opts.title))