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

add oshash to changelog, keep upload filename, show direct upload instance

Browse source
This commit is contained in:
j 2020-08-29 23:32:57 +02:00
commit ffb512a304
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pandora/archive/models.py
View file

@ -336,7 +336,9 @@ class File(models.Model):
def done_cb():
if done:
self.info.update(ox.avinfo(self.data.path))
info = ox.avinfo(self.data.path)
del info['path']
self.info.update(info)
self.parse_info()
# reject invalid uploads
if self.info.get('oshash') != self.oshash:
@ -486,6 +488,13 @@ class File(models.Model):
data['instances'] = []
if 'path' in data:
data['path'] = os.path.basename(data['path'])
if 'instances' in data and 'filename' in self.info and self.data:
data['instances'].append({
'ignore': False,
'path': self.info['filename'],
'user': f.item.user.username,
'volume': 'Direct Upload'
})
return data
def all_paths(self):