From addaa56d852ee85e56a16461a51adf917764cce5 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 28 Oct 2016 18:15:44 +0200 Subject: [PATCH] always clear siteposter cache if poster is removed --- pandora/item/models.py | 4 +++- pandora/item/views.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora/item/models.py b/pandora/item/models.py index 3c13c0b4..a95c1625 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -1375,6 +1375,7 @@ class Item(models.Model): f.write(data) self.poster_height = self.poster.height self.poster_width = self.poster.width + self.clear_poster_cache(self.poster.path) if self.json.get('posterRatio') != self.poster_width / self.poster_height: self.json = self.get_json() Item.objects.filter(id=self.id).update(json=self.json, @@ -1411,6 +1412,7 @@ class Item(models.Model): if self.poster: self.clear_poster_cache(self.poster.path) self.poster.delete() + self.clear_poster_cache(os.path.join(settings.MEDIA_ROOT, self.path('siteposter.jpg'))) def clear_poster_cache(self, poster=None): if poster is None: @@ -1442,7 +1444,7 @@ class Item(models.Model): data = f.read() if data: self.save_poster(data) - self.clear_poster_cache(poster) + self.clear_poster_cache(poster) def make_siteposter(self): poster = self.path('siteposter.jpg') diff --git a/pandora/item/views.py b/pandora/item/views.py index 2c4f32db..d075015e 100644 --- a/pandora/item/views.py +++ b/pandora/item/views.py @@ -674,7 +674,6 @@ def setPoster(request, data): if data['source'] in valid_sources: item.poster_source = data['source'] item.remove_poster() - item.clear_poster_cache(item.path('siteposter.jpg')) item.save() tasks.update_poster(item.public_id) response = json_response()