Skip to content

Fix user and user_path in FSNode for subpath deployments #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 17, 2024
Merged

Fix user and user_path in FSNode for subpath deployments #297

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e75ca9
Formatting from pre-commit hooks
vwbusguy Sep 16, 2024
19ad045
Fix comment typo and give more specific comment.
vwbusguy Sep 16, 2024
8a89d93
Add wildcard to the correct regex and remove it from the one that doe…
vwbusguy Sep 16, 2024
91940c4
Update regex for trashbin and versions paths.
vwbusguy Sep 17, 2024
986fa1f
Fix for a vim artifact typo.
vwbusguy Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions nc_py_api/files/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@
import email.utils
import enum
import os
import re
import warnings

from pydantic import BaseModel

from .. import _misc

user_regex = re.compile(r"(?:files|trashbin|versions)/([^/]+)/")
"""Regex for evaluating user from full path string; instantiated once on import."""
user_path_regex = re.compile(r".*?(files|trashbin|versions)/([^/]+)/")
"""Regex for evaluating user path from full path string; instantiated once on import."""


class LockType(enum.IntEnum):
"""Nextcloud File Locks types."""
Expand Down Expand Up @@ -218,12 +224,12 @@ def name(self) -> str:
@property
def user(self) -> str:
"""Returns user ID extracted from the `full_path`."""
return self.full_path.lstrip("/").split("/", maxsplit=2)[1]
return user_regex.findall(self.full_path)[0]

@property
def user_path(self) -> str:
"""Returns path relative to the user's root directory."""
return self.full_path.lstrip("/").split("/", maxsplit=2)[-1]
return user_path_regex.sub("", self.full_path, count=1)

@property
def is_shared(self) -> bool:
Expand Down