More clear variable name, use _delete_scan to avoid calling fastapi-endpoint in loops
This commit is contained in:
parent
19d72bef1c
commit
4a44dceac6
1 changed files with 10 additions and 6 deletions
|
|
@ -830,16 +830,18 @@ class SmartScanThing(Thing):
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
def delete_scan(self, scan_name: str, logger: InvocationLogger) -> None:
|
def delete_scan(self, scan_name: str, logger: InvocationLogger) -> None:
|
||||||
"""Delete all files from a scan.
|
"""Delete the folder for the specified scan.
|
||||||
|
|
||||||
This endpoint allows scans to be deleted from disk.
|
This endpoint allows scans to be deleted from disk.
|
||||||
|
|
||||||
|
Takes the scan name to delete, and the Invocation Logger
|
||||||
"""
|
"""
|
||||||
path = os.path.join(self.base_scan_dir, scan_name)
|
path = os.path.join(self.base_scan_dir, scan_name)
|
||||||
if not os.path.isdir(path):
|
if not os.path.isdir(path):
|
||||||
print(f"can't find {path}")
|
logger.info(f"can't find {path}")
|
||||||
raise HTTPException(400, "Scan not found")
|
raise HTTPException(400, "Scan not found")
|
||||||
result = self._delete_scan(path, logger)
|
deleted_scan_success = self._delete_scan(path, logger)
|
||||||
if not result:
|
if not deleted_scan_success:
|
||||||
raise HTTPException(400, "Couldn't delete scan, check log for details")
|
raise HTTPException(400, "Couldn't delete scan, check log for details")
|
||||||
|
|
||||||
@fastapi_endpoint(
|
@fastapi_endpoint(
|
||||||
|
|
@ -854,7 +856,8 @@ class SmartScanThing(Thing):
|
||||||
Use with extreme caution.
|
Use with extreme caution.
|
||||||
"""
|
"""
|
||||||
for scan in self.scans:
|
for scan in self.scans:
|
||||||
self.delete_scan(scan.name, logger)
|
path = os.path.join(self.base_scan_dir, scan.name)
|
||||||
|
self._delete_scan(path, logger)
|
||||||
|
|
||||||
@thing_action
|
@thing_action
|
||||||
def _delete_scan(self, scan_path, logger: InvocationLogger) -> bool:
|
def _delete_scan(self, scan_path, logger: InvocationLogger) -> bool:
|
||||||
|
|
@ -1177,4 +1180,5 @@ class SmartScanThing(Thing):
|
||||||
]
|
]
|
||||||
|
|
||||||
if len(image_list) == 0:
|
if len(image_list) == 0:
|
||||||
self.delete_scan(scan.name)
|
path = os.path.join(self.base_scan_dir, scan.name)
|
||||||
|
self._delete_scan(path, logger)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue