Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
766066fd
Commit
766066fd
authored
Oct 02, 2014
by
Adam Palay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
image files with different extensions should generate thumbnails with distinct names (TNL-532)
parent
4e796c57
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
common/lib/xmodule/xmodule/contentstore/content.py
+4
-1
common/lib/xmodule/xmodule/tests/test_content.py
+12
-3
No files found.
common/lib/xmodule/xmodule/contentstore/content.py
View file @
766066fd
...
...
@@ -40,8 +40,11 @@ class StaticContent(object):
@staticmethod
def
generate_thumbnail_name
(
original_name
):
name_root
,
ext
=
os
.
path
.
splitext
(
original_name
)
if
not
ext
==
XASSET_THUMBNAIL_TAIL_NAME
:
name_root
=
name_root
+
ext
.
replace
(
u'.'
,
u'-'
)
return
u"{name_root}{extension}"
.
format
(
name_root
=
os
.
path
.
splitext
(
original_name
)[
0
]
,
name_root
=
name_root
,
extension
=
XASSET_THUMBNAIL_TAIL_NAME
,)
@staticmethod
...
...
common/lib/xmodule/xmodule/tests/test_content.py
View file @
766066fd
import
unittest
import
ddt
from
xmodule.contentstore.content
import
StaticContent
,
StaticContentStream
from
xmodule.contentstore.content
import
ContentStore
from
opaque_keys.edx.locations
import
SlashSeparatedCourseKey
,
AssetLocation
...
...
@@ -73,6 +74,7 @@ class FakeGridFsItem:
return
chunk
@ddt.ddt
class
ContentTest
(
unittest
.
TestCase
):
def
test_thumbnail_none
(
self
):
# We had a bug where a thumbnail location of None was getting transformed into a Location tuple, with
...
...
@@ -88,12 +90,19 @@ class ContentTest(unittest.TestCase):
url
=
StaticContent
.
convert_legacy_static_url_with_course_id
(
'images_course_image.jpg'
,
course_key
)
self
.
assertEqual
(
url
,
'/c4x/foo/bar/asset/images_course_image.jpg'
)
def
test_generate_thumbnail_image
(
self
):
@ddt.data
(
(
u"monsters__.jpg"
,
u"monsters__.jpg"
),
(
u"monsters__.png"
,
u"monsters__-png.jpg"
),
(
u"dots.in.name.jpg"
,
u"dots.in.name.jpg"
),
(
u"dots.in.name.png"
,
u"dots.in.name-png.jpg"
),
)
@ddt.unpack
def
test_generate_thumbnail_image
(
self
,
original_filename
,
thumbnail_filename
):
contentStore
=
ContentStore
()
content
=
Content
(
AssetLocation
(
u'mitX'
,
u'800'
,
u'ignore_run'
,
u'asset'
,
u'monsters__.jpg'
),
None
)
content
=
Content
(
AssetLocation
(
u'mitX'
,
u'800'
,
u'ignore_run'
,
u'asset'
,
original_filename
),
None
)
(
thumbnail_content
,
thumbnail_file_location
)
=
contentStore
.
generate_thumbnail
(
content
)
self
.
assertIsNone
(
thumbnail_content
)
self
.
assertEqual
(
AssetLocation
(
u'mitX'
,
u'800'
,
u'ignore_run'
,
u'thumbnail'
,
u'monsters__.jpg'
),
thumbnail_file_location
)
self
.
assertEqual
(
AssetLocation
(
u'mitX'
,
u'800'
,
u'ignore_run'
,
u'thumbnail'
,
thumbnail_filename
),
thumbnail_file_location
)
def
test_compute_location
(
self
):
# We had a bug that __ got converted into a single _. Make sure that substitution of INVALID_CHARS (like space)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment