From 0d0770802ca998879ade343625547b015c1f240f Mon Sep 17 00:00:00 2001 From: j Date: Wed, 20 Jun 2018 00:03:01 +0200 Subject: [PATCH] get_json -> json --- pandora/document/models.py | 2 +- pandora/item/models.py | 10 +++++----- pandora/item/views.py | 16 ++++++++-------- pandora/tv/models.py | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pandora/document/models.py b/pandora/document/models.py index 1a94a9bb..c5b75fad 100644 --- a/pandora/document/models.py +++ b/pandora/document/models.py @@ -584,7 +584,7 @@ class Document(models.Model): def referenced(self): result = {} result['items'] = [ - i.get_json(keys=['id', 'title']) + i.json(keys=['id', 'title']) for i in self.items.all().order_by('sort__title') ] result['annotations'] = [ diff --git a/pandora/item/models.py b/pandora/item/models.py index 878ae432..7b901e5c 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -425,7 +425,7 @@ class Item(models.Model): self.poster_width = 80 self.update_sort() self.update_languages() - self.cache = self.get_json() + self.cache = self.json() self.cache['modified'] = datetime.now() super(Item, self).save(*args, **kwargs) self.update_find() @@ -582,7 +582,7 @@ class Item(models.Model): documents = [d.json(item=self) for d in qs] return sorted(documents, key=lambda d: d['index']) - def get_json(self, keys=None): + def json(self, keys=None): i = { 'id': self.public_id, 'rendered': self.rendered, @@ -700,7 +700,7 @@ class Item(models.Model): def get_item_description_html(self): description = '' - data = self.get_json() + data = self.json() info = [] for key in [ 'director', 'writer', 'producer', @@ -1360,7 +1360,7 @@ class Item(models.Model): if offset: self.data['volume'] /= offset # extract.timeline_strip(self, self.data['cuts'], stream.info, self.timeline_prefix[:-8]) - self.cache = self.get_json() + self.cache = self.json() self.update_sort() self.select_frame() self.make_poster() @@ -1376,7 +1376,7 @@ class Item(models.Model): tasks.load_subtitles.delay(self.public_id) def update_cache(self, **kwargs): - self.cache = self.get_json() + self.cache = self.json() Item.objects.filter(id=self.id).update(cache=self.cache, **kwargs) def save_poster(self, data): diff --git a/pandora/item/views.py b/pandora/item/views.py index 40f3c02c..41d475de 100644 --- a/pandora/item/views.py +++ b/pandora/item/views.py @@ -207,7 +207,7 @@ def get_items(request, query): items = [] qs = _order_query(query['qs'], query['sort']) qs = qs[query['range'][0]:query['range'][1]] - # items = [m.get_json(_p) for m in qs] + # items = [m.json(_p) for m in qs] if any(p for p in query['keys'] if p in item_sort_keys): qs = qs.select_related() items = [only_p_sums(request, query, m) for m in qs] @@ -415,7 +415,7 @@ def findId(request, data): qs = models.Item.objects.filter(public_id=data['id']) if qs.count() == 1: response['data']['items'] = [ - i.get_json(['title', 'director', 'year', 'id']) for i in qs + i.json(['title', 'director', 'year', 'id']) for i in qs ] if not response['data']['items'] \ @@ -509,7 +509,7 @@ def get(request, data): data['keys'] = data.get('keys', []) item = get_object_or_404_json(models.Item, public_id=data['id']) if item.access(request.user): - info = item.get_json(data['keys']) + info = item.json(data['keys']) if not data['keys'] or 'stream' in data['keys']: info['stream'] = item.get_stream() if not data['keys'] or 'streams' in data['keys']: @@ -602,7 +602,7 @@ def add(request, data): del data['title'] if data: response = edit_item(request, item, data) - response['data'] = item.get_json() + response['data'] = item.json() add_changelog(request, request_data, item.public_id) return render_to_json_response(response) actions.register(add, cache=False) @@ -626,7 +626,7 @@ def edit(request, data): if item.editable(request.user): request_data = data.copy() response = edit_item(request, item, data) - response['data'] = item.get_json() + response['data'] = item.json() add_changelog(request, request_data) else: response = json_response(status=403, text='permission denied') @@ -881,7 +881,7 @@ def poster(request, id, size=None): poster_height=item.poster_height, poster_width=item.poster_width, icon=item.icon.name, - json=item.get_json() + json=item.json() ) if item.poster and os.path.exists(item.poster.path): return image_to_response(item.poster, size) @@ -1304,7 +1304,7 @@ def item_json(request, id): response = json_response(status=404, text='not found') else: item = qs[0] - response = item.get_json() + response = item.json() response['layers'] = item.get_layers(request.user) return render_to_json_response(response) @@ -1318,7 +1318,7 @@ def item_xml(request, id): response = render_to_json_response(response) else: item = qs[0] - j = item.get_json() + j = item.json() j['layers'] = item.get_layers(request.user) if 'resolution' in j: j['resolution'] = {'width': j['resolution'][0], 'height': j['resolution'][1]} diff --git a/pandora/tv/models.py b/pandora/tv/models.py index 3669df7b..6a68d214 100644 --- a/pandora/tv/models.py +++ b/pandora/tv/models.py @@ -87,7 +87,7 @@ class Program(models.Model): return u"%s %s" % (self.item, self.start) def json(self, user, current=False): - item_json = self.item.get_json() + item_json = self.item.json() r = { 'item': self.item.public_id, }