sim stub plugin collector

librtt/Rtt_Runtime.cpp

@@ -49,7 +49,7 @@
 
 namespace Rtt
 {
-
+int luaload_CoronaBuilderPluginCollector(lua_State *L);
 // ----------------------------------------------------------------------------
 
 // These iterations are reasonable default values. See http://www.box2d.org/forum/viewtopic.php?f=8&t=4396 for discussion.
@@ -419,6 +419,11 @@ pushShellArgs( lua_State* L )
 
 		runtime->PushDownloadablePlugins( L );
 		lua_setfield( L, -2, "plugins" );
+
+#if defined( Rtt_AUTHORING_SIMULATOR )
+		luaload_CoronaBuilderPluginCollector(L);
+		lua_setfield( L, -2, "pluginCollector");
+#endif
 
 		const char *name = runtime->GetSimulatorPlaformName();
 		if ( name )

platform/resources/CoronaBuilderPluginCollector.lua

@@ -351,7 +351,7 @@ local function fetchSinglePlugin(dstDir, plugin, pluginTable, pluginPlatform, pa
     end
 end
 
-function CollectCoronaPlugins(params)
+local function CollectCoronaPlugins(params)
     log("Collecting plugins")
 
     local pluginLocators = { pluginLocatorCustomURL, pluginLocatorFileSystemVersionized, pluginLocatorFileSystem, pluginLocatorFileSystemAllPlatforms, pluginLocatorCoronaStore, pluginLocatorIgnoreMissing }
@@ -366,7 +366,7 @@ function CollectCoronaPlugins(params)
         params.ignoreMissingMarker = 'IgnoreMissing'
     end
 
-    local plugins = json.decode(params.buildData).plugins
+    local plugins = params.plugins or json.decode(params.buildData).plugins
     if type(plugins) ~= 'table' then return end
 
     local pluginPlatform = params.pluginPlatform
@@ -396,8 +396,15 @@ function CollectCoronaPlugins(params)
         unresolvedDeps = {}
         allFetched = true
         for plugin, _ in pairs(collectedPlugins)  do
-            local pluginDestination = dstDir .. '/' .. plugin
-            if 0 == os.execute('/usr/bin/tar -xzf ' .. quoteString(pluginDestination .. '/data.tgz') .. ' -C ' .. quoteString(pluginDestination) .. ' metadata.lua') then
+            local pluginArc = dstDir .. '/' .. plugin .. '/data.tgz'
+            local pluginDestination = params.extractLocation or (dstDir .. '/' .. plugin)
+            local ret
+            if params.extractLocation then
+                ret = os.execute('/usr/bin/tar -xzf ' .. quoteString(pluginArc) .. ' -C ' .. quoteString(params.extractLocation) )
+            else
+                ret = os.execute('/usr/bin/tar -xzf ' .. quoteString(pluginArc) .. ' -C ' .. quoteString(pluginDestination) .. ' metadata.lua')
+            end
+            if 0 == ret then
                 local toDownload = {}
                 local metadataFile = pluginDestination .. "/metadata.lua"
                 pcall( function()
@@ -421,4 +428,4 @@ end
 
 return {
     collect = CollectCoronaPlugins
-}
+}

platform/resources/shell.lua

@@ -274,7 +274,6 @@ Runtime:addEventListener( "resize", _on_resize )
 
 local PluginSync =
 {
-	contextForUrl = {},
 	queue = {},
 
 	-- This is the catalog of plugin manifest.
@@ -427,7 +426,7 @@ function PluginSync:buildListOfManifestsToDownload( required_plugin )
 
 	if should_queue then
 		-- Queue for download.
-		table.insert( self.queue, key )
+		table.insert( self.queue, required_plugin )
 	else
 		self:debugPrint( "Skipped download of: " .. key )
 	end
@@ -442,91 +441,38 @@ function PluginSync:downloadQueuedManifests( onComplete )
 		return
 	end
 
-	local http = require("socket.http")
-	if http.request( "http://plugins.coronasphere.com" ) == nil then
-
-		-- No internet access.
-		local warnNoInternetTime = system.getPreference("simulator", "pluginSyncWarnNoInternetTime", "number") or os.time()
-
-		if os.time() >= warnNoInternetTime then
-
-			local function listener( event )
-				if "clicked" == event.action then
-					if 2 == event.index then
-						-- Suspend warnings for 3 hours
-						local preference = { pluginSyncWarnNoInternetTime = (os.time() + (3 * 60 * 60)), }
-						system.setPreferences("simulator", preference)
-					end
-
-					-- 'Continue anyway', meaning launch the project without
-					-- downloading plugins
-					onComplete()
-				end
-			end
-
-			system.deletePreference("simulator", "pluginSyncWarnNoInternetTime")
-
-			-- Handle error case (no internet, or coronasphere is down)
-			native.showAlert(
-				"Plugin Warning",
-				"This project may not behave properly. This project requires certain plugins that need to be downloaded from the Internet, but a connection could not be established.",
-				{ "Continue Anyway", "Continue and Don't Show Again" },
-				listener )
-		else
-			-- If we've been asked not to warn about no internet then the default action is
-			-- 'Continue anyway', meaning launch the project without downloading plugins
-			print("WARNING: PluginSync: no internet to download/check plugins; continuing anyway")
-			onComplete()
-		end
-	else
-
-		-- We have internet access.
-		--
-		-- Download plugins and defer launching project.
-		--
-		-- The application won't function properly without plugins,
-		-- and the Simulator is already phoning home multiple times
-		-- by this point, so it's unnecessary to query the user to
-		-- proceed.
-		self:downloadManifest( onComplete )
-
-	end
-
-end
-
-function PluginSync:downloadManifest( onComplete )
-
 	native.setActivityIndicator( true )
 
 	self.requests = {}
 	self.onComplete = onComplete
 
+	local plugins = {}
 	for i=1,#self.queue do
 		-- Store a mapping between the key used in the clientCatalog
 		-- and the url which we'll need in the networkRequest listener
-		local key = self.queue[i]
-		local url = 'http://plugins.coronasphere.com/' .. key .. '/manifest.json'
-		-- Cache buster
-		url = url .. '?ts='..tostring(os.time())
-
-		self.contextForUrl[url] =
-		{
-			key=key,
-		}
-
-		-- make request to get the manifest for the plugin.
-		-- later on, we'll have to download the actual plugin file itself.
-
-		self:debugPrint("PluginSync: downloading manifest: " .. url)
-
-		-- Download to memory.
-		network.request( url,
-							"GET",
-							self ) -- "self" is who will receive the networkRequest() event.
+		local pluginInfo = self.queue[i]
+		key = pluginInfo.publisherId .. '/' .. pluginInfo.pluginName
+		plugins[pluginInfo.pluginName] = {}
+		if pluginInfo.json then
+			plugins[pluginInfo.pluginName] = json.decode(pluginInfo.json)
+		end
+		plugins[pluginInfo.pluginName].publisherId = pluginInfo.publisherId
+	end
+	local _, sim_build_number = string.match( system.getInfo( "build" ), '(%d+)%.(%d+)' )
 
-		-- and record the url request
-		table.insert( self.requests, url )
+	local collectorParams = { 
+		pluginPlatform = self.platform,
+		plugins = plugins,
+		destinationDirectory = system.pathForFile("", system.PluginsDirectory),
+		build = sim_build_number,
+		extractLocation = system.pathForFile("", system.PluginsDirectory),
+	}
+	local result = params.pluginCollector().collect(collectorParams)
+	if type(result) == 'string' then
+        print("WARNING: there was an issue whilde downloading simulator plugin stub:\n" .. result)
 	end
+	native.setActivityIndicator( false )
+	onComplete()
 end
 
 function PluginSync:allDownloadsCompleted()
@@ -915,6 +861,11 @@ end
 local function loadMain( onComplete )
 
 	PluginSync:initialize( params.platform )
+	if not params.pluginCollector then
+		-- No way to download.
+		onComplete( )
+		return
+	end
 
 	local required_plugins = params.plugins
 	if ( not required_plugins ) or

platform/shared/Rtt_PlatformSimulator.cpp

@@ -698,7 +698,7 @@ PlatformSimulator::Start( const SimulatorOptions& options )
 	Runtime& runtime = fPlayer->GetRuntime();
 
 	// Currently, enterprise is required to have the Lua parser available
-	bool isLuaParserAvailable = options.isEnterprise;
+	bool isLuaParserAvailable = true;
 	runtime.SetProperty( Runtime::kIsLuaParserAvailable, isLuaParserAvailable );
 
  	// Read plugins from build.settings