[grilo-plugins] Revert "lua-factory: port grl-pocket.lua to the new lua system"
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] Revert "lua-factory: port grl-pocket.lua to the new lua system"
- Date: Mon, 21 Mar 2016 22:57:21 +0000 (UTC)
commit ccc3b1b05930d4aac4eb4dd2366242a66c4c8f46
Author: Victor Toso <me victortoso com>
Date: Tue Mar 8 23:28:07 2016 +0100
Revert "lua-factory: port grl-pocket.lua to the new lua system"
This reverts commit 368693b7a8599941d5bfe3b73f440e16ff115a24.
But keeps grl.fetch callback as function instead of string
https://bugzilla.gnome.org/show_bug.cgi?id=763046
src/lua-factory/sources/grl-pocket.lua | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/lua-factory/sources/grl-pocket.lua b/src/lua-factory/sources/grl-pocket.lua
index febc950..5bb707b 100644
--- a/src/lua-factory/sources/grl-pocket.lua
+++ b/src/lua-factory/sources/grl-pocket.lua
@@ -51,15 +51,15 @@ source = {
-- Source utils --
------------------
-function grl_source_browse(media, options, callback)
- local count = options.count
- local skip = options.skip
+function grl_source_browse(media_id)
+ local count = grl.get_options("count")
+ local skip = grl.get_options("skip")
+ local operation_id = grl.get_options('operation-id')
local url = string.format(POCKET_GET_URL, grl.goa_consumer_key(), grl.goa_access_token(), count, skip)
grl.debug ("Fetching URL: " .. url .. " (count: " .. count .. " skip: " .. skip .. ")")
- local userdata = {callback = callback, count = count}
- grl.fetch(url, pocket_fetch_cb, userdata)
+ grl.fetch(url, pocket_fetch_cb)
end
------------------------
@@ -77,11 +77,11 @@ function string.starts(String,Start)
end
-- return all the media found
-function pocket_fetch_cb(results, userdata)
- local count = userdata.count
+function pocket_fetch_cb(results)
+ local count = grl.get_options("count")
if not results then
- userdata.callback()
+ grl.callback ()
return
end
@@ -96,7 +96,7 @@ function pocket_fetch_cb(results, userdata)
local media = create_media(item)
if media then
count = count - 1
- userdata.callback(media, count)
+ grl.callback(media, count)
end
-- Bail out if we've given enough items
@@ -105,7 +105,7 @@ function pocket_fetch_cb(results, userdata)
end
end
- userdata.callback()
+ grl.callback()
end
-------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]