Robot
/
updog
mirror of https://github.com/sc0tfree/updog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to os.path.relpath to correct relative path computation.

This commit is contained in:
Alan Deutscher 2020-02-24 21:05:16 -08:00
parent 28a1ac1612
commit f1bd38b21b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
updog/utils/path.py
View File

@ -15,11 +15,6 @@ def is_valid_upload_path(path, base_directory):
in_question = os.path.abspath(path)
return os.path.commonprefix([base_directory, in_question]) == base_directory
def get_relative_path(file_path, base_directory):
return file_path.split(os.path.commonprefix([base_directory, file_path]))[1][1:]
def human_readable_file_size(size):
# Taken from Dipen Panchasara
# https://stackoverflow.com/questions/1094841/reusable-library-to-get-human-readable-version-of-file-size
@ -40,7 +35,7 @@ def process_files(directory_files, base_directory):
files.append({
'name': file.name,
'is_dir': file.is_dir(),
'rel_path': get_relative_path(file.path, base_directory),
'rel_path': os.path.relpath(file.path, base_directory),
'size': size,
'size_sort': size_sort,
'last_modified': ctime(file.stat().st_mtime),
@ -50,7 +45,7 @@ def process_files(directory_files, base_directory):
def get_parent_directory(path, base_directory):
difference = get_relative_path(path, base_directory)
difference = os.path.relpath(path, base_directory)
difference_fields = difference.split('/')
if len(difference_fields) == 1:
return ''