From 891dbd791af20348987c4076ee2c943d1df83bb4 Mon Sep 17 00:00:00 2001
From: Tyler Hallada <tyler@hallada.net>
Date: Sun, 6 Feb 2022 23:11:03 -0500
Subject: [PATCH] Limit cells in mod files to Skyrim worldspace cells

---
 src/main.rs            | 3 ++-
 src/models/game_mod.rs | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 93f156f..0c61dc5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -256,7 +256,8 @@ pub async fn main() -> Result<()> {
         let page_size = 20;
         let mut last_id = None;
         loop {
-            let mods = game_mod::batched_get_with_cells(&pool, page_size, last_id).await?;
+            let mods = game_mod::batched_get_with_cells(&pool, page_size, last_id, "Skyrim.esm", 1)
+                .await?;
             if mods.is_empty() {
                 break;
             }
diff --git a/src/models/game_mod.rs b/src/models/game_mod.rs
index d4f1096..6ca1320 100644
--- a/src/models/game_mod.rs
+++ b/src/models/game_mod.rs
@@ -355,6 +355,8 @@ pub async fn batched_get_with_cells(
     pool: &sqlx::Pool<sqlx::Postgres>,
     page_size: i64,
     last_id: Option<i32>,
+    master: &str,
+    world_id: i32,
 ) -> Result<Vec<ModWithCells>> {
     let last_id = last_id.unwrap_or(0);
     sqlx::query_as!(
@@ -365,12 +367,14 @@ pub async fn batched_get_with_cells(
         FROM mods
         LEFT OUTER JOIN plugin_cells ON plugin_cells.mod_id = mods.id
         LEFT OUTER JOIN cells ON cells.id = plugin_cells.cell_id
-        WHERE mods.id > $2
+        WHERE mods.id > $2 AND cells.master = $3 AND cells.world_id = $4
         GROUP BY mods.id
         ORDER BY mods.id ASC
         LIMIT $1",
         page_size,
         last_id,
+        master,
+        world_id
     )
     .fetch_all(pool)
     .await