Fix issue #9978: Support related images from local file share #9985
Conversation
- Fix path validation in _validate_ri_path to support SHARE storage paths - Include related images in backup for SHARE storage tasks
|
|
Hi. Thank you for the PR, please add at least 1 test for each problem fixed. |
|
Please also keep in mind that there's another PR that tries to address this issue: #9984. I think, it will be better to focus each PR on just 1 problem. |
| raw_data_dir = db_data.get_raw_data_dirname() | ||
|
|
||
| def _validate_ri_path(path: str) -> str: | ||
| if os.path.isabs(path): |
There was a problem hiding this comment.
I also think it would be better to normalize any input paths, not only relative ones. Could you add this conversion as well?
| elif path.startswith(data_upload_dir + os.sep): | ||
| path = os.path.relpath(path, raw_data_dir) |
There was a problem hiding this comment.
I'm not sure we have a use case for this branch at the moment. If the task is local or from cloud, the data is supposed to be in the upload dir. The only other case is the file share, in which case the files are supposed to be there. Both these cases should be covered just by using get_raw_data_dirname instead of get_upload_dirname. I suggest to keep only 1 branch and remove the data_upload_dir variable.
2 participants
Fixes #9978
Changes
_validate_ri_pathto support SHARE storage paths by checking bothraw_data_dir(SHARE_ROOT) anddata_upload_dirTesting