From f05217329ecf0788e5be300b032c0740e02b53b9 Mon Sep 17 00:00:00 2001 From: Blacktwin Date: Thu, 2 Aug 2018 15:53:25 -0400 Subject: [PATCH] correct sorting and appending common servers. --- reporting/server_compare.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/reporting/server_compare.py b/reporting/server_compare.py index 63feb1e..05a54ff 100644 --- a/reporting/server_compare.py +++ b/reporting/server_compare.py @@ -81,6 +81,8 @@ def get_meta(meta): source_id = agent.split('://')[1].split('?')[0] meta_dict[source_name] = source_id + if meta.type == 'movie': + meta_dict['title'] = u'{} ({})'.format(meta.title, meta.year) return meta_dict @@ -97,16 +99,20 @@ def org_diff(lst_dicts, media_type, main_server): print('...combining {}s'.format(mtype)) for server_lst in lst_dicts: for item in server_lst[mtype]: - if item.title not in seen: - seen[item.title] = 1 + if mtype == 'movie': + title = u'{} ({})'.format(item.title, item.year) + else: + title = item.title + if title not in seen: + seen[title] = 1 meta_lst.append(get_meta(item)) else: - if seen[item.title] == 1: - dupes.append(item.title) + if seen[title] >= 1: + dupes.append([title,item._server.friendlyName]) for meta in meta_lst: - if meta['title'] == item.title: + if meta['title'] == title: meta['server'].append(item._server.friendlyName) - seen[item.title] += 1 + seen[title] += 1 meta_lst = sorted(meta_lst, key=lambda d: d['rating'], reverse=True)