heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add basic duplicate prevention for batchaddmedia.

Browse Source
This commit is contained in:
Ben Sturmfels 2019-09-18 15:58:24 +10:00
parent ad14aed02b
commit c33168b3d8
No known key found for this signature in database
GPG Key ID: 023C05E2C9C068F0
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mediagoblin/gmg_commands/batchaddmedia.py
View File

@ -25,7 +25,7 @@ import requests
import six import six
from six.moves.urllib.parse import urlparse from six.moves.urllib.parse import urlparse
from mediagoblin.db.models import LocalUser from mediagoblin.db.models import LocalUser, MediaEntry
from mediagoblin.gmg_commands import util as commands_util from mediagoblin.gmg_commands import util as commands_util
from mediagoblin.submit.lib import ( from mediagoblin.submit.lib import (
submit_media, FileUploadLimit, UserUploadLimit, UserPastUploadLimit) submit_media, FileUploadLimit, UserUploadLimit, UserPastUploadLimit)
@ -86,7 +86,6 @@ def batchaddmedia(args):
all_metadata = open(abs_metadata_filename, 'r') all_metadata = open(abs_metadata_filename, 'r')
media_metadata = csv.DictReader(all_metadata) media_metadata = csv.DictReader(all_metadata)
for index, file_metadata in enumerate(media_metadata): for index, file_metadata in enumerate(media_metadata):
if six.PY2: if six.PY2:
file_metadata = {k.decode('utf-8'): v.decode('utf-8') for k, v in file_metadata.items()} file_metadata = {k.decode('utf-8'): v.decode('utf-8') for k, v in file_metadata.items()}
@ -101,6 +100,7 @@ def batchaddmedia(args):
### Pull the important media information for mediagoblin from the ### Pull the important media information for mediagoblin from the
### metadata, if it is provided. ### metadata, if it is provided.
slug = file_metadata.get('slug')
title = file_metadata.get('title') or file_metadata.get('dc:title') title = file_metadata.get('title') or file_metadata.get('dc:title')
description = (file_metadata.get('description') or description = (file_metadata.get('description') or
file_metadata.get('dc:description')) file_metadata.get('dc:description'))
@ -119,6 +119,16 @@ Metadata was not uploaded.""".format(
print(error) print(error)
continue continue
if slug and MediaEntry.query.filter_by(actor=user.id, slug=slug).count():
# Avoid re-importing media from a previous batch run. Note that this
# check isn't quite robust enough, since it requires that a slug is
# specified. Probably needs to be based on "location" since this is
# the only required field.
error = '{}: {}'.format(
slug, _('An entry with that slug already exists for this user.'))
print(error)
continue
url = urlparse(original_location) url = urlparse(original_location)
filename = url.path.split()[-1] filename = url.path.split()[-1]
@ -155,7 +165,7 @@ FAIL: Local file {filename} could not be accessed.
{filename} will not be uploaded.""".format(filename=filename))) {filename} will not be uploaded.""".format(filename=filename)))
continue continue
try: try:
submit_media( entry = submit_media(
mg_app=app, mg_app=app,
user=user, user=user,
submitted_file=media_file, submitted_file=media_file,
@ -166,6 +176,11 @@ FAIL: Local file {filename} could not be accessed.
license=license, license=license,
metadata=json_ld_metadata, metadata=json_ld_metadata,
tags_string="") tags_string="")
if slug:
# Slug is automatically set by submit_media, so overwrite it
# with the desired slug.
entry.slug = slug
entry.save()
print(_("""Successfully submitted {filename}! print(_("""Successfully submitted {filename}!
Be sure to look at the Media Processing Panel on your website to be sure it Be sure to look at the Media Processing Panel on your website to be sure it
uploaded successfully.""".format(filename=filename))) uploaded successfully.""".format(filename=filename)))