Jellyfin.Plugin.SmartPlaylist/PluginConfiguration.cs

@@ -21,26 +21,26 @@ namespace Jellyfin.Plugin.SmartPlaylist {
               (define genre-list
                 (lambda nil
                   (let
-                    (_g (getitems *item* "Genres"))
+                    (_g (getitems item "Genres"))
                     (if (null _g)
                       nil
                       (car _g)))))
               (define is-favorite
                 (lambda nil
-                  (invoke *item* "IsFavoriteOrLiked" (list *user*))))
+                  (invoke item "IsFavoriteOrLiked" (list user))))
               (define is-type
                 (lambda (x)
                   (and
-                    (haskeys *item* "GetClientTypeName")
+                    (haskeys item "GetClientTypeName")
-                    (invoke (invoke *item* "GetClientTypeName" nil) "Equals" (list x)))))
+                    (invoke (invoke item "GetClientTypeName" nil) "Equals" (list x)))))
               (define name-contains
                 (lambda (x)
-                  (invoke (lower (car (getitems *item* "Name"))) "Contains" (list (lower x)))))
+                  (invoke (lower (car (getitems item "Name"))) "Contains" (list (lower x)))))
               (define is-favourite is-favorite)
               (define all-genres (lambda (want have) (all (lambda (x) (is-genre x have)) want)))
               (define any-genres (lambda (want have) (any (lambda (x) (is-genre x have)) want)))
               (define get-name (lambda (x) (car (getitems x "Name"))))
-              (define find-parent (lambda (typename) (invoke-generic *item* "FindParent" nil (list typename))))
+              (define find-parent (lambda (typename) (invoke-generic item "FindParent" nil (list typename))))
               (define find-artist (lambda nil (find-parent "MediaBrowser.Controller.Entities.Audio.MusicArtist, MediaBrowser.Controller"))))
             """;
             store = new Store(new SmartPlaylistFileSystem(Plugin.Instance.ServerApplicationPaths));

Jellyfin.Plugin.SmartPlaylist/ScheduledTasks/GeneratePlaylist.cs

@@ -94,9 +94,11 @@ namespace Jellyfin.Plugin.SmartPlaylist.ScheduledTasks {
             return playlistGuid;
         }
 
-        private Executor SetupExecutor() {
+        private IEnumerable<Guid> FilterPlaylistItems(IEnumerable<BaseItem> items, User user, SmartPlaylistDto smartPlaylist) {
-            var env = new DefaultEnvironment();
+            List<BaseItem> results = new List<BaseItem>();
-            var executor = new Executor(env);
+            Expression expression = new Parser(StringTokenStream.generate(smartPlaylist.Program)).parse(); // parse here, so that we don't repeat the work for each item
+            Executor executor = new Executor(new DefaultEnvironment());
+
             executor.builtins["logd"] = (x) => {
                 _logger.LogDebug(((Lisp.String)x.First()).Value(), x.Skip(1).ToArray());
                 return Lisp_Boolean.TRUE;
@@ -113,22 +115,15 @@ namespace Jellyfin.Plugin.SmartPlaylist.ScheduledTasks {
                 _logger.LogError(((Lisp.String)x.First()).Value(), x.Skip(1).ToArray());
                 return Lisp_Boolean.TRUE;
             };
+
+            executor.environment.Set("user", Lisp_Object.FromBase(user));
             if (Plugin.Instance is not null) {
                 executor.eval(Plugin.Instance.Configuration.InitialProgram);
             } else {
                 throw new ApplicationException("Plugin Instance is not yet initialized");
             }
-            return executor;
-        }
-
-        private IEnumerable<Guid> FilterPlaylistItems(IEnumerable<BaseItem> items, User user, SmartPlaylistDto smartPlaylist) {
-            List<BaseItem> results = new List<BaseItem>();
-            Expression expression = new Parser(StringTokenStream.generate(smartPlaylist.Program)).parse(); // parse here, so that we don't repeat the work for each item
-            Executor executor = SetupExecutor();
-
-            executor.environment.Set("*user*", Lisp_Object.FromBase(user));
             foreach (var i in items) {
-                executor.environment.Set("*item*", Lisp_Object.FromBase(i));
+                executor.environment.Set("item", Lisp_Object.FromBase(i));
                 var r = executor.eval(expression);
                 _logger.LogTrace("Item {0} evaluated to {1}", i, r.ToString());
                 if ((r is not Lisp_Boolean r_bool) || (r_bool.Value())) {
@@ -136,9 +131,9 @@ namespace Jellyfin.Plugin.SmartPlaylist.ScheduledTasks {
                     results.Add(i);
                 }
             }
-            executor = SetupExecutor();
+            executor = new Executor(new DefaultEnvironment());
-            executor.environment.Set("*user*", Lisp_Object.FromBase(user));
+            executor.environment.Set("user", Lisp_Object.FromBase(user));
-            executor.environment.Set("*items*", Lisp_Object.FromBase(results));
+            executor.environment.Set("items", Lisp_Object.FromBase(results));
             results = new List<BaseItem>();
             var sort_result = executor.eval(smartPlaylist.SortProgram);
             if (sort_result is Cons sorted_items) {

Tests/Tests.cs

@@ -1,6 +1,5 @@
 using Lisp_Boolean = Jellyfin.Plugin.SmartPlaylist.Lisp.Boolean;
 using Lisp_Object = Jellyfin.Plugin.SmartPlaylist.Lisp.Object;
-using Lisp_Integer = Jellyfin.Plugin.SmartPlaylist.Lisp.Integer;
 using Jellyfin.Plugin.SmartPlaylist.Lisp;
 using Jellyfin.Plugin.SmartPlaylist.Lisp.Compiler;
 
@@ -231,13 +230,6 @@ namespace Tests
             Assert.Equal("\"System.String\"", string.Format("{0}", r));
         }
 
-        [Fact]
-        public static void GlobalVariableTest() {
-            Executor e = new Executor();
-            e.environment.Set("*o*", new Lisp_Integer(5));
-            Assert.Equal("10", e.eval("(* *o* 2)").ToString());
-        }
-
         [Fact]
         public static void DefaultEnvironmentTest() {
             Executor e = new Executor(new DefaultEnvironment());