From ebd66571461211ec35658b5cc7bb5dd0dd35dcdf Mon Sep 17 00:00:00 2001
From: Manuel Simon Hirsig <simon.hirsig@gmail.com>
Date: Fri, 8 Apr 2016 12:22:52 +0200
Subject: [PATCH] configurable start page

---
 scan.lua      |  2 +-
 scan_util.lua | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/scan.lua b/scan.lua
index 0e76bd2..53a22ff 100644
--- a/scan.lua
+++ b/scan.lua
@@ -137,7 +137,7 @@ function private.scan()
     private.current_thread().query_index = private.current_thread().query_index and private.current_thread().query_index + 1 or 1
     if private.current_query() then
         private.wait_for_callback(private.current_thread().params.on_start_query, private.current_thread().query_index, function()
-            private.current_thread().page = private.current_query().start_page or 0
+            private.current_thread().page = private.current_query().blizzard_query and private.current_query().blizzard_query.start_page or 0
             return private.process_query()
         end)
     else
diff --git a/scan_util.lua b/scan_util.lua
index 52f5fa4..087ad59 100644
--- a/scan_util.lua
+++ b/scan_util.lua
@@ -320,9 +320,10 @@ function m.find(auction_record, status_bar, on_abort, on_failure, on_success)
     tinsert(queries, {})
     if auction_record.blizzard_query then
         local pages = auction_record.page > 0 and { auction_record.page - 1 } or {}
+        local blizzard_query = Aux.util.copy_table(auction_record.blizzard_query)
+        blizzard_query.start_page = auction_record.page
         tinsert(queries, {
-            blizzard_query = auction_record.blizzard_query,
-            start_page = auction_record.page,
+            blizzard_query = blizzard_query,
             next_page = function()
                 if getn(pages) == 1 then
                     status_bar:update_status(50, 50)
@@ -392,9 +393,8 @@ function m.item_query(item_id, page, single_page)
     local item_info = Aux.info.item(item_id)
 
     if item_info then
-        local filter = m.filter_from_string(item_info.name..'/exact')
+        local filter = m.filter_from_string(item_info.name..'/exact/@'..(page or 0))
         return {
-            start_page = page,
             next_page = single_page and Aux.util.pass,
             validator = filter.validator,
             blizzard_query = filter.blizzard_query,
@@ -480,6 +480,13 @@ function m.filter_from_string(filter_term)
                     return false, suggestions, error
                 end
             end
+        elseif strfind(str, '@%d+') then
+            if not blizzard_filter.start_page then
+                blizzard_filter.start_page = tonumber(({strfind(str, '@(%d+)')})[3])
+                prettified:append(Aux.gui.inline_color({216, 225, 211, 1})..str..'|r')
+            else
+                return false, {}, 'Erroneous start page modifier'
+            end
         elseif tonumber(str) then
             if not blizzard_filter.min_level then
                 blizzard_filter.min_level = tonumber(str)
@@ -663,6 +670,7 @@ function m.blizzard_query(filter)
     end
 
     return {
+        start_page = filter.start_page or 0,
         name = filter.name,
         min_level = item_info and item_info.level or filter.min_level,
         max_level = item_info and item_info.level or filter.max_level,