Skip to content

Added feature allowing use of Pimatic functions and variables in custom Player.Open commands #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added feature allowing use of Pimatic functions and variables in custom Player.Open commands #6

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e266509
Added feature allowing use of Pimatic functions and variables in cust…
SenTzu01 Feb 3, 2018
2f4021b
Bugfix: When info update object from kodi has an empty artist, @_setC…
SenTzu01 Apr 28, 2018
b014366
Corrected typo lenght -> length on line 277
SenTzu01 Feb 22, 2019
9487180
Bugfix on state
SenTzu01 Oct 25, 2019
a803c38
Removed predicates, added them to lib/predicates.coffee in Pimatic repo
SenTzu01 Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions kodi-plugin.coffee
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ module.exports = (env) ->
info.label
else ''
)
@_setCurrentArtist(if info.artist? then info.artist else "")
@_setCurrentArtist(if info.artist.lenght > 0 then info.artist[0] else "")
else
@_setCurrentArtist ''
@_setCurrentTitle ''
Expand Down Expand Up @@ -325,14 +325,14 @@ module.exports = (env) ->
return {
token: match
nextInput: input.substring(match.length)
actionHandler: new KodiExecuteOpenActionHandler(device, @config, state)
actionHandler: new KodiExecuteOpenActionHandler(@framework, device, @config, state)
}
else
return null

class KodiExecuteOpenActionHandler extends env.actions.ActionHandler

constructor: (@device, @config, @name) ->
constructor: (@framework, @device, @config, @name) ->
@debug = kodiPlugin.config.debug ? false
@base = commons.base @, "KodiExecuteOpenActionHandler"

Expand All @@ -345,8 +345,19 @@ module.exports = (env) ->
for command in @config.customOpenCommands
@base.debug "checking for (1): #{command.name} == #{@name}"
if command.name is @name
return @device.executeOpenCommand(
command.command).then( => __("executed %s", @device.name)

{variables, functions} = @framework.variableManager.getVariablesAndFunctions()
input = __('"%s"', command.command)
context = M.createParseContext(variables, functions)
match = null
m = M(input, context)
parseCommand = (m, tokens) => match = tokens
m.matchStringWithVars(parseCommand)

return @framework.variableManager.evaluateStringExpression(match).then( (cmd) =>
@device.executeOpenCommand(cmd).then( =>
__("executed %s on %s", command.name, @device.name)
)
)

class PlayingPredicateProvider extends env.predicates.PredicateProvider
Expand Down