Implement search tab and version picker
authorsapier <Sapier at GMX dot net>
Wed, 11 Dec 2013 22:07:38 +0000 (23:07 +0100)
committersapier <Sapier at GMX dot net>
Wed, 11 Dec 2013 22:07:38 +0000 (23:07 +0100)
builtin/filterlist.lua
builtin/mainmenu.lua
builtin/modmgr.lua
builtin/modstore.lua
src/convert_json.cpp
src/guiEngine.cpp
src/guiFormSpecMenu.cpp
src/script/lua_api/l_mainmenu.cpp

index 1c2ceb0316eeccb6dd4928cc815f2e2efd210333..379a5cea90a0c38134b6652c77d6ee4d8d65bb09 100644 (file)
 
 --------------------------------------------------------------------------------
 -- Generic implementation of a filter/sortable list                           --
+-- Usage:                                                                     --
+-- Filterlist needs to be initialized on creation. To achieve this you need to --
+-- pass following functions:                                                  --
+-- raw_fct() (mandatory):                                                     --
+--     function returning a table containing the elements to be filtered      --
+-- compare_fct(element1,element2) (mandatory):                                --
+--     function returning true/false if element1 is same element as element2  --
+-- uid_match_fct(element1,uid) (optional)                                     --
+--     function telling if uid is attached to element1                        --
+-- filter_fct(element,filtercriteria) (optional)                              --
+--     function returning true/false if filtercriteria met to element         --
+-- fetch_param (optional)                                                     --
+--     parameter passed to raw_fct to aquire correct raw data                 --
+--                                                                            --
 --------------------------------------------------------------------------------
 filterlist = {}
 
@@ -157,7 +171,7 @@ function filterlist.process(this)
        this.m_processed_list = {}
        
        for k,v in pairs(this.m_raw_list) do
-               if this.m_filtercriteria == nil or 
+               if this.m_filtercriteria == nil or
                        this.m_filter_fct(v,this.m_filtercriteria) then
                        table.insert(this.m_processed_list,v)
                end
@@ -167,7 +181,7 @@ function filterlist.process(this)
                return
        end
        
-       if this.m_sort_list[this.m_sortmode] ~= nil and 
+       if this.m_sort_list[this.m_sortmode] ~= nil and
                type(this.m_sort_list[this.m_sortmode]) == "function" then
                
                this.m_sort_list[this.m_sortmode](this)
@@ -237,7 +251,7 @@ function compare_worlds(world1,world2)
 end
 
 --------------------------------------------------------------------------------
-function sort_worlds_alphabetic(this) 
+function sort_worlds_alphabetic(this)
 
        table.sort(this.m_processed_list, function(a, b)
                --fixes issue #857 (crash due to sorting nil in worldlist)
index 9555146d47fdf80c4f0366aa4046b7f20c4957aa..f8556a38811bb13879c3090f9a24cc09445f647e 100644 (file)
@@ -119,6 +119,30 @@ os.tempfolder = function()
 
 end
 
+--------------------------------------------------------------------------------
+function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency)
+       local textlines = engine.splittext(text,textlen)
+       
+       local retval = "textlist[" .. xpos .. "," .. ypos .. ";"
+                                                               .. width .. "," .. height .. ";"
+                                                               .. tl_name .. ";"
+       
+       for i=1, #textlines, 1 do
+               textlines[i] = textlines[i]:gsub("\r","")
+               retval = retval .. engine.formspec_escape(textlines[i]) .. ","
+       end
+       
+       retval = retval .. ";0;"
+       
+       if transparency then
+               retval = retval .. "true"
+       end
+       
+       retval = retval .. "]"
+
+       return retval
+end
+
 --------------------------------------------------------------------------------
 function init_globals()
        --init gamedata
@@ -939,9 +963,9 @@ end
 function tabbuilder.tab_settings()
        tab_string =
                        "vertlabel[0,0;" .. fgettext("SETTINGS") .. "]" ..
-                       "checkbox[1,0;cb_fancy_trees;".. fgettext("Fancy Trees") .. ";" 
+                       "checkbox[1,0;cb_fancy_trees;".. fgettext("Fancy Trees") .. ";"
                                        .. dump(engine.setting_getbool("new_style_leaves")) .. "]"..
-                       "checkbox[1,0.5;cb_smooth_lighting;".. fgettext("Smooth Lighting") 
+                       "checkbox[1,0.5;cb_smooth_lighting;".. fgettext("Smooth Lighting")
                                        .. ";".. dump(engine.setting_getbool("smooth_lighting")) .. "]"..
                        "checkbox[1,1;cb_3d_clouds;".. fgettext("3D Clouds") .. ";"
                                        .. dump(engine.setting_getbool("enable_3d_clouds")) .. "]"..
