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

Compare commits

base: 0x2620:85095eda44c13399c8a7ac180bbc47c1f4b219aa
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:014df3766ce530a748dce806160aa589a173071c
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "85095eda44c13399c8a7ac180bbc47c1f4b219aa" and "014df3766ce530a748dce806160aa589a173071c" have entirely different histories.
85095eda44 ... 014df3766c

11 changed files with 21 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pandora/config.0xdb.jsonc
View file

@ -38,7 +38,6 @@
"canAddItems": {"staff": true, "admin": true},
"canAddDocuments": {"staff": true, "admin": true},
"canDownloadVideo": {"guest": -1, "member": -1, "friend": -1, "staff": -1, "admin": -1},
"canDownloadSource": {"guest": -1, "member": -1, "friend": -1, "staff": -1, "admin": -1},
"canEditAnnotations": {"staff": true, "admin": true},
"canEditEntities": {"staff": true, "admin": true},
"canEditDocuments": {"staff": true, "admin": true},

1
pandora/config.indiancinema.jsonc
View file

@ -39,7 +39,6 @@
"canAddItems": {"researcher": true, "staff": true, "admin": true},
"canAddDocuments": {"researcher": true, "staff": true, "admin": true},
"canDownloadVideo": {"guest": -1, "member": -1, "researcher": 3, "staff": 3, "admin": 3},
"canDownloadSource": {"guest": -1, "member": -1, "researcher": -1, "staff": -1, "admin": -1},
"canEditAnnotations": {"staff": true, "admin": true},
"canEditDocuments": {"researcher": true, "staff": true, "admin": true},
"canEditEntities": {"staff": true, "admin": true},

1
pandora/config.padma.jsonc
View file

@ -38,7 +38,6 @@
"canAddItems": {"member": true, "staff": true, "admin": true},
"canAddDocuments": {"member": true, "staff": true, "admin": true},
"canDownloadVideo": {"guest": 0, "member": 0, "staff": 4, "admin": 4},
"canDownloadSource": {"guest": -1, "member": -1, "staff": 4, "admin": 4},
"canEditAnnotations": {"staff": true, "admin": true},
"canEditEntities": {"staff": true, "admin": true},
"canEditDocuments": {"staff": true, "admin": true},

3
pandora/config.pandora.jsonc
View file

