0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

support merged download for specific resolution,format fixes #2353

Browse source
This commit is contained in:
j 2014-03-08 11:18:12 +00:00
commit c055c220e2
3 changed files with 50 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pandora/item/urls.py
View file

@ -12,6 +12,11 @@ urlpatterns = patterns("item.views",
(r'^(?P<id>[A-Z0-9].*)/timeline(?P<mode>[a-z]*)(?P<size>\d+)p(?P<position>\d+)\.(?P<format>png|jpg)$', 'timeline'),
(r'^(?P<id>[A-Z0-9].*)/timeline(?P<mode>[a-z]*)(?P<size>\d+)p\.(?P<format>png|jpg)$', 'timeline'),
#download
(r'^(?P<id>[A-Z0-9].*)/download$', 'download'),
(r'^(?P<id>[A-Z0-9].*)/download/$', 'download'),
(r'^(?P<id>[A-Z0-9].*)/download/(?P<resolution>\d+)p\.(?P<format>webm|ogv|mp4)$', 'download'),
#video
(r'^(?P<id>[A-Z0-9].*)/(?P<resolution>\d+)p(?P<index>\d*)\.(?P<format>webm|ogv|mp4)$', 'video'),
@ -19,9 +24,6 @@ urlpatterns = patterns("item.views",
(r'^(?P<id>[A-Z0-9].*)/torrent$', 'torrent'),
(r'^(?P<id>[A-Z0-9].*)/torrent/(?P<filename>.*?)$', 'torrent'),
#download
(r'^(?P<id>[A-Z0-9].*)/download/$', 'download'),
#export
(r'^(?P<id>[A-Z0-9].*)/json$', 'item_json'),
(r'^(?P<id>[A-Z0-9].*)/xml$', 'item_xml'),