markus/photofloat
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge updates from 'master'

Browse Source
This commit is contained in:
Joachim Tingvold 2015-06-06 06:55:18 +02:00
commit ec0828e610
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scanner/TreeWalker.py
View File

@ -19,6 +19,10 @@ class TreeWalker:
message("complete", "") message("complete", "")
def walk(self, path): def walk(self, path):
next_level() next_level()
if not os.access(path, os.R_OK | os.X_OK):
message("access denied", os.path.basename(path))
back_level()
return None
message("walking", os.path.basename(path)) message("walking", os.path.basename(path))
cache = os.path.join(self.cache_path, json_cache(path)) cache = os.path.join(self.cache_path, json_cache(path))
cached = False cached = False
@ -55,7 +59,9 @@ class TreeWalker:
continue continue
entry = os.path.join(path, entry) entry = os.path.join(path, entry)
if os.path.isdir(entry): if os.path.isdir(entry):
album.add_album(self.walk(entry)) next_walked_album = self.walk(entry)
if next_walked_album is not None:
album.add_album(next_walked_album)
elif not cached and os.path.isfile(entry): elif not cached and os.path.isfile(entry):
next_level() next_level()
cache_hit = False cache_hit = False