Fix variable referencing bug in Dir()
This commit is contained in:
parent
db51c7c4c7
commit
36027414d8
17
util.py
17
util.py
@ -46,31 +46,36 @@ class Dir(object):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
def get_subdirs(self, path=None):
|
def get_subdirs(self, path=None):
|
||||||
|
subdirs = []
|
||||||
if path and path != '':
|
if path and path != '':
|
||||||
subdir = path.split('/')[0]
|
subdir = path.split('/')[0]
|
||||||
if subdir in self.subdirs:
|
if subdir in self.subdirs:
|
||||||
searchpath = '/'.join(path.split('/')[1::])
|
searchpath = '/'.join(path.split('/')[1::])
|
||||||
return self.subdirs[subdir].get_subdirs(searchpath)
|
subdirs = self.subdirs[subdir].get_subdirs(searchpath)
|
||||||
else:
|
else:
|
||||||
return self.subdirs
|
subdirs = self.subdirs
|
||||||
|
|
||||||
|
return subdirs
|
||||||
|
|
||||||
def get_files(self, path=None):
|
def get_files(self, path=None):
|
||||||
|
files = []
|
||||||
if path and path != '':
|
if path and path != '':
|
||||||
subdir = path.split('/')[0]
|
subdir = path.split('/')[0]
|
||||||
if subdir in self.subdirs:
|
if subdir in self.subdirs:
|
||||||
searchpath = '/'.join(path.split('/')[1::])
|
searchpath = '/'.join(path.split('/')[1::])
|
||||||
return self.subdirs[subdir].get_files(searchpath)
|
files = self.subdirs[subdir].get_files(searchpath)
|
||||||
else:
|
else:
|
||||||
return self.files
|
files = self.files
|
||||||
|
|
||||||
|
return files
|
||||||
|
|
||||||
def get_files_recursively(self, path=None):
|
def get_files_recursively(self, path=None):
|
||||||
print('in get_files_recursively', path)
|
files = []
|
||||||
if path and path != '':
|
if path and path != '':
|
||||||
subdir = path.split('/')[0]
|
subdir = path.split('/')[0]
|
||||||
if subdir in self.subdirs:
|
if subdir in self.subdirs:
|
||||||
searchpath = '/'.join(path.split('/')[1::])
|
searchpath = '/'.join(path.split('/')[1::])
|
||||||
return self.subdirs[subdir].get_files_recursively(searchpath)
|
files = self.subdirs[subdir].get_files_recursively(searchpath)
|
||||||
else:
|
else:
|
||||||
files = self.files
|
files = self.files
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user