diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py index d93cfb6..02577bd 100755 --- a/Contents/Code/__init__.py +++ b/Contents/Code/__init__.py @@ -119,68 +119,24 @@ def updateDaumMovie(cate, metadata): for item in data['data']: cast = item['castcrew'] if cast['castcrewCastName'] in [u'감독', u'연출']: - director = dict() - director['name'] = item['nameKo'] if item['nameKo'] else item['nameEn'] - if item['photo']['fullname']: - director['photo'] = item['photo']['fullname'] - directors.append(director) - elif cast['castcrewCastName'] == u'제작': - producer = dict() - producer['name'] = item['nameKo'] if item['nameKo'] else item['nameEn'] - if item['photo']['fullname']: - producer['photo'] = item['photo']['fullname'] - producers.append(producer) + directors.append(item['nameKo'] if item['nameKo'] else item['nameEn']) elif cast['castcrewCastName'] in [u'극본', u'각본']: - writer = dict() - writer['name'] = item['nameKo'] if item['nameKo'] else item['nameEn'] - if item['photo']['fullname']: - writer['photo'] = item['photo']['fullname'] - writers.append(writer) + writers.append(item['nameKo'] if item['nameKo'] else item['nameEn']) elif cast['castcrewCastName'] in [u'주연', u'조연', u'출연', u'진행']: - role = dict() - role['role'] = cast['castcrewTitleKo'] - role['name'] = item['nameKo'] if item['nameKo'] else item['nameEn'] - if item['photo']['fullname']: - role['photo'] = item['photo']['fullname'] - roles.append(role) + role = metadata.roles.new() + role.role = cast['castcrewTitleKo'] + role.actor = item['nameKo'] if item['nameKo'] else item['nameEn'] + metadata.roles.add(role) # else: - # Log.Debug("unknown role: castcrewCastName=%s" % cast['castcrewCastName']) + # Log.Debug("unknown role: castcrewCastName=%s," % cast['castcrewCastName']) if cate == 'movie': - if directors: - metadata.directors.clear() - for director in directors: - meta_director = metadata.directors.new() - if 'name' in director: - meta_director.name = director['name'] - # if 'photo' in director: - # meta_director.photo = director['photo'] - # if producers: - # metadata.producers.clear() - # for producer in producers: - # meta_producer = metadata.producers.new() - # if 'name' in producer: - # meta_producer.name = producer['name'] - # if 'photo' in producer: - # meta_producer.photo = producer['photo'] - if writers: - metadata.writers.clear() - for writer in writers: - meta_writer = metadata.writers.new() - if 'name' in writer: - meta_writer.name = writer['name'] - # if 'photo' in writer: - # meta_writer.photo = writer['photo'] - if roles: - metadata.roles.clear() - for role in roles: - meta_role = metadata.roles.new() - if 'role' in role: - meta_role.role = role['role'] - if 'name' in role: - meta_role.actor = role['name'] - # if 'photo' in role: - # meta_role.photo = role['photo'] + metadata.directors.clear() + metadata.writers.clear() + for name in directors: + metadata.directors.add(name) + for name in writers: + metadata.writers.add(name) # (3) from photo page url_tmpl = DAUM_TV_PHOTO if cate == 'tv' else DAUM_MOVIE_PHOTO @@ -236,22 +192,13 @@ def updateDaumMovie(cate, metadata): episode.originally_available_at = Datetime.ParseDate(item['channels'][0]['broadcastDate'], '%Y%m%d').date() try: episode.rating = float(item['rate']) except: pass - if directors: - episode.directors.clear() - for director in directors: - meta_director = episode.directors.new() - if 'name' in director: - meta_director.name = director['name'] - # if 'photo' in director: - # meta_director.photo = director['photo'] - if writers: - episode.writers.clear() - for writer in writers: - meta_writer = episode.writers.new() - if 'name' in writer: - meta_writer.name = writer['name'] - # if 'photo' in writer: - # meta_writer.photo = writer['photo'] + episode.directors.clear() + episode.writers.clear() + for name in directors: + episode.directors.add(name) + for name in writers: + episode.writers.add(name) + #episode.thumbs[thumb_url] = Proxy.Preview(thumb_data) # (5) fill missing info # if Prefs['override_tv_id'] != 'None':