From c8d71a9633157a134a90b49c67c30e6ce2aecbf7 Mon Sep 17 00:00:00 2001
From: Rahul Raturi <rhlrtr44@gmail.com>
Date: Tue, 30 Aug 2016 23:33:38 +0530
Subject: [PATCH] Define query limit as constant

25 is the standard limit for number of results returned.
---
 picard/browser/filelookup.py |  4 ++--
 picard/cluster.py            |  3 ++-
 picard/const/__init__.py     |  3 +++
 picard/file.py               |  3 ++-
 picard/ui/searchdialog.py    | 10 +++++-----
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/picard/browser/filelookup.py b/picard/browser/filelookup.py
index fc3a07957..45c7ebbf4 100644
--- a/picard/browser/filelookup.py
+++ b/picard/browser/filelookup.py
@@ -22,7 +22,7 @@ from PyQt4 import QtCore
 import os.path
 import re
 from picard import log
-from picard.const import PICARD_URLS
+from picard.const import PICARD_URLS, QUERY_LIMIT
 from picard.util import webbrowser2, build_qurl
 
 
@@ -101,7 +101,7 @@ class FileLookup(object):
         if self.mbidLookup(query, type_):
             return True
         params = {
-            'limit': 25,
+            'limit': QUERY_LIMIT,
             'type': type_,
             'query': query,
         }
diff --git a/picard/cluster.py b/picard/cluster.py
index 572118643..174d7e9d0 100644
--- a/picard/cluster.py
+++ b/picard/cluster.py
@@ -31,6 +31,7 @@ from picard.metadata import Metadata
 from picard.similarity import similarity
 from picard.ui.item import Item
 from picard.util import format_time, album_artist_from_path
+from picard.const import QUERY_LIMIT
 
 
 class Cluster(QtCore.QObject, Item):
@@ -199,7 +200,7 @@ class Cluster(QtCore.QObject, Item):
             artist=self.metadata['albumartist'],
             release=self.metadata['album'],
             tracks=str(len(self.files)),
-            limit=25)
+            limit=QUERY_LIMIT)
 
     def clear_lookup_task(self):
         if self.lookup_task:
diff --git a/picard/const/__init__.py b/picard/const/__init__.py
index 975afabcd..1908e6879 100644
--- a/picard/const/__init__.py
+++ b/picard/const/__init__.py
@@ -110,3 +110,6 @@ PLUGINS_API = {
         'download': '/api/v1/download/'
     }
 }
+
+# Default query limit
+QUERY_LIMIT = 25
diff --git a/picard/file.py b/picard/file.py
index 74cf91dab..6c8376c63 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -48,6 +48,7 @@ from picard.util.textencoding import (
 )
 from picard.util.filenaming import make_short_filename
 from picard.util.tags import PRESERVED_TAGS
+from picard.const import QUERY_LIMIT
 
 
 class File(QtCore.QObject, Item):
@@ -564,7 +565,7 @@ class File(QtCore.QObject, Item):
             tracks=metadata['totaltracks'],
             qdur=str(metadata.length / 2000),
             isrc=metadata['isrc'],
-            limit=25)
+            limit=QUERY_LIMIT)
 
     def clear_lookup_task(self):
         if self.lookup_task:
diff --git a/picard/ui/searchdialog.py b/picard/ui/searchdialog.py
index 03ccea81d..d909b2d42 100644
--- a/picard/ui/searchdialog.py
+++ b/picard/ui/searchdialog.py
@@ -38,7 +38,7 @@ from picard.i18n import ugettext_attr
 from picard.metadata import Metadata
 from picard.webservice import escape_lucene_query
 from picard.track import Track
-from picard.const import CAA_HOST, CAA_PORT
+from picard.const import CAA_HOST, CAA_PORT, QUERY_LIMIT
 from picard.coverart.image import CaaThumbnailCoverArtImage
 
 
@@ -335,7 +335,7 @@ class TrackSearchDialog(SearchDialog):
         self.tagger.xmlws.find_tracks(self.handle_reply,
                 query=text,
                 search=True,
-                limit=25)
+                limit=QUERY_LIMIT)
 
     def load_similar_tracks(self, file_):
         """Perform search using existing metadata information
@@ -362,7 +362,7 @@ class TrackSearchDialog(SearchDialog):
         else:
             query_str = query["track"]
 
-        query["limit"] = 25
+        query["limit"] = QUERY_LIMIT
         self.search_box.search_edit.setText(query_str)
         self.show_progress()
         self.tagger.xmlws.find_tracks(
@@ -525,7 +525,7 @@ class AlbumSearchDialog(SearchDialog):
         self.tagger.xmlws.find_releases(self.handle_reply,
                 query=text,
                 search=True,
-                limit=25)
+                limit=QUERY_LIMIT)
 
     def show_similar_albums(self, cluster):
         """Perform search by using existing metadata information
@@ -548,7 +548,7 @@ class AlbumSearchDialog(SearchDialog):
         else:
             query_str = query["release"]
 
-        query["limit"] = 25
+        query["limit"] = QUERY_LIMIT
         self.search_box.search_edit.setText(query_str)
         self.show_progress()
         self.tagger.xmlws.find_releases(