From 87a2fe2d3479ace74d3d11439bd6ad5e9f184e80 Mon Sep 17 00:00:00 2001
From: mitteneer <swebbguy@gmail.com>
Date: Mon, 21 Apr 2025 12:23:20 -0400
Subject: [PATCH] Complete preliminary find and replace rules

Tested by replacing AJR with John Van Derwood. Need to test on albums and artists, as well as matching on one piece of metadata, and replacing another
---
 src/app/jobs/process_scrobbles.zig |  9 +++++---
 src/app/views/rules/index.zmpl     |  2 +-
 src/apply_rule.zig                 | 33 +++++++++++++++++++++++++-----
 src/types.zig                      | 12 +++++------
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/app/jobs/process_scrobbles.zig b/src/app/jobs/process_scrobbles.zig
index bbfc9d4..06d7365 100644
--- a/src/app/jobs/process_scrobbles.zig
+++ b/src/app/jobs/process_scrobbles.zig
@@ -3,6 +3,9 @@ const jetzig = @import("jetzig");
 const jetquery = @import("jetzig").jetquery;
 const Scrobble = @import("../../types.zig").LastFMScrobble;
 const lastfm = @import("../../types.zig").LastFM;
+//const Rules = @import("../../types.zig").Rules;
+const Data = @import("../../types.zig");
+const rules = @import("../../apply_rule.zig");
 
 // The `run` function for a job is invoked every time the job is processed by a queue worker
 // (or by the Jetzig server if the job is processed in-line).
@@ -18,14 +21,14 @@ pub fn run(allocator: std.mem.Allocator, params: *jetzig.data.Value, env: jetzig
     const file = try std.fs.cwd().openFile("rules.json", .{ .mode = .read_only });
     const file_content = try file.readToEndAlloc(allocator, 16_000_000);
 
-    const rules = try std.json.parseFromSliceLeaky(Rules, allocator, file_content, .{});
+    const rule_list = try std.json.parseFromSliceLeaky(Data.Rules, allocator, file_content, .{});
 
     if (params.getT(.array, "scrobbles")) |scrobbles| {
         for (scrobbles.items()) |item| {
             //const fixed_date: u32 = @as(u32, item.getT(.integer, "date").?);
-            const scrobble: Scrobble = .{ .track = item.getT(.string, "track").?, .artist = item.getT(.string, "artist").?, .album = item.getT(.string, "album") orelse "", .date = @as(u64, @bitCast(@as(i64, @truncate(item.getT(.integer, "date").? * 1000)))) };
+            const pre_scrobble: Scrobble = .{ .track = item.getT(.string, "track").?, .artist = item.getT(.string, "artist").?, .album = item.getT(.string, "album") orelse "", .date = @as(u64, @bitCast(@as(i64, @truncate(item.getT(.integer, "date").? * 1000)))) };
 
-            for (rules) |rule| {}
+            const scrobble = rules.applyScrobbleRule(pre_scrobble, rule_list);
 
             // Make hashes
             //const album_hash = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(scrobble.album)));
diff --git a/src/app/views/rules/index.zmpl b/src/app/views/rules/index.zmpl
index 4d15188..b9a1b17 100644
--- a/src/app/views/rules/index.zmpl
+++ b/src/app/views/rules/index.zmpl
@@ -21,7 +21,7 @@ If
 <select name="match-cond" id="match-cond">
 <option value="is">is</option>
 <option value="contains">contains</option>
-<option value"matches">matches regex</option>
+<option value="matches">matches regex</option>
 </select>
 <input type="text" name="match-txt" id="match-txt">
 <button type="button" onclick="condAdd()">
diff --git a/src/apply_rule.zig b/src/apply_rule.zig
index 871c996..769d062 100644
--- a/src/apply_rule.zig
+++ b/src/apply_rule.zig
@@ -1,11 +1,34 @@
-const Scrobble = @import("types").LastFMScrobble;
-const Rules = @import("types").Rules;
+const std = @import("std");
+const Scrobble = @import("./types.zig").LastFMScrobble;
+const Rules = @import("./types.zig").Rules;
 
-pub fn applyRule(scrobble: Scrobble, rules: Rules) !Scrobble {
+pub fn applyScrobbleRule(scrobble: Scrobble, rules: Rules) Scrobble {
+    var match_found: bool = true;
     var output_scrobble: Scrobble = scrobble;
-    for (rules) |rule| {
+    for (rules.rules) |rule| {
         for (rule.conditionals) |cond| {
-            switch (cond.match_cond) {}
+            switch (cond.match_cond) {
+                .is => switch (cond.match_on) {
+                    inline else => |on| match_found = match_found and std.mem.eql(u8, @field(scrobble, @tagName(on)), cond.match_txt),
+                },
+                .contains => switch (cond.match_on) {
+                    inline else => |on| match_found = match_found and (std.mem.count(u8, @field(scrobble, @tagName(on)), cond.match_txt) > 0),
+                },
+            }
+        }
+        if (match_found) {
+            for (rule.actions) |act| {
+                switch (act.action) {
+                    .add => {},
+                    .replace => switch (act.action_on) {
+                        inline else => |on| @field(output_scrobble, @tagName(on)) = act.action_txt,
+                    },
+                }
+            }
         }
     }
+
+    return output_scrobble;
 }
+
+//pub fn applyAlbumRule() !Album {}
diff --git a/src/types.zig b/src/types.zig
index 00e063c..61b0e88 100644
--- a/src/types.zig
+++ b/src/types.zig
@@ -38,23 +38,23 @@ pub const SpotifyScrobble = struct {
 const Rule = struct {
     name: []const u8,
     conditionals: []struct {
-        match_on: MatchOn,
+        match_on: ScrobbleFields,
         match_cond: enum { is, contains },
         match_txt: []const u8,
     },
     actions: []struct {
-        action: []const u8,
-        action_on: enum { is, contains },
+        action: enum { replace, add },
+        action_on: ScrobbleFields,
         action_txt: []const u8,
     },
 };
 
-const Rules = struct {
+pub const Rules = struct {
     rules: []const Rule,
 };
 
-const MatchOn = enum {
+pub const ScrobbleFields = enum {
     artist,
     album,
-    song,
+    track,
 };