forks/archivebox
1
0
Fork 0
Code Releases Activity

Merge pull request #391 from apkallum/origin/archived-item-permissions

Browse source 
ensure correct permissions for archived items
This commit is contained in:
Nick Sweeting 2020-07-24 14:33:43 -04:00 committed by GitHub
commit 74ad79f1fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
archivebox/system.py
View file

@ -53,8 +53,11 @@ def chmod_file(path: str, cwd: str='.', permissions: str=OUTPUT_PERMISSIONS) ->
if not root.exists(): if not root.exists():
raise Exception('Failed to chmod: {} does not exist (did the previous step fail?)'.format(path)) raise Exception('Failed to chmod: {} does not exist (did the previous step fail?)'.format(path))
for subpath in Path(path).glob('**/*'): if not root.is_dir():
os.chmod(subpath, int(OUTPUT_PERMISSIONS, base=8)) os.chmod(root, int(OUTPUT_PERMISSIONS, base=8))
else:
for subpath in Path(path).glob('**/*'):
os.chmod(subpath, int(OUTPUT_PERMISSIONS, base=8))
@enforce_types @enforce_types

8
tests/test_init.py
View file

@ -51,3 +51,11 @@ def test_correct_permissions_output_folder(tmp_path, process):
file_path = tmp_path / file file_path = tmp_path / file
assert oct(file_path.stat().st_mode)[-3:] == OUTPUT_PERMISSIONS assert oct(file_path.stat().st_mode)[-3:] == OUTPUT_PERMISSIONS
def test_correct_permissions_add_command_results(tmp_path, process):
os.chdir(tmp_path)
add_process = subprocess.run(['archivebox', 'add', 'http://127.0.0.1:8080/static/example.com.html'], capture_output=True)
archived_item_path = list(tmp_path.glob('archive/**/*'))[0]
for path in archived_item_path.iterdir():
assert oct(path.stat().st_mode)[-3:] == OUTPUT_PERMISSIONS