Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
29e673dd
Commit
29e673dd
authored
4 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugfix/remove_path_and_rename' into 'master'
Remove path_and_rename See merge request
!562
parents
37d73508
40859491
No related branches found
No related tags found
1 merge request
!562
Remove path_and_rename
Pipeline
#7129
failed
4 years ago
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/tests/util/test_core_helpers.py
+0
-19
0 additions, 19 deletions
aleksis/core/tests/util/test_core_helpers.py
aleksis/core/util/core_helpers.py
+0
-16
0 additions, 16 deletions
aleksis/core/util/core_helpers.py
with
0 additions
and
35 deletions
aleksis/core/tests/util/test_core_helpers.py
deleted
100644 → 0
+
0
−
19
View file @
37d73508
import
re
from
aleksis.core.util.core_helpers
import
path_and_rename
def
test_path_and_rename
():
re_base
=
r
"
[a-z0-9]+
"
example_1
=
"
sdjaasjkl.jpg
"
re_example_1
=
"
files/
"
+
re_base
+
r
"
\.jpg
"
re2_example_1
=
"
images/
"
+
re_base
+
r
"
\.jpg
"
assert
re
.
match
(
re_example_1
,
path_and_rename
(
None
,
example_1
))
assert
re
.
match
(
re2_example_1
,
path_and_rename
(
None
,
example_1
,
upload_to
=
"
images
"
))
example_2
=
"
sdjaasjkl
"
re_example_2
=
"
files/
"
+
re_base
re2_example_2
=
"
images/
"
+
re_base
assert
re
.
match
(
re_example_2
,
path_and_rename
(
None
,
example_2
))
assert
re
.
match
(
re2_example_2
,
path_and_rename
(
None
,
example_2
,
upload_to
=
"
images
"
))
This diff is collapsed.
Click to expand it.
aleksis/core/util/core_helpers.py
+
0
−
16
View file @
29e673dd
import
os
import
sys
from
datetime
import
datetime
,
timedelta
from
importlib
import
import_module
from
itertools
import
groupby
from
operator
import
itemgetter
from
typing
import
Any
,
Callable
,
Optional
,
Sequence
,
Union
from
uuid
import
uuid4
if
sys
.
version_info
>=
(
3
,
9
):
from
importlib
import
metadata
...
...
@@ -183,20 +181,6 @@ def has_person(obj: Union[HttpRequest, Model]) -> bool:
return
True
def
path_and_rename
(
instance
,
filename
:
str
,
upload_to
:
str
=
"
files
"
)
->
str
:
"""
Update path of an uploaded file and renames it to a random UUID in Django FileField.
"""
_
,
ext
=
os
.
path
.
splitext
(
filename
)
# set filename as random string
new_filename
=
f
"
{
uuid4
().
hex
}{
ext
}
"
# Create upload directory if necessary
os
.
makedirs
(
os
.
path
.
join
(
settings
.
MEDIA_ROOT
,
upload_to
),
exist_ok
=
True
)
# return the whole path to the file
return
os
.
path
.
join
(
upload_to
,
new_filename
)
def
custom_information_processor
(
request
:
HttpRequest
)
->
dict
:
"""
Provide custom information in all templates.
"""
from
..models
import
CustomMenu
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment