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

Port batchaddmedia command to Python 3

Browse Source
This commit is contained in:
Simen Heggestøyl 2017-10-08 11:04:10 +02:00 committed by Boris Bobrov
parent 480aa3a204
commit 2ad4630c03
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/gmg_commands/batchaddmedia.py
View File

@ -19,6 +19,7 @@ from __future__ import print_function
import codecs import codecs
import csv import csv
import os import os
import sys
import requests import requests
import six import six
@ -96,7 +97,7 @@ def batchaddmedia(args):
contents = all_metadata.read() contents = all_metadata.read()
media_metadata = parse_csv_file(contents) media_metadata = parse_csv_file(contents)
for media_id, file_metadata in media_metadata.iteritems(): for media_id, file_metadata in media_metadata.items():
files_attempted += 1 files_attempted += 1
# In case the metadata was not uploaded initialize an empty dictionary. # In case the metadata was not uploaded initialize an empty dictionary.
json_ld_metadata = compact_and_validate({}) json_ld_metadata = compact_and_validate({})
@ -139,7 +140,7 @@ Metadata was not uploaded.""".format(
file_path = os.path.join(abs_metadata_dir, path) file_path = os.path.join(abs_metadata_dir, path)
file_abs_path = os.path.abspath(file_path) file_abs_path = os.path.abspath(file_path)
try: try:
media_file = file(file_abs_path, 'r') media_file = open(file_abs_path, 'rb')
except IOError: except IOError:
print(_(u"""\ print(_(u"""\
FAIL: Local file {filename} could not be accessed. FAIL: Local file {filename} could not be accessed.
@ -202,7 +203,12 @@ def parse_csv_file(file_contents):
# Build a dictionary # Build a dictionary
for index, line in enumerate(lines): for index, line in enumerate(lines):
if line.isspace() or line == u'': continue if line.isspace() or line == u'': continue
values = unicode_csv_reader([line]).next() if (sys.version_info[0] == 3):
# Python 3's csv.py supports Unicode out of the box.
reader = csv.reader([line])
else:
reader = unicode_csv_reader([line])
values = next(reader)
line_dict = dict([(key[i], val) line_dict = dict([(key[i], val)
for i, val in enumerate(values)]) for i, val in enumerate(values)])
media_id = line_dict.get('id') or index media_id = line_dict.get('id') or index