add page navigate for vip user

tickstep · Sep 5, 2017 · cf0d6f5 · cf0d6f5
1 parent cf0359c
commit cf0d6f5
Show file tree

Hide file tree

Showing 18 changed files with 121 additions and 24 deletions.
diff --git a/icons/dark/app.png b/icons/dark/app.png
diff --git a/icons/dark/copy.png b/icons/dark/copy.png
diff --git a/icons/dark/icon.png b/icons/dark/icon.png
diff --git a/icons/dark/next.png b/icons/dark/next.png
diff --git a/icons/light/app.png b/icons/light/app.png
diff --git a/icons/light/copy.png b/icons/light/copy.png
diff --git a/icons/light/icon.png b/icons/light/icon.png
diff --git a/icons/light/next.png b/icons/light/next.png
diff --git a/links/api/search_api.py b/links/api/search_api.py
@@ -8,7 +8,7 @@
 import os
 from links import icons, config
 from links.util import workflow
-
+from links.models.preferences import Preferences
 import logging
 from logging.config import fileConfig
 fileConfig('logging_config.ini')
@@ -27,7 +27,7 @@ def getWorkflowVersion():
     return ver.strip()
 
 
-def search(query):
+def search(query, offset, size):
     localResult = {
         'statusCode': 0,
         'message': '',
@@ -38,9 +38,12 @@ def search(query):
     log.info('appKey: %s' % (appKey))
 
     # query the keyword from web server
+    prefs = Preferences.current_prefs()
     session = requests.session()
     formData = {
-        'keyword': query
+        'keyword': query,
+        'from': offset,
+        'size': size
     }
     resp = session.post(
         url=config.LK_SEARCH_APP_URL,

diff --git a/links/auth.py b/links/auth.py
@@ -62,6 +62,8 @@ def handle_authorization_url(url):
             workflow().store_data(config.KC_RESERVED_COUNT, params['reservedCount'][0])
         if 'userName' in params:
             workflow().store_data(config.KC_USER_NAME, params['userName'][0])
+        if 'vip' in params:
+            workflow().store_data(config.KC_VIP_STATUS, params['vip'][0])
 
         print '您已经成功登录'
         return True

diff --git a/links/config.py b/links/config.py
@@ -20,7 +20,12 @@
 KC_MAX_COUNT = 'links_max_count'
 KC_RESERVED_COUNT = 'links_reserved_count'
 KC_ENABLE_SEARCH = 'links_enable_search'
+KC_VIP_STATUS = 'links_user_vip_status'
+KC_CURRENT_PAGE_INDEX = 'links_current_page_idx'
+KC_LAST_TIME_QUERY_WORD = 'links_last_time_query_word'
 
 
-LK_SEARCH_APP_URL = 'http://elinks.localhost.com/api/v1/links/search/app'
-LK_OAUTH_URL = 'http://links.localhost.com/authorize'
+LK_SEARCH_APP_URL = 'http://elinks.tickstep.com/api/v1/links/search/app'
+LK_OAUTH_URL = 'http://links.tickstep.com/authorize'
+# LK_SEARCH_APP_URL = 'http://elinks.localhost.com/api/v1/links/search/app'
+# LK_OAUTH_URL = 'http://links.localhost.com/authorize'
diff --git a/links/handlers/preferences.py b/links/handlers/preferences.py
@@ -11,11 +11,13 @@
 
 
 def filter(args):
+    prefs = Preferences.current_prefs()
 
     workflow().add_item(
         u'查询结果个数',
-        u'设置服务器返回结果的最大个数',
-        arg='-pref resultCount', valid=True, icon=icons.LIST
+        u'设置服务器每页返回结果的最大个数',
+        autocomplete='-result_count ',
+        icon=icons.LIST
     )
 
     workflow().add_item(

diff --git a/links/handlers/result_count.py b/links/handlers/result_count.py
@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+from links import icons, config
+from links.util import workflow, relaunch_alfred
+from links.models.preferences import Preferences
+
+
+def filter(args):
+    prefs = Preferences.current_prefs()
+
+    icon = icons.TASK
+    if prefs.maxResultCount == 7:
+        icon = icons.TASK_COMPLETED
+    workflow().add_item(
+        u'设定最大值为 7',
+        arg='-result_count max_7', valid=True, icon=icon
+    )
+
+    icon = icons.TASK
+    if prefs.maxResultCount == 20:
+        icon = icons.TASK_COMPLETED
+    workflow().add_item(
+        u'设定最大值为 20',
+        u'VIP账户才能生效',
+        arg='-result_count max_20', valid=True, icon=icon
+    )
+
+    workflow().add_item(
+        u'返回主菜单',
+        autocomplete=' ', icon=icons.BACK
+    )
+
+
+def commit(args, modifier=None):
+    prefs = Preferences.current_prefs()
+    relaunch_command = 'lk '
+
+    if 'max_7' in args:
+        prefs.maxResultCount = 7
+
+    elif 'max_20' in args:
+        prefs.maxResultCount = 20
+
+    if relaunch_command:
+        relaunch_alfred(relaunch_command)
diff --git a/links/handlers/route.py b/links/handlers/route.py
@@ -61,8 +61,11 @@ def route(args):
     elif 'pref'.find(action) == 0:
         from links.handlers import preferences
         handler = preferences
+    elif 'result_count'.find(action) == 0:
+        from links.handlers import result_count
+        handler = result_count
 
-    elif 'search'.find(action) == 0:
+    elif action.find('search') == 0:
         from links.handlers import search
         handler = search
 

diff --git a/links/handlers/search.py b/links/handlers/search.py
@@ -2,6 +2,7 @@
 
 from datetime import datetime
 from links import icons, config
+from links.models.preferences import Preferences
 from links.util import workflow
 from links.api import search_api
 import logging
@@ -11,14 +12,28 @@
 
 
 def filter(args):
+    prefs = Preferences.current_prefs()
+
+    log.info(args)
+    queryWord = ''
+    if len(args) >= 2:
+        queryWord = ''
+        for idx in range(1, len(args)):
+            w = args[idx]
+            queryWord = "%s %s" % (queryWord, w)
+    queryWord = queryWord.strip()
 
     if not workflow().stored_data(config.KC_ENABLE_SEARCH):
-        workflow().add_item(
-            u'先返回主菜单再进行搜索',
-            autocomplete=' ', icon=icons.BACK
-        )
-        workflow().store_data(config.KC_ENABLE_SEARCH, False)
-        return
+        log.info('enable search false')
+        log.info('store last time keyword: %s' % workflow().stored_data(config.KC_LAST_TIME_QUERY_WORD))
+        # the same keyword means this is page navigate action
+        if queryWord != workflow().stored_data(config.KC_LAST_TIME_QUERY_WORD):
+            workflow().add_item(
+                u'需要先返回主菜单才能进行新的搜索',
+                autocomplete=' ', icon=icons.BACK
+            )
+            workflow().store_data(config.KC_ENABLE_SEARCH, False)
+            return
 
     workflow().add_item(
         u'返回主菜单',
@@ -27,16 +42,19 @@ def filter(args):
     log.info('begin to search')
     workflow().store_data(config.KC_ENABLE_SEARCH, False)
 
+    # page index
+    scmd = args[0]
+    idx = scmd.find(':')
+    if idx > 0:
+        pidx = int(scmd[idx + 1:])
+        workflow().store_data(config.KC_CURRENT_PAGE_INDEX, pidx)
+    else:
+        workflow().store_data(config.KC_CURRENT_PAGE_INDEX, 0)
+
     # search
-    queryWord = ''
-    if len(args) >= 2:
-        queryWord = ''
-        for idx in range(1, len(args)):
-            w = args[idx]
-            queryWord = "%s %s" % (queryWord, w)
-    queryWord = queryWord.strip()
     log.info('begin to search %s' % (queryWord))
-    result = search_api.search(queryWord)
+    workflow().store_data(config.KC_LAST_TIME_QUERY_WORD, queryWord)
+    result = search_api.search(queryWord, workflow().stored_data(config.KC_CURRENT_PAGE_INDEX) * prefs.maxResultCount, prefs.maxResultCount)
 
     if result['statusCode'] == 0:
         if 'data' in result and result['data'] != None and len(result['data']) > 0:
@@ -48,6 +66,11 @@ def filter(args):
             if 'reserved' in queryCount:
                 workflow().store_data(config.KC_RESERVED_COUNT, queryCount['reserved'])
 
+            # vip
+            if 'vip' in queryCount:
+                log.info('vip = %s' % (queryCount['vip']))
+                workflow().store_data(config.KC_VIP_STATUS, queryCount['vip'])
+
             # download link item
             items = result['data']['items']
             if items == None or len(items) == 0:
@@ -69,6 +92,14 @@ def filter(args):
                     workflow().add_item(item['name'], ts + ' / ' + item['dlUrl']['url'], copytext=dl,
                                         largetext=item['name'] + '\n' + dl,
                                         icon=icons.APP)
+
+                # next page has?
+                if len(items) >= prefs.maxResultCount and workflow().stored_data(config.KC_VIP_STATUS):
+                    workflow().add_item(
+                        u'下一页',
+                        autocomplete='-search:%s %s' % (workflow().stored_data(config.KC_CURRENT_PAGE_INDEX) + 1, queryWord), icon=icons.NEXT
+                    )
+
         else:
             workflow().add_item(u'没有查询到结果，更改关键词再试试吧')
     else:

diff --git a/links/handlers/welcome.py b/links/handlers/welcome.py
@@ -46,6 +46,7 @@ def filter(args):
             icon=icons.SEARCH
         )
     workflow().store_data(config.KC_ENABLE_SEARCH, True)
+    workflow().store_data(config.KC_CURRENT_PAGE_INDEX, 0)
 
     reservedCount = u'%s: %s 次,  %s: %s 次' % (u'本月剩余', workflow().stored_data(config.KC_RESERVED_COUNT), u'本月总共', workflow().stored_data(config.KC_MAX_COUNT))
     workflow().add_item(
@@ -63,7 +64,11 @@ def filter(args):
         icon=icons.LIST
     )
 
-    logoutAccount = '%s: %s' % (u'退出您当前登录的账户', workflow().stored_data(config.KC_USER_NAME))
+    vipFlag = ''
+    log.info(workflow().stored_data(config.KC_VIP_STATUS))
+    if workflow().stored_data(config.KC_VIP_STATUS):
+        vipFlag = '(VIP)'
+    logoutAccount = '%s: %s%s' % (u'退出您当前登录的账户', workflow().stored_data(config.KC_USER_NAME), vipFlag)
     workflow().add_item(
         u'退出登录',
         logoutAccount,

diff --git a/links/icons.py b/links/icons.py
@@ -73,3 +73,4 @@ def icon_theme():
 APP = _icon_path + 'app.png'
 COPY = _icon_path + 'copy.png'
 ICON = _icon_path + 'icon.png'
+NEXT = _icon_path + 'next.png'
diff --git a/links/models/preferences.py b/links/models/preferences.py
@@ -44,7 +44,7 @@ def _get(self, key, default=None, type=str):
 
     @property
     def maxResultCount(self):
-        return self._get(KEY_MAX_RESTUL_COUNT) or 7
+        return self._get(KEY_MAX_RESTUL_COUNT, 20)
 
     @maxResultCount.setter
     def maxResultCount(self, count):