fix mosireen plugin

This commit is contained in:
j 2013-04-25 00:53:53 +02:00
parent 877ad77fa9
commit 5ff1f8811b

View file

@ -3,13 +3,14 @@
custom parse_path for pandora_client to parse musereen archive paths in the form custom parse_path for pandora_client to parse musereen archive paths in the form
MM_YYYY/DD_MM_YYYY/Location 1/Location 2/Subject 1/Cinematographer/Subject 2/MVI_2036.MOV YYYY/MM_YYYY/DD_MM_YYYY/Location 1/Location 2/Subject 1/Cinematographer/Subject 2(optional)/MVI_2036.MOV
''' '''
import re import re
import ox
def example_path(client): def example_path(client):
return '\t' + 'MM_YYYY/DD_MM_YYYY/Location 1/Location 2/Subject 1/Shooter/Subject 2/MVI_2036.MOV' return '\t' + 'YYYY/MM_YYYY/DD_MM_YYYY/Location 1/Location 2/Subject 1/Shooter/Subject 2(optional)/MVI_2036.MOV'
def parse_path(client, path): def parse_path(client, path):
''' '''
@ -19,20 +20,33 @@ def parse_path(client, path):
return: return:
return None if file is ignored, dict with parsed item information otherwise return None if file is ignored, dict with parsed item information otherwise
''' '''
reg = re.compile('(\d{2})_(\d{4})/(?P<day>\d+)_(?P<month>\d+)_(?P<year>\d{4})/(?P<location1>.+)/(?P<location2>.+)/(?P<subject1>.+)/(?P<cinematographer>.+)/(?P<subject2>.+)/.*') m = re.compile('^(\d{4})/(\d{2})_(\d{4})/(?P<day>\d+)_(?P<month>\d+)_(?P<year>\d{4})/(?P<location1>.+?)/(?P<location2>.+?)/(?P<subject1>.+?)/(?P<shooter>.+?)/((?P<subject2>.+?)/|).*').match(path)
m = reg.match(path)
if not m: if not m:
return None return None
path_info = m.groupdict() info = m.groupdict()
date = '%s-%s-%s' % (path_info['day'], path_info['month'], path_info['year']) date = '%s-%s-%s' % (info['year'], info['month'], info['day'])
for key in path_info: for key in info:
path_info[key] = path_info[key].replace('_', ' ') if info[key]:
return { info[key] = info[key].replace('_', ' ')
topic = [info['subject1']]
if info['subject2']:
topic.append(info['subject2'])
title = "%s, %s (%s)" % (info['subject1'], info['subject2'], date)
else:
title = "%s (%s)" % (info['subject1'], date)
title = "%s %s" % (title, info['shooter'])
r = {
'cinematographer': [info['shooter']],
'date': date, 'date': date,
'location': '%s, %s' % (path_info['location2'], path_info['location1']), 'location': '%s, %s' % (info['location2'], info['location1']),
'title': "%s, %s (%s)" % (path_info['subject1'], path_info['subject2'], date), 'title': title,
'cinematographer': [path_info['cinematographer']], 'topic': topic
'topic': [path_info['subject1'], path_info['subject2']]
} }
_info = ox.movie.parse_path(path)
for key in ('extension', 'type'):
r[key] = _info[key]
return r