@@ -979,7 +1003,7 @@ if engine.setting_getbool("enable_shaders") then
                                        .. dump(engine.setting_getbool("enable_waving_leaves")) .. "]"..
                        "checkbox[8,2.5;cb_waving_plants;".. fgettext("Waving Plants") .. ";"
                                        .. dump(engine.setting_getbool("enable_waving_plants")) .. "]"
-else 
+else
        tab_string = tab_string ..
                        "textlist[8.33,0.7;4,1;;#888888" .. fgettext("Bumpmapping") .. ";0;true]" ..
                        "textlist[8.33,1.2;4,1;;#888888" .. fgettext("Parallax Occlusion") .. ";0;true]" ..
index cc5e09513bb280f277d1c9147720c41d98fe52d9..13f81c6e01632263f37e7ba2470990ffada3fc49 100644 (file)
@@ -56,10 +56,12 @@ function modmgr.extract(modfile)
                if tempfolder ~= nil and
                        tempfolder ~= "" then
                        engine.create_dir(tempfolder)
-                       engine.extract_zip(modfile.name,tempfolder)
-                       return tempfolder
+                       if engine.extract_zip(modfile.name,tempfolder) then
+                               return tempfolder
+                       end
                end
        end
+       return nil
 end
 
 -------------------------------------------------------------------------------
@@ -615,7 +617,7 @@ function modmgr.installmod(modfilename,basename)
 
        if modpath == nil then
                gamedata.errormessage = fgettext("Install Mod: file: \"$1\"", modfile.name) ..
-                       fgettext("\nInstall Mod: unsupported filetype \"$1\"", modfile.type)
+                       fgettext("\nInstall Mod: unsupported filetype \"$1\" or broken archive", modfile.type)
                return
        end
 
index acaff871b753872ea9d0a1a4d97a58fd92e37f23..b446a055393328f290ac6d6be456904452273bdf 100644 (file)
@@ -21,6 +21,7 @@
 modstore = {}
 
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] init
 function modstore.init()
        modstore.tabnames = {}
 
@@ -33,11 +34,55 @@ function modstore.init()
                                                DIR_DELIM .. "pack" .. DIR_DELIM
 
        modstore.lastmodtitle = ""
+       modstore.last_search = ""
+       
+       modstore.searchlist = filterlist.create(
+               function()
+                       if modstore.modlist_unsorted ~= nil and
+                               modstore.modlist_unsorted.data ~= nil then
+                               return modstore.modlist_unsorted.data
+                       end
+                       return {}
+               end,
+               function(element,modid)
+                       if element.id == modid then
+                               return true
+                       end
+                       return false
+               end, --compare fct
+               nil, --uid match fct
+               function(element,substring)
+                       if substring == nil or
+                               substring == "" then
+                               return false
+                       end
+                       substring = substring:upper()
+                       
+                       if element.title ~= nil and
+                               element.title:upper():find(substring) ~= nil then
+                               return true
+                       end
+                       
+                       if element.details ~= nil and
+                               element.details.author ~= nil and
+                               element.details.author:upper():find(substring) ~= nil then
+                               return true
+                       end
+                       
+                       if element.details ~= nil and
+                               element.details.description ~= nil and
+                               element.details.description:upper():find(substring) ~= nil then
+                               return true
+                       end
+                       return false
+               end --filter fct
+               )
 
        modstore.current_list = nil
 end
 
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] nametoindex
 function modstore.nametoindex(name)
 
        for i=1,#modstore.tabnames,1 do
