CIRCL
/
lookyloo
mirror of https://github.com/CIRCL/lookyloo
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: skip root directory when scanning on s3fs

pull/833/head
Raphaël Vinot 2023-11-16 22:55:44 +01:00
parent 0182dbeb23
commit f209ef22f1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/archiver.py
View File

@ -99,6 +99,9 @@ class Archiver(AbstractManager):
# * <datetime> # * <datetime>
# * <day> (which contains a <datetime> directory) # * <day> (which contains a <datetime> directory)
for entry in self.s3fs_client.ls(s3fs_dir, detail=False, refresh=False): for entry in self.s3fs_client.ls(s3fs_dir, detail=False, refresh=False):
if entry.endswith('/'):
# root directory
continue
if not self.s3fs_client.isdir(entry): if not self.s3fs_client.isdir(entry):
# index # index
continue continue
@ -336,7 +339,7 @@ class Archiver(AbstractManager):
self.logger.warning('Shutdown requested, breaking.') self.logger.warning('Shutdown requested, breaking.')
break break
self.logger.info(f'Loading {index}') self.logger.debug(f'Loading {index}')
if recent_uuids := self.__load_index(index): if recent_uuids := self.__load_index(index):
self.logger.debug(f'{len(recent_uuids)} captures in directory {index.parent}.') self.logger.debug(f'{len(recent_uuids)} captures in directory {index.parent}.')
self.redis.hset('lookup_dirs', mapping=recent_uuids) # type: ignore self.redis.hset('lookup_dirs', mapping=recent_uuids) # type: ignore