Get Books: IMprove search for e-knigi and Chitanka

src/calibre/gui2/store/search/search.py

@@ -252,7 +252,7 @@ class SearchDialog(QDialog, Ui_Dialog):
         # Milliseconds
         self.hang_time = self.config.get('hang_time', 75) * 1000
 
-        self.max_results = self.config.get('max_results', 10)
+        self.max_results = self.config.get('max_results', 15)
         self.should_open_external = self.config.get('open_external', True)
 
         # Number of threads to run for each type of operation

src/calibre/gui2/store/search/search.ui

@@ -14,7 +14,7 @@
    <string>Get Books</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../../resources/images.qrc">
+   <iconset>
     <normaloff>:/images/store.png</normaloff>:/images/store.png</iconset>
   </property>
   <property name="sizeGripEnabled">
@@ -82,8 +82,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>173</width>
-            <height>106</height>
+            <width>193</width>
+            <height>127</height>
            </rect>
           </property>
          </widget>
@@ -254,6 +254,19 @@
    <header>widgets.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>search_edit</tabstop>
+  <tabstop>search</tabstop>
+  <tabstop>results_view</tabstop>
+  <tabstop>store_list</tabstop>
+  <tabstop>select_all_stores</tabstop>
+  <tabstop>select_invert_stores</tabstop>
+  <tabstop>select_none_stores</tabstop>
+  <tabstop>configure</tabstop>
+  <tabstop>open_external</tabstop>
+  <tabstop>close</tabstop>
+  <tabstop>adv_search_button</tabstop>
+ </tabstops>
  <resources>
   <include location="../../../../../resources/images.qrc"/>
  </resources>

src/calibre/gui2/store/stores/chitanka_plugin.py

@@ -40,9 +40,9 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
             d.exec_()
 
     def search(self, query, max_results=10, timeout=60):
-        # check for cyrilic symbols before performing search
+        # check for cyrillic symbols before performing search
         uquery = unicode(query.strip(), 'utf-8')
-        reObj = re.search(u'^[а-яА-Я\\d]{4,}[а-яА-Я\\d\\s]*$', uquery)
+        reObj = re.search(u'^[а-яА-Я\\d\\s]{3,}$', uquery)
         if not reObj:
             return
 

src/calibre/gui2/store/stores/eknigi_plugin.py

@@ -46,9 +46,9 @@ class eKnigiStore(BasicStoreConfig, StorePlugin):
             d.exec_()
 
     def search(self, query, max_results=10, timeout=60):
-        # check for cyrilic symbols before performing search
+        # check for cyrillic symbols before performing search
         uquery = unicode(query.strip(), 'utf-8')
-        reObj = re.search(u'^[а-яА-Я\\d]{2,}[а-яА-Я\\d\\s]*$', uquery)
+        reObj = re.search(u'^[а-яА-Я\\d\\s]{2,}$', uquery)
         if not reObj:
             return