@@ -50,12 +95,34 @@ function modstore.nametoindex(name)
 end
 
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] getsuccessfuldialog
+function modstore.getsuccessfuldialog()
+       local retval = ""
+       retval = retval .. "size[6,2]"
+       if modstore.lastmodentry ~= nil then
+               retval = retval .. "label[0,0.25;" .. fgettext("Successfully installed:") .. "]"
+               retval = retval .. "label[3,0.25;" .. modstore.lastmodentry.moddetails.title .. "]"
+       
+               
+               retval = retval .. "label[0,0.75;" .. fgettext("Shortname:") .. "]"
+               retval = retval .. "label[3,0.75;" .. engine.formspec_escape(modstore.lastmodentry.moddetails.basename) .. "]"
+
+       end
+       retval = retval .. "button[2.5,1.5;1,0.5;btn_confirm_mod_successfull;" .. fgettext("ok") .. "]"
+                               
+                               
+       return retval
+end
+
+--------------------------------------------------------------------------------
+-- @function [parent=#modstore] gettab
 function modstore.gettab(tabname)
        local retval = ""
 
        local is_modstore_tab = false
 
        if tabname == "dialog_modstore_unsorted" then
+               modstore.modsperpage = 5
                retval = modstore.getmodlist(modstore.modlist_unsorted)
                is_modstore_tab = true
        end
@@ -70,30 +137,33 @@ function modstore.gettab(tabname)
        end
 
        if tabname == "modstore_mod_installed" then
-               return "size[6,2]label[0.25,0.25;Mod(s): " .. modstore.lastmodtitle ..
-                               " installed successfully]" ..
-                               "button[2.5,1.5;1,0.5;btn_confirm_mod_successfull;ok]"
+               return modstore.getsuccessfuldialog()
        end
 
        if tabname == "modstore_downloading" then
-               return "size[6,2]label[0.25,0.25;Dowloading " .. modstore.lastmodtitle ..
-                               " please wait]"
+               return "size[6,2]label[0.25,0.75;" .. fgettext("Downloading") ..
+                               " " .. modstore.lastmodtitle .. " " ..
+                               fgettext("please wait...") .. "]"
        end
 
        return ""
 end
 
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] tabheader
 function modstore.tabheader(tabname)
-       local retval  = "size[12,9.25]"
+       local retval  = "size[12,10.25]"
        retval = retval .. "tabheader[-0.3,-0.99;modstore_tab;" ..
                                "Unsorted,Search;" ..
-                               modstore.nametoindex(tabname) .. ";true;false]"
+                               modstore.nametoindex(tabname) .. ";true;false]" ..
+                               "button[4,9.9;4,0.5;btn_modstore_close;" ..
+                               fgettext("Close modstore") .. "]"
 
        return retval
 end
 
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] handle_buttons
 function modstore.handle_buttons(current_tab,fields)
 
        if fields["modstore_tab"] then
@@ -101,14 +171,25 @@ function modstore.handle_buttons(current_tab,fields)
 
                if index > 0 and
                        index <= #modstore.tabnames then
+                       if modstore.tabnames[index] == "dialog_modstore_search" then
+                               filterlist.set_filtercriteria(modstore.searchlist,modstore.last_search)
+                               filterlist.refresh(modstore.searchlist)
+                               modstore.modsperpage = 4
+                               modstore.currentlist = {
+                                       page = 0,
+                                       pagecount =
+                                               math.ceil(filterlist.size(modstore.searchlist) / modstore.modsperpage),
+                                       data = filterlist.get_list(modstore.searchlist),
+                               }
+                       end
+                       
                        return {
                                        current_tab = modstore.tabnames[index],
                                        is_dialog = true,
                                        show_buttons = false
                        }
                end
-
-               modstore.modlist_page = 0
+               
        end
 
        if fields["btn_modstore_page_up"] then
@@ -124,15 +205,26 @@ function modstore.handle_buttons(current_tab,fields)
                end
        end
 
