Skip to content

get_upload_foldername() was going too far in mangling hyphens #53

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

Open
acrewdson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

get_upload_foldername() was going too far in mangling hyphens #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions cropduster/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ def test_get_upload_foldername(self):
os.path.join(path, 'my_img-1'))
shutil.rmtree(path)

def test_get_upload_foldername_with_hyphens_and_underscores(self):
import uuid
from ..utils import get_upload_foldername

random = uuid.uuid4().hex
random = '--__-'.join((random[0:5], random[5:]))
path = os.path.join(settings.MEDIA_ROOT, random)
self.assertEqual(get_upload_foldername('my img.jpg', upload_to=random),
os.path.join(path, 'my_img'))
shutil.rmtree(path)

def test_get_min_size(self):
from ..utils import get_min_size
from ..resizing import Size
Expand Down
11 changes: 6 additions & 5 deletions cropduster/utils/paths.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ def get_upload_foldername(file_name, upload_to='%Y/%m'):
file_field = FileField(upload_to=upload_to)
if not file_name:
file_name = 'no_name'
filename = file_field.generate_filename(None, file_name)
filename = re.sub(r'[_\-]+', '_', filename)

if six.PY2 and isinstance(filename, unicode):
filename = filename.encode('utf-8')
file_name_abs = os.path.split(file_field.generate_filename(None, file_name))
file_name_abs = os.path.join(file_name_abs[0], re.sub(r'[_\-]+', '_', file_name_abs[1]))

root_dir = os.path.splitext(filename)[0]
if six.PY2 and isinstance(file_name_abs, unicode):
file_name_abs = file_name_abs.encode('utf-8')

root_dir = os.path.splitext(file_name_abs)[0]
root_dir = dir_name = os.path.join(settings.MEDIA_ROOT, root_dir)
i = 1
while os.path.exists(dir_name):
Expand Down