# HG changeset patch # User neko259 # Date 2017-01-12 10:29:10 # Node ID bbdc98ffa109cefd24055f8216ae0b9072b7ef78 # Parent a4278fc053226c66d140ec6b2a89533e766dac0c Search duplicates for file, not hash diff --git a/boards/models/attachment/viewers.py b/boards/models/attachment/viewers.py --- a/boards/models/attachment/viewers.py +++ b/boards/models/attachment/viewers.py @@ -90,10 +90,10 @@ class AbstractViewer: return '
'\ '{}'\ ''\ + ' 🔍
'\ ''.format(self.get_format_view(), self.file.url, self.file_type, filesizeformat(self.file.size), - self.file_type, search_url, self.hash) + self.file_type, search_url, self.file.name) def get_format_view(self): image_name = PLAIN_FILE_FORMATS.get(self.file_type, self.file_type) diff --git a/boards/static/js/main.js b/boards/static/js/main.js --- a/boards/static/js/main.js +++ b/boards/static/js/main.js @@ -165,7 +165,7 @@ function addContextMenu() { duplicates: { name: gettext('Duplicates search'), callback: function(key, opts) { - window.location = '/feed/?image_hash=' + $trigger.data('hash'); + window.location = '/feed/?image=' + $trigger.data('filename'); } }, google: { diff --git a/boards/views/feed.py b/boards/views/feed.py --- a/boards/views/feed.py +++ b/boards/views/feed.py @@ -79,21 +79,21 @@ class IpFilter(FeedFilter): return 'IP: {}'.format(ip) -class HashFilter(FeedFilter): +class ImageFilter(FeedFilter): @staticmethod def get_filtered_posts(request, posts): filtered_posts = posts - image_hash = request.GET.get('image_hash', None) - if image_hash: - filtered_posts = filtered_posts.filter(attachments__hash=image_hash) + image = request.GET.get('image', None) + if image: + filtered_posts = filtered_posts.filter(attachments__file=image) return filtered_posts @staticmethod def get_query(request): - image_hash = request.GET.get('image_hash', None) - if image_hash: - return 'Hash: {}'.format(image_hash) + image = request.GET.get('image', None) + if image: + return 'File: {}'.format(image) class FeedView(PostMixin, BaseBoardView): @@ -101,7 +101,7 @@ class FeedView(PostMixin, BaseBoardView) TripcodeFilter, FavoritesFilter, IpFilter, - HashFilter, + ImageFilter, ) def get(self, request):