-       if fields["btn_hidden_close_download"] then
-               return {
+       if fields["btn_hidden_close_download"] ~= nil then
+               if fields["btn_hidden_close_download"].successfull then
+                       modstore.lastmodentry = fields["btn_hidden_close_download"]
+                       return {
                                        current_tab = "modstore_mod_installed",
                                        is_dialog = true,
                                        show_buttons = false
                        }
+               else
+                       modstore.lastmodtitle = ""
+                       return {
+                                               current_tab = modstore.tabnames[1],
+                                               is_dialog = true,
+                                               show_buttons = false
+                               }
+               end
        end
 
        if fields["btn_confirm_mod_successfull"] then
+               modstore.lastmodentry = nil
                modstore.lastmodtitle = ""
                return {
                                        current_tab = modstore.tabnames[1],
@@ -141,74 +233,116 @@ function modstore.handle_buttons(current_tab,fields)
                        }
        end
 
-       for i=1, modstore.modsperpage, 1 do
-               local installbtn = "btn_install_mod_" .. i
-
-               if fields[installbtn] then
-                       local modlistentry =
-                               modstore.current_list.page * modstore.modsperpage + i
-
-                       if modstore.modlist_unsorted.data[modlistentry] ~= nil and
-                               modstore.modlist_unsorted.data[modlistentry].details ~= nil then
-
-                               local moddetails = modstore.modlist_unsorted.data[modlistentry].details
-
-                               if modstore.lastmodtitle ~= "" then
-                                       modstore.lastmodtitle = modstore.lastmodtitle .. ", "
-                               end
-
-                               modstore.lastmodtitle = modstore.lastmodtitle .. moddetails.title
-
-                               engine.handle_async(
-                                       function(param)
-                                               local fullurl = engine.setting_get("modstore_download_url") ..
-                                                                               param.moddetails.download_url
-
-                                               if engine.download_file(fullurl,param.filename) then
-                                                       return {
-                                                               moddetails = param.moddetails,
-                                                               filename = param.filename,
-                                                               successfull = true
-                                                       }
-                                               else
-                                                       return {
-                                                               modtitle = param.title,
-                                                               successfull = false
-                                                       }
-                                               end
-                                       end,
-                                       {
-                                               moddetails = moddetails,
-                                               filename = os.tempfolder() .. ".zip"
-                                       },
-                                       function(result)
-                                               if result.successfull then
-                                                       modmgr.installmod(result.filename,result.moddetails.basename)
-                                                       os.remove(result.filename)
-                                               else
-                                                       gamedata.errormessage = "Failed to download " .. result.moddetails.title
-                                               end
-
-                                               engine.button_handler({btn_hidden_close_download=true})
+       if fields["btn_modstore_search"] or
+               (fields["key_enter"] and fields["te_modstore_search"] ~= nil) then
+               modstore.last_search = fields["te_modstore_search"]
+               filterlist.set_filtercriteria(modstore.searchlist,fields["te_modstore_search"])
+               filterlist.refresh(modstore.searchlist)
+               modstore.currentlist = {
+                       page = 0,
+                       pagecount =  math.ceil(filterlist.size(modstore.searchlist) / modstore.modsperpage),
+                       data = filterlist.get_list(modstore.searchlist),
+               }
+       end
+       
+       
+       if fields["btn_modstore_close"] then
+               return {
+                       is_dialog = false,
+                       show_buttons = true,
+                       current_tab = engine.setting_get("main_menu_tab")
+               }
+       end
+       
+       for key,value in pairs(fields) do
+               local foundat = key:find("btn_install_mod_")
+               if ( foundat == 1) then
+                       local modid = tonumber(key:sub(17))
+                       for i=1,#modstore.modlist_unsorted.data,1 do
+                               if modstore.modlist_unsorted.data[i].id == modid then
+                                       local moddetails = modstore.modlist_unsorted.data[i].details
+
+                                       if modstore.lastmodtitle ~= "" then
+                                               modstore.lastmodtitle = modstore.lastmodtitle .. ", "
                                        end
-                               )
-
-                               return {
-                                       current_tab = "modstore_downloading",
-                                       is_dialog = true,
-                                       show_buttons = false,
-                                       ignore_menu_quit = true
-                               }
-
-                       else
-                               gamedata.errormessage =
-                                       "Internal modstore error please leave modstore and reopen! (Sorry)"
+       
+                                       modstore.lastmodtitle = modstore.lastmodtitle .. moddetails.title
+       
+                                       engine.handle_async(
+                                               function(param)
+                                               
+                                                       local fullurl = engine.setting_get("modstore_download_url") ..
+                                                                                       param.moddetails.download_url
+                                                                                       
+                                                       if param.version ~= nil then
+                                                               local found = false
+                                                               for i=1,#param.moddetails.versions, 1 do
+                                                                       if param.moddetails.versions[i].date:sub(1,10) == param.version then
+                                                                               fullurl = engine.setting_get("modstore_download_url") ..
+                                                                                                               param.moddetails.versions[i].download_url
+                                                                               found = true
+                                                                       end
+                                                               end
+                                                               
+                                                               if not found then
+                                                                       return {
+                                                                               moddetails = param.moddetails,
+                                                                               successfull = false
+                                                                       }
+                                                               end
+                                                       end
+       
+                                                       if engine.download_file(fullurl,param.filename) then
+                                                               return {
+                                                                       texturename = param.texturename,
+                                                                       moddetails = param.moddetails,
+                                                                       filename = param.filename,
+                                                                       successfull = true
+                                                               }
+                                                       else
+                                                               return {
+                                                                       modtitle = param.title,
+                                                                       successfull = false
+                                                               }
+                                                       end
+                                               end,
+                                               {
+                                                       moddetails = moddetails,
+                                                       version = fields["dd_version" .. modid],
+                                                       filename = os.tempfolder() .. "_MODNAME_" .. moddetails.basename .. ".zip",
+                                                       texturename = modstore.modlist_unsorted.data[i].texturename
+                                               },
+                                               function(result)
+                                                       if result.successfull then
+                                                               modmgr.installmod(result.filename,result.moddetails.basename)
+                                                               os.remove(result.filename)
+                                                       else
+                                                               gamedata.errormessage = "Failed to download " .. result.moddetails.title
+                                                       end
+       
+                                                       if gamedata.errormessage == nil then
+                                                               engine.button_handler({btn_hidden_close_download=result})
+                                                       else
+                                                               engine.button_handler({btn_hidden_close_download={successfull=false}})
+                                                       end
+                                               end
+                                       )
+       
+                                       return {
+                                               current_tab = "modstore_downloading",
+                                               is_dialog = true,
+                                               show_buttons = false,
+                                               ignore_menu_quit = true
+                                       }
+                               end
                        end
+                       break
                end
        end
 end
 
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] update_modlist
 function modstore.update_modlist()
        modstore.modlist_unsorted = {}
        modstore.modlist_unsorted.data = {}