@ -45,7 +45,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"canAddItems": {"member": true, "staff": true, "admin": true},
"canAddDocuments": {"member": true, "staff": true, "admin": true},
"canDownloadVideo": {"guest": 1, "member": 1, "staff": 4, "admin": 4},
"canDownloadSource": {"member": 1, "staff": 4, "admin": 4},
"canEditAnnotations": {"staff": true, "admin": true},
"canEditDocuments": {"staff": true, "admin": true},
"canEditEntities": {"staff": true, "admin": true},
@ -551,7 +550,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
{
"id": "country",
"title": "Country",
"type": ["string"],
"type": "string",
"autocomplete": true,
"columnWidth": 180,
"filter": true,

3
pandora/item/models.py
View file

@ -639,9 +639,6 @@ class Item(models.Model):
if self.poster_height:
i['posterRatio'] = self.poster_width / self.poster_height
if 'source' in keys:
i['source'] = self.files.filter(selected=True).exclude(data='').exists()
streams = self.streams()
i['durations'] = [s.duration for s in streams]
i['duration'] = sum(i['durations'])

1
pandora/item/urls.py
View file

@ -16,7 +16,6 @@ urlpatterns = [
url(r'^(?P<id>[A-Z0-9].*)/download$', views.download),
url(r'^(?P<id>[A-Z0-9].*)/download/$', views.download),
url(r'^(?P<id>[A-Z0-9].*)/download/source/(?P<part>\d+)?$', views.download_source),
url(r'^(?P<id>[A-Z0-9].*)/download/(?P<resolution>\d+)p(?P<part>\d+)\.(?P<format>webm|ogv|mp4)$', views.download),
url(r'^(?P<id>[A-Z0-9].*)/download/(?P<resolution>\d+)p\.(?P<format>webm|ogv|mp4)$', views.download),
#video

17
pandora/item/views.py
View file

@ -992,8 +992,6 @@ def download_source(request, id, part=None):
raise Http404
parts = ['%s - %s ' % (item.get('title'), settings.SITENAME), item.public_id]
if len(streams) > 1:
parts.append('.Part %d' % (part + 1))
parts.append('.')
parts.append(f.extension)
filename = ''.join(parts)
@ -1004,7 +1002,7 @@ def download_source(request, id, part=None):
response['Content-Disposition'] = "attachment; filename*=UTF-8''%s" % quote(filename.encode('utf-8'))
return response
def download(request, id, resolution=None, format='webm', part=None):
def download(request, id, resolution=None, format='webm'):
item = get_object_or_404(models.Item, public_id=id)
if not resolution or int(resolution) not in settings.CONFIG['video']['resolutions']:
resolution = max(settings.CONFIG['video']['resolutions'])
@ -1012,22 +1010,14 @@ def download(request, id, resolution=None, format='webm', part=None):
resolution = int(resolution)
if not item.access(request.user) or not item.rendered:
return HttpResponseForbidden()
if part is not None:
part = int(part) - 1
streams = item.streams()
if part > len(streams):
raise Http404
ext = '.%s' % format
parts = ['%s - %s ' % (item.get('title'), settings.SITENAME), item.public_id]
if resolution != max(settings.CONFIG['video']['resolutions']):
parts.append('.%dp' % resolution)
if part is not None:
parts.append('.Part %d' % (part + 1))
parts.append(ext)
filename = ''.join(parts)
video = NamedTemporaryFile(suffix=ext)
content_type = mimetypes.guess_type(video.name)[0]
if part is None:
r = item.merge_streams(video.name, resolution, format)
if not r:
return HttpResponseForbidden()
@ -1036,11 +1026,6 @@ def download(request, id, resolution=None, format='webm', part=None):
response['Content-Length'] = os.path.getsize(video.name)
else:
response = HttpFileResponse(r, content_type=content_type)
else:
stream = streams[part].get(resolution, format)
path = stream.media.path
content_type = mimetypes.guess_type(path)[0]
response = HttpFileResponse(path, content_type=content_type)
response['Content-Disposition'] = "attachment; filename*=UTF-8''%s" % quote(filename.encode('utf-8'))
return response

49
static/js/downloadVideoDialog.js
View file

@ -9,10 +9,6 @@ pandora.ui.downloadVideoDialog = function(options) {
'mp4': 'MP4',
},
parts = Ox.max(options.video.map(function(video) {
return video.index
})),
$content = Ox.Element()
.css({margin: '16px'}),
@ -31,9 +27,6 @@ pandora.ui.downloadVideoDialog = function(options) {
.css({marginBottom: '16px'})
.appendTo($content),
$format,
$resolution,
$form = window.$form = Ox.Form({
items: [
Ox.Select({
@ -43,10 +36,7 @@ pandora.ui.downloadVideoDialog = function(options) {
id: format,
title: formats[format]
};
}).concat(!options.out && options.source ? [{
id: 'source',
title: Ox._('Source')
}] : []),
}),
label: Ox._('Format'),
labelWidth: 120,
value: pandora.site.video.downloadFormat,
@ -54,14 +44,9 @@ pandora.ui.downloadVideoDialog = function(options) {
})
.bindEvent({
change: function(data) {
if (data.value == 'source') {
$resolution.hide()
} else {
$resolution.show()
}
}
}),
$resolution = Ox.Select({
Ox.Select({
id: 'resolution',
items: pandora.site.video.resolutions.map(function(resolution) {
return {
@ -78,25 +63,7 @@ pandora.ui.downloadVideoDialog = function(options) {
change: function(data) {
}
})
].concat(parts ? [
Ox.Select({
id: 'part',
items: Ox.range(parts + 1).map(function(resolution, idx) {
return {
id: idx + 1,
title: 'Part ' + (idx+1)
};
}),
label: Ox._('Part'),
labelWidth: 120,
value: 1,
width: 240
})
.bindEvent({
change: function(data) {
}
})
] : [])
]
}).appendTo($content),
failed = false,
@ -148,18 +115,10 @@ pandora.ui.downloadVideoDialog = function(options) {
}
})
} else {
if (values.format == 'source') {
url = '/' + options.item
+ '/download/source/'
+ (values.part ? values.part : '')
} else {
url = '/' + options.item
+ '/download/' + values.resolution
+ 'p'
+ (values.part ? values.part : '')
+ '.' + values.format
}
+ 'p.' + values.format
}
if (url) {
that.close();

6
static/js/editor.js
View file

@ -28,7 +28,7 @@ pandora.ui.editor = function(data) {
enableSetPosterFrame: !pandora.site.media.importFrames && data.editable,
enableSubtitles: ui.videoSubtitles,
find: ui.itemFind,
findLayer: pandora.getFindLayer(),
findLayer: ui._findState.key,
getFrameURL: function(position) {
return pandora.getMediaURL('/' + ui.item + '/' + ui.videoResolution + 'p' + position + '.jpg?' + data.modified);
},
@ -189,9 +189,7 @@ pandora.ui.editor = function(data) {
pandora.ui.downloadVideoDialog({
item: ui.item,
rightsLevel: rightsLevel,
source: data.source && pandora.hasCapability('canDownloadSource'),
title: data.title,
video: data.video
title: data.title
}).open();
},
downloadselection: function(selection) {

9
static/js/utils.js
View file

@ -1439,14 +1439,6 @@ pandora.getFoldersWidth = function(section) {
return width;
};
pandora.getFindLayer = function() {
var key = pandora.user.ui._findState.key
if (!!Ox.getObjectById(pandora.site.layers, key)) {
key = 'all'
}
return key
};
pandora.getHash = function(state, callback) {
// FIXME: remove this
var embedKeys = [
@ -2367,7 +2359,6 @@ pandora.VIDEO_OPTIONS_KEYS = [
'rendered',
'rightslevel',
'size',
'source',
'streams',
'title',
'videoRatio'

8
vm/LXC_README.md
View file

@ -4,7 +4,7 @@
# Installing pan.do/ra inside LXC
1) Install lxc on the host (Ubuntu 18.04 or later):
1) Install lxc on the host (Ubuntu 16.04 or later):
sudo apt-get install lxc
@ -15,7 +15,7 @@
2) Create a new container, use different names if installing multiple instances:
sudo lxc-create -n pandora -t ubuntu-cloud -- -r bionic
sudo lxc-create -n pandora -t ubuntu -- -r xenial
or
@ -28,12 +28,12 @@
4) Attach to container and install pan.do/ra
sudo lxc-attach -n pandora --clear-env
apt-get update -qq && apt-get upgrade -y
apt-get -y install curl ca-certificates
sed -i s/ubuntu/pandora/g /etc/passwd /etc/shadow /etc/group
mv /home/ubuntu /home/pandora
echo "pandora:pandora" | chpasswd
echo PasswordAuthentication no >> /etc/ssh/sshd_config
apt-get update -qq && apt-get upgrade -y
apt-get -y install curl ca-certificates
locale-gen en_US.UTF-8
update-locale LANG=en_US.UTF-8
export LANG=en_US.UTF-8