Skip to content

Add free disk space mention #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
resu-xuniL wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add free disk space mention #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions linuxdir2html/linuxdir2html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# points to a non-file then it probably will not be in the output (e.g. wine drive_c dir).
# v1.6.1 finally fixes files with new lines and * breaking the output.

import shutil
import argparse
import datetime
import json
Expand All @@ -31,6 +32,7 @@
gen_time = datetime.datetime.now().strftime("%H:%M")
app_link = "https://github.com/homeisfar/LinuxDir2HTML"
dir_data = ""
free_space = 0
total_numFiles = 0
total_numDirs = 0
grand_total_size= 0
Expand Down Expand Up @@ -58,7 +60,7 @@
def main():
global include_hidden, file_links, childList_names, startsList_names, follow_symlink
args = parser.parse_args()

## Initialize logging facilities
log_level = logging.WARNING
if args.verbose:
Expand All @@ -71,7 +73,7 @@ def main():
logging.basicConfig(format='%(asctime)s %(message)s', datefmt='%H:%M:%S', level=log_level)
log_name = logging.getLevelName(logging.getLogger().getEffectiveLevel())
logging.info( f'Logging Level {log_name}')

# Handle user input flags and options
pathToIndex = args.pathToIndex
title = args.outputfile
Expand Down Expand Up @@ -109,25 +111,29 @@ def main():
# then generate the resulting HTML
pathToIndex = Path(pathToIndex).resolve()
logging.warning(f'Root index directory: [{pathToIndex}]')

# Get the freespace of the disk
free_space = shutil.disk_usage(pathToIndex).free

generateDirArray(pathToIndex)
logging.info('Outputting HTML...')
generateHTML(
dir_data, appName, app_ver, gen_date, gen_time, title, app_link,
free_space, dir_data, appName, app_ver, gen_date, gen_time, title, app_link,
total_numFiles, total_numDirs, grand_total_size, file_links
)
return

def generateDirArray(root_dir): # root i.e. user-provided root path, not "/"
global dir_data, total_numFiles, total_numDirs, grand_total_size, \
dir_results, childList_names, startsList_names
id = 0
dirs_dictionary = {}

# We enumerate every unique directory, ignoring symlinks by default.
first_iteration = True
for current_dir, dirs, files in os.walk(root_dir, True, None, follow_symlink):
logging.debug( f'Walking Dir [{current_dir}]')

# If --child or --startswith are used, only add the requested
# directories. This will only be performed on the root_dir
if first_iteration:
Expand Down Expand Up @@ -227,7 +233,7 @@ def selectDirs(current_dir, dirs, include_hidden):
return

def generateHTML(
dir_data, appName, app_ver, gen_date, gen_time, title,
free_space, dir_data, appName, app_ver, gen_date, gen_time, title,
app_link, numFiles, numDirs, grand_total_size, file_links
):
template_file = open((Path(__file__).parent / 'template.html'), 'r', encoding="utf-8")
Expand All @@ -242,6 +248,7 @@ def generateHTML(
except:
logging.warning(f'----output_file.write error [{line}]')
continue
modified_line = modified_line.replace('[FREE SPACE]', str(free_space))
modified_line = modified_line.replace('[APP NAME]', appName)
modified_line = modified_line.replace('[APP VER]', app_ver)
modified_line = modified_line.replace('[GEN DATE]', gen_date)
Expand Down
12 changes: 11 additions & 1 deletion linuxdir2html/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
/* --- Top header --- */

.app_header {
height:80px;
height: 110px;
max-width: 1440px;
background-color:#eee;
margin-left: auto;
Expand Down Expand Up @@ -103,6 +103,7 @@

margin:10px;
margin-left:16px;
margin-bottom: 50px;
float:left;
width:48px;
height:48px;
Expand All @@ -124,6 +125,13 @@
top: -1px;
cursor: pointer;
}

.app_header_free_space {
padding: 10px;
padding-top:0px;
font-weight: bold;
}

.app_header_stats {
padding: 10px;
padding-top:0px;
Expand Down Expand Up @@ -819,6 +827,7 @@

/* --- Init --- */

$("#free_space").text( bytesToSize( $("#free_space").text() ) );
$("#tot_size").text( bytesToSize( $("#tot_size").text() ) );

$("#loading").remove();
Expand Down Expand Up @@ -1697,6 +1706,7 @@
</form>

<h1>[TITLE]</h1>
<div class="app_header_free_space">Free space on disk: <span id="free_space">[FREE SPACE]</span></div>
<div class="app_header_stats">[NUM FILES] files in [NUM DIRS] folders (<span id="tot_size">[TOT SIZE]</span>)<br>Generated [GEN DATE] [GEN TIME] by <a href="[APP LINK]">[APP NAME]</a></div>

</div>
Expand Down