@@ -241,6 +375,7 @@ function modstore.update_modlist()
 end
 
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] fetchdetails
 function modstore.fetchdetails()
 
        for i=1,#modstore.modlist_unsorted.data,1 do
@@ -267,23 +402,160 @@ function modstore.fetchdetails()
                )
        end
 end
+
 --------------------------------------------------------------------------------
+-- @function [parent=#modstore] getscreenshot
+function modstore.getscreenshot(ypos,listentry)
+
+       if      listentry.details ~= nil and
+               (listentry.details.screenshot_url == nil or
+               listentry.details.screenshot_url == "") then
+               
+               if listentry.texturename == nil then
+                       listentry.texturename = modstore.basetexturedir .. "no_screenshot.png"
+               end
+               
+               return "image[0,".. ypos .. ";3,2;" ..
+                       engine.formspec_escape(listentry.texturename) .. "]"
+       end
+       
+       if listentry.details ~= nil and
+               listentry.texturename == nil then
+               --make sure we don't download multiple times
+               listentry.texturename = "in progress"
+       
+               --prepare url and filename
+               local fullurl = engine.setting_get("modstore_download_url") ..
+                                       listentry.details.screenshot_url
+               local filename = os.tempfolder() .. "_MID_" .. listentry.id
+               
+               --trigger download
+               engine.handle_async(
+                       --first param is downloadfct
+                       function(param)
+                               param.successfull = engine.download_file(param.fullurl,param.filename)
+                               return param
+                       end,
+                       --second parameter is data passed to async job
+                       {
+                               fullurl = fullurl,
+                               filename = filename,
+                               modid = listentry.id
+                       },
+                       --integrate result to raw list
+                       function(result)
+                               if result.successfull then
+                                       local found = false
+                                       for i=1,#modstore.modlist_unsorted.data,1 do
+                                               if modstore.modlist_unsorted.data[i].id == result.modid then
+                                                       found = true
+                                                       modstore.modlist_unsorted.data[i].texturename = result.filename
+                                                       break
+                                               end
+                                       end
+                                       if found then
+                                               engine.event_handler("Refresh")
+                                       else
+                                               engine.log("error","got screenshot but didn't find matching mod: " .. result.modid)
+                                       end
+                               end
+                       end
+               )
+       end
+
+       if listentry.texturename ~= nil and
+               listentry.texturename ~= "in progress" then
+               return "image[0,".. ypos .. ";3,2;" ..
+                       engine.formspec_escape(listentry.texturename) .. "]"
+       end
+       
+       return ""
+end
 
 --------------------------------------------------------------------------------
-function modstore.getmodlist(list)
+--@function [parent=#modstore] getshortmodinfo
+function modstore.getshortmodinfo(ypos,listentry,details)
        local retval = ""
-       retval = retval .. "label[10,-0.4;" .. fgettext("Page $1 of $2", list.page+1, list.pagecount) .. "]"
+       
+       retval = retval .. "box[0," .. ypos .. ";11.4,1.75;#FFFFFF]"
+
+       --screenshot
+       retval = retval .. modstore.getscreenshot(ypos,listentry)
+
+       --title + author
+       retval = retval .."label[2.75," .. ypos .. ";" ..
+               engine.formspec_escape(details.title) .. " (" .. details.author .. ")]"
+
+       --description
+       local descriptiony = ypos + 0.5
+       retval = retval .. "textarea[3," .. descriptiony .. ";6.5,1.55;;" ..
+               engine.formspec_escape(details.description) .. ";]"
+               
+       --rating
+       local ratingy = ypos
+       retval = retval .."label[7," .. ratingy .. ";" ..
+                                       fgettext("Rating") .. ":]"
+       retval = retval .. "label[8.7," .. ratingy .. ";" .. details.rating .."]"
+       
+       --versions (IMPORTANT has to be defined AFTER rating)
+       if details.versions ~= nil and
+               #details.versions > 1 then
+               local versiony = ypos + 0.05
+               retval = retval .. "dropdown[9.1," .. versiony .. ";2.48,0.25;dd_version" .. details.id .. ";"
+               local versions = ""
+               for i=1,#details.versions , 1 do
+                       if versions ~= "" then
+                               versions = versions .. ","
+                       end
+                       
+                       versions = versions .. details.versions[i].date:sub(1,10)
+               end
+               retval = retval .. versions .. ";1]"
+       end
+
+       if details.basename then
+               --install button
+               local buttony = ypos + 1.2
+               retval = retval .."button[9.1," .. buttony .. ";2.5,0.5;btn_install_mod_" .. details.id .. ";"
 
-       retval = retval .. "button[11.6,-0.1;0.5,0.5;btn_modstore_page_up;^]"
-       retval = retval .. "box[11.6,0.35;0.28,8.6;#000000]"
-       local scrollbarpos = 0.35 + (8.1/(list.pagecount-1)) * list.page
-       retval = retval .. "box[11.6," ..scrollbarpos .. ";0.28,0.5;#32CD32]"
-       retval = retval .. "button[11.6,9.0;0.5,0.5;btn_modstore_page_down;v]"
+               if modmgr.mod_exists(details.basename) then
+                       retval = retval .. fgettext("re-Install") .."]"
+               else
+                       retval = retval .. fgettext("Install") .."]"
+               end
+       end
+       
+       return retval
+end
 
+--------------------------------------------------------------------------------
+--@function [parent=#modstore] getmodlist
+function modstore.getmodlist(list,yoffset)
 
-       if #list.data < (list.page * modstore.modsperpage) then
-               return retval
+       modstore.current_list = list
+       
+       if #list.data == 0 then
+               return ""
        end
+       
+       if yoffset == nil then
+               yoffset = 0
+       end
+
+       local scrollbar = ""
+       scrollbar = scrollbar .. "label[0.1,9.5;"
+                               .. fgettext("Page $1 of $2", list.page+1, list.pagecount) .. "]"
+       scrollbar = scrollbar .. "box[11.6," .. (yoffset + 0.35) .. ";0.28,"
+                               .. (8.6 - yoffset) .. ";#000000]"
+       local scrollbarpos = (yoffset + 0.75) +
+                               ((7.7 -yoffset)/(list.pagecount-1)) * list.page
+       scrollbar = scrollbar .. "box[11.6," ..scrollbarpos .. ";0.28,0.5;#32CD32]"
+       scrollbar = scrollbar .. "button[11.6," .. (yoffset + (0.3))
+                               .. ";0.5,0.5;btn_modstore_page_up;^]"
+       scrollbar = scrollbar .. "button[11.6," .. 9.0
+                               .. ";0.5,0.5;btn_modstore_page_down;v]"
+
+       local retval = ""
 
        local endmod = (list.page * modstore.modsperpage) + modstore.modsperpage
 
@@ -295,10 +567,6 @@ function modstore.getmodlist(list)
                --getmoddetails
                local details = list.data[i].details
 
---             if details == nil then
---                     details = modstore.get_details(list.data[i].id)
---             end
-
                if details == nil then
                        details = {}
                        details.title = list.data[i].title
@@ -308,97 +576,39 @@ function modstore.getmodlist(list)
                end
 
                if details ~= nil then
-                       local screenshot_ypos = (i-1 - (list.page * modstore.modsperpage))*1.9 +0.2
-
-                       retval = retval .. "box[0," .. screenshot_ypos .. ";11.4,1.75;#FFFFFF]"
-
-                       if details.basename then
-                               --screenshot
-                               if details.screenshot_url ~= nil and
-                                       details.screenshot_url ~= "" then
-                                       if list.data[i].texturename == nil then
-                                               local fullurl = engine.setting_get("modstore_download_url") ..
-                                                                       details.screenshot_url
-                                               local filename = os.tempfolder() .. "_MID_" .. list.data[i].id
-                                               list.data[i].texturename = "in progress"
-                                               engine.handle_async(
-                                                       function(param)
-                                                               param.successfull = engine.download_file(param.fullurl,param.filename)
-                                                               return param
-                                                       end,
-                                                       {
-                                                               fullurl = fullurl,
-                                                               filename = filename,
-                                                               listindex = i,
-                                                               modid = list.data[i].id
-                                                       },
-                                                       function(result)
-                                                               if modstore.modlist_unsorted and
-                                                                       modstore.modlist_unsorted.data and
-                                                                       #modstore.modlist_unsorted.data >= result.listindex and
-                                                                       modstore.modlist_unsorted.data[result.listindex].id == result.modid then
-                                                                       if result.successfull then
-                                                                               modstore.modlist_unsorted.data[result.listindex].texturename = result.filename
-                                                                       else
-                                                                               modstore.modlist_unsorted.data[result.listindex].texturename = modstore.basetexturedir .. "no_screenshot.png"
-                                                                       end
-                                                                       engine.event_handler("Refresh")
-                                                               end
-                                                       end
-                                               )
-                                       end
-                               else
-                                       if list.data[i].texturename == nil then
-                                               list.data[i].texturename = modstore.basetexturedir .. "no_screenshot.png"
-                                       end
-                               end
-
-                               if list.data[i].texturename ~= nil and
-                                       list.data[i].texturename ~= "in progress" then
-                                       retval = retval .. "image[0,".. screenshot_ypos .. ";3,2;" ..
-                                               engine.formspec_escape(list.data[i].texturename) .. "]"
-                               end
-                       end
-
-                       --title + author
-                       retval = retval .."label[2.75," .. screenshot_ypos .. ";" ..
-                               engine.formspec_escape(details.title) .. " (" .. details.author .. ")]"
-
-                       --description
-                       local descriptiony = screenshot_ypos + 0.5
-                       retval = retval .. "textarea[3," .. descriptiony .. ";6.5,1.55;;" ..
-                               engine.formspec_escape(details.description) .. ";]"
-                       --rating
-                       local ratingy = screenshot_ypos + 0.6
-                       retval = retval .."label[9.1," .. ratingy .. ";" ..
-                                                       fgettext("Rating") .. ":]"
-                       retval = retval .. "label[11.1," .. ratingy .. ";" .. details.rating .."]"
-
-                       if details.basename then
-                               --install button
-                               local buttony = screenshot_ypos + 1.2
-                               local buttonnumber = (i - (list.page * modstore.modsperpage))
-                               retval = retval .."button[9.1," .. buttony .. ";2.5,0.5;btn_install_mod_" .. buttonnumber .. ";"
-
-                               if modmgr.mod_exists(details.basename) then
-                                       retval = retval .. fgettext("re-Install") .."]"
-                               else
-                                       retval = retval .. fgettext("Install") .."]"
-                               end
-                       end
+                       local screenshot_ypos =
+                               yoffset +(i-1 - (list.page * modstore.modsperpage))*1.9 +0.2
+                               
+                       retval = retval .. modstore.getshortmodinfo(screenshot_ypos,
+                                                                                                               list.data[i],
+                                                                                                               details)
                end
        end
-
-       modstore.current_list = list
-
-       return retval
+       
+       return retval .. scrollbar
 end
 
 --------------------------------------------------------------------------------
+--@function [parent=#modstore] getsearchpage
 function modstore.getsearchpage()
        local retval = ""
+       local search = ""
+       
+       if modstore.last_search ~= nil then
+               search = modstore.last_search
+       end
 
-       --TODO implement search!
+       retval = retval ..
+               "button[9.5,0.2;2.5,0.5;btn_modstore_search;".. fgettext("Search") .. "]" ..
+               "field[0.5,0.5;9,0.5;te_modstore_search;;" .. search .. "]"
+
+       
+       --show 4 mods only
+       modstore.modsperpage = 4
+       retval = retval ..
+               modstore.getmodlist(
+                       modstore.currentlist,
+                       1.75)
 
        return retval;
 end
index e8eede0b1edb435d2d6a7d92bfb7afd3c7c5f094..0b69f43a3efdc8955b713e5285d3361b85b0c134 100644 (file)
@@ -210,7 +210,7 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
        }
 
        if (retval.versions.size() < 1) {
-               errorstream << "readModStoreModDetails: not a single version specified!" << std::endl;
+               infostream << "readModStoreModDetails: not a single version specified!" << std::endl;
                retval.valid = false;
        }
 
index 7acc00ef1d4550f090c10f38a0ac1c4f21ab6d58..d008b25686e24be40e9b5a6c90924b3a16e3622d 100644 (file)
@@ -156,7 +156,7 @@ GUIEngine::GUIEngine(       irr::IrrlichtDevice* dev,
                m_sound_manager = &dummySoundManager;
 
        //create topleft header
-       core::rect<s32> rect(0, 0, 500, 40);
+       core::rect<s32> rect(0, 0, 500, 20);
        rect += v2s32(4, 0);
        std::string t = std::string("Minetest ") + minetest_version_hash;
 
index 82def7411d199d9c7ca34119b061af60860c8658..87a46d9c9ab137256ef20376c7e4cb6399677c52 100644 (file)
@@ -1856,7 +1856,7 @@ void GUIFormSpecMenu::drawMenu()
        
        v2u32 screenSize = driver->getScreenSize();
        core::rect<s32> allbg(0, 0, screenSize.X ,      screenSize.Y);
-       if (m_bgfullscreen) 
+       if (m_bgfullscreen)
                driver->draw2DRectangle(m_bgcolor, allbg, &allbg);
        else
                driver->draw2DRectangle(m_bgcolor, AbsoluteRect, &AbsoluteClippingRect);
@@ -1959,7 +1959,7 @@ void GUIFormSpecMenu::drawMenu()
                IItemDefManager *idef = m_gamedef->idef();
                ItemStack item;
                item.deSerialize(spec.name, idef);
-               video::ITexture *texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef);         
+               video::ITexture *texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef);
                // Image size on screen
                core::rect<s32> imgrect(0, 0, spec.geom.X, spec.geom.Y);
                // Image rectangle on screen
@@ -1998,7 +1998,7 @@ void GUIFormSpecMenu::drawMenu()
                if (spec.tooltip != "")
                {
                        core::rect<s32> rect = spec.rect;
-                       if (rect.isPointInside(m_pointer)) 
+                       if (rect.isPointInside(m_pointer))
                        {
                                m_tooltip_element->setVisible(true);
                                this->bringToFront(m_tooltip_element);
@@ -2168,7 +2168,7 @@ void GUIFormSpecMenu::acceptInput(bool quit=false)
                for(u32 i=0; i<m_fields.size(); i++)
                {
                        const FieldSpec &s = m_fields[i];
-                       if(s.send) 
+                       if(s.send)
                        {
                                if(s.ftype == f_Button)
                                {
@@ -2194,8 +2194,11 @@ void GUIFormSpecMenu::acceptInput(bool quit=false)
                                        if ((element) && (element->getType() == gui::EGUIET_COMBO_BOX)) {
                                                e = static_cast<gui::IGUIComboBox*>(element);
                                        }
-                                       fields[wide_to_narrow(s.fname.c_str())] =
-                                                       wide_to_narrow(e->getItem(e->getSelected()));
+                                       s32 selected = e->getSelected();
+                                       if (selected >= 0) {
+                                               fields[wide_to_narrow(s.fname.c_str())] =
+                                                       wide_to_narrow(e->getItem(selected));
+                                       }
                                }
                                else if (s.ftype == f_TabHeader) {
                                        // no dynamic cast possible due to some distributions shipped
@@ -2662,7 +2665,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                        for(u32 i=0; i<m_fields.size(); i++)
                        {
                                FieldSpec &s = m_fields[i];
-                               // if its a button, set the send field so 
+                               // if its a button, set the send field so
                                // lua knows which button was pressed
                                if (((s.ftype == f_Button) || (s.ftype == f_CheckBox)) &&
                                                (s.fid == event.GUIEvent.Caller->getID()))
index 42ddd0b14101c70976e969cd1ac42b47ff046419..ba8a09747bee2f653a7956029bacec5017ae1959 100644 (file)
@@ -336,6 +336,26 @@ int ModApiMainMenu::l_get_modstore_details(lua_State *L)
                        lua_pushstring(L,current_mod.versions[0].file.c_str());
                        lua_settable(L, top);
 
+                       lua_pushstring(L,"versions");
+                       lua_newtable(L);
+                       int versionstop = lua_gettop(L);
+                       for (unsigned int i=0;i < current_mod.versions.size(); i++) {
+                               lua_pushnumber(L,i+1);
+                               lua_newtable(L);
+                               int current_element = lua_gettop(L);
+
+                               lua_pushstring(L,"date");
+                               lua_pushstring(L,current_mod.versions[i].date.c_str());
+                               lua_settable(L,current_element);
+
+                               lua_pushstring(L,"download_url");
+                               lua_pushstring(L,current_mod.versions[i].file.c_str());
+                               lua_settable(L,current_element);
+
+                               lua_settable(L,versionstop);
+                       }
+                       lua_settable(L, top);
+
                        lua_pushstring(L,"screenshot_url");
                        lua_pushstring(L,current_mod.titlepic.file.c_str());
                        lua_settable(L, top);
@@ -782,7 +802,10 @@ int ModApiMainMenu::l_extract_zip(lua_State *L)
 
                io::IFileSystem* fs = engine->m_device->getFileSystem();
 
-               fs->addFileArchive(zipfile,true,false,io::EFAT_ZIP);
+               if (!fs->addFileArchive(zipfile,true,false,io::EFAT_ZIP)) {
+                       lua_pushboolean(L,false);
+                       return 1;
+               }
 
                assert(fs->getFileArchiveCount() > 0);