avoid hardcoding pzprxs URLs in cspuz_rs_puzzles

Author: semiexp

cspuz_rs/src/serializer.rs

@@ -1767,13 +1767,44 @@ where
         .map(|body| prefix + puzzle_kind + "/" + &body)
 }
 
+pub fn problem_to_url_with_context_pzprxs<T, C>(
+    combinator: C,
+    puzzle_kind: &str,
+    problem: T,
+    ctx: &Context,
+) -> Option<String>
+where
+    C: Combinator<T>,
+{
+    problem_to_url_with_context_and_site(
+        combinator,
+        puzzle_kind,
+        "https://pzprxs.vercel.app/p?",
+        problem,
+        ctx,
+    )
+}
+
 pub fn problem_to_url<T, C>(combinator: C, puzzle_kind: &str, problem: T) -> Option<String>
 where
     C: Combinator<T>,
 {
     problem_to_url_with_context(combinator, puzzle_kind, problem, &Context::new())
 }
 
+pub fn problem_to_url_pzprxs<T, C>(combinator: C, puzzle_kind: &str, problem: T) -> Option<String>
+where
+    C: Combinator<T>,
+{
+    problem_to_url_with_context_and_site(
+        combinator,
+        puzzle_kind,
+        "https://pzprxs.vercel.app/p?",
+        problem,
+        &Context::new(),
+    )
+}
+
 pub fn url_to_puzzle_kind(serialized: &str) -> Option<String> {
     let serialized = serialized
         .strip_prefix("http://")

cspuz_rs_puzzles/src/puzzles/archipelago.rs

@@ -1,8 +1,8 @@
 use crate::util;
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context, Dict, Grid,
-    HexInt, Optionalize, Spaces,
+    problem_to_url_pzprxs, url_to_problem, Choice, Combinator, Dict, Grid, HexInt, Optionalize,
+    Spaces,
 };
 use cspuz_rs::solver::{Solver, TRUE};
 use std::collections::VecDeque;
@@ -344,15 +344,7 @@ fn combinator() -> impl Combinator<Problem> {
 }
 
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
-    let height = problem.len();
-    let width = problem[0].len();
-    problem_to_url_with_context_and_site(
-        combinator(),
-        "archipelago",
-        "https://pzprxs.vercel.app/p?",
-        problem.clone(),
-        &Context::sized(height, width),
-    )
+    problem_to_url_pzprxs(combinator(), "archipelago", problem.clone())
 }
 
 pub fn deserialize_problem(url: &str) -> Option<Problem> {

cspuz_rs_puzzles/src/puzzles/balloon.rs

@@ -1,7 +1,7 @@
 use crate::util;
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context,
+    problem_to_url_with_context_pzprxs, url_to_problem, Choice, Combinator, Context,
     ContextBasedGrid, Dict, HexInt, MultiDigit, Optionalize, PrefixAndSuffix, Size, Spaces, Tuple2,
 };
 use cspuz_rs::solver::{count_true, IntVarArray1D, Solver};
@@ -189,10 +189,9 @@ fn combinator() -> impl Combinator<Problem> {
 
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
     let (h, w) = util::infer_shape(&problem.0);
-    problem_to_url_with_context_and_site(
+    problem_to_url_with_context_pzprxs(
         combinator(),
         "balloon",
-        "https://pzprxs.vercel.app/p?",
         problem.clone(),
         &Context::sized(h, w),
     )

cspuz_rs_puzzles/src/puzzles/city_space.rs

@@ -1,8 +1,8 @@
 use crate::util;
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context, Dict, Grid,
-    HexInt, Optionalize, Spaces,
+    problem_to_url_pzprxs, url_to_problem, Choice, Combinator, Dict, Grid, HexInt, Optionalize,
+    Spaces,
 };
 use cspuz_rs::solver::{Solver, FALSE, TRUE};
 
@@ -82,15 +82,7 @@ fn combinator() -> impl Combinator<Problem> {
 }
 
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
-    let height = problem.len();
-    let width = problem[0].len();
-    problem_to_url_with_context_and_site(
-        combinator(),
-        "cityspace",
-        "https://pzprxs.vercel.app/p?",
-        problem.clone(),
-        &Context::sized(height, width),
-    )
+    problem_to_url_pzprxs(combinator(), "cityspace", problem.clone())
 }
 
 pub fn deserialize_problem(url: &str) -> Option<Problem> {

cspuz_rs_puzzles/src/puzzles/coral.rs

@@ -1,6 +1,6 @@
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Combinator, Context, HexInt,
+    problem_to_url_with_context_pzprxs, url_to_problem, Combinator, Context, HexInt,
     OutsideSequences, Size,
 };
 use cspuz_rs::solver::{any, count_true, BoolVarArray1D, Solver, TRUE};
@@ -81,10 +81,9 @@ fn combinator() -> impl Combinator<Problem> {
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
     let height = problem.1.len();
     let width = problem.0.len();
-    problem_to_url_with_context_and_site(
+    problem_to_url_with_context_pzprxs(
         combinator(),
         "coral",
-        "https://pzprxs.vercel.app/p?",
         problem.clone(),
         &Context::sized(height, width),
     )

cspuz_rs_puzzles/src/puzzles/energywalk.rs

@@ -2,7 +2,7 @@ use crate::puzzles::walk_common::{merge_walk_answers, walk_not_passing_colored_c
 use crate::util;
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context,
+    problem_to_url_with_context_pzprxs, url_to_problem, Choice, Combinator, Context,
     ContextBasedGrid, Dict, HexInt, Map, MultiDigit, Optionalize, Size, Spaces, Tuple2,
 };
 use cspuz_rs::solver::{count_true, BoolExpr, Solver};
@@ -171,10 +171,9 @@ fn combinator() -> impl Combinator<Problem> {
 
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
     let (h, w) = util::infer_shape(&problem.0);
-    problem_to_url_with_context_and_site(
+    problem_to_url_with_context_pzprxs(
         combinator(),
         "energywalk",
-        "https://pzprxs.vercel.app/p?",
         problem.clone(),
         &Context::sized(h, w),
     )

cspuz_rs_puzzles/src/puzzles/firewalk.rs

@@ -3,7 +3,7 @@ use crate::util;
 use cspuz_rs::complex_constraints::walk_line_size;
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context,
+    problem_to_url_with_context_pzprxs, url_to_problem, Choice, Combinator, Context,
     ContextBasedGrid, HexInt, Map, MultiDigit, Optionalize, Size, Spaces, Tuple2,
 };
 use cspuz_rs::solver::{Solver, FALSE, TRUE};
@@ -204,10 +204,9 @@ fn combinator() -> impl Combinator<Problem> {
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
     let height = problem.0.len();
     let width = problem.0[0].len();
-    problem_to_url_with_context_and_site(
+    problem_to_url_with_context_pzprxs(
         combinator(),
         "firewalk",
-        "https://pzprxs.vercel.app/p?",
         problem.clone(),
         &Context::sized(height, width),
     )

cspuz_rs_puzzles/src/puzzles/forestwalk.rs

@@ -3,7 +3,7 @@ use crate::util;
 use cspuz_rs::complex_constraints::walk_line_size;
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context,
+    problem_to_url_with_context_pzprxs, url_to_problem, Choice, Combinator, Context,
     ContextBasedGrid, Dict, HexInt, Map, MultiDigit, Optionalize, Size, Spaces, Tuple2,
 };
 use cspuz_rs::solver::Solver;
@@ -81,10 +81,9 @@ fn combinator() -> impl Combinator<Problem> {
 
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
     let (h, w) = util::infer_shape(&problem.0);
-    problem_to_url_with_context_and_site(
+    problem_to_url_with_context_pzprxs(
         combinator(),
         "forestwalk",
-        "https://pzprxs.vercel.app/p?",
         problem.clone(),
         &Context::sized(h, w),
     )

cspuz_rs_puzzles/src/puzzles/japanese_sums.rs

@@ -1,6 +1,6 @@
 use cspuz_rs::complex_constraints::japanese;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context,
+    problem_to_url_with_context_pzprxs, url_to_problem, Choice, Combinator, Context,
     ContextBasedGrid, DecInt, Dict, HexInt, Optionalize, OutsideSequences, PrefixAndSuffix, Size,
     Spaces, Tuple3,
 };
@@ -82,10 +82,9 @@ fn combinator() -> impl Combinator<Problem> {
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
     let height = problem.1 .1.len();
     let width = problem.1 .0.len();
-    problem_to_url_with_context_and_site(
+    problem_to_url_with_context_pzprxs(
         combinator(),
         "japanesesums",
-        "https://pzprxs.vercel.app/p?",
         problem.clone(),
         &Context::sized(height, width),
     )

cspuz_rs_puzzles/src/puzzles/keywest.rs

@@ -1,8 +1,7 @@
 use crate::util;
 use cspuz_rs::graph;
 use cspuz_rs::serializer::{
-    problem_to_url_with_context_and_site, url_to_problem, Choice, Combinator, Context, Dict, Grid,
-    NumSpaces, Spaces,
+    problem_to_url_pzprxs, url_to_problem, Choice, Combinator, Dict, Grid, NumSpaces, Spaces,
 };
 use cspuz_rs::solver::Solver;
 
@@ -61,14 +60,7 @@ fn combinator() -> impl Combinator<Problem> {
 }
 
 pub fn serialize_problem(problem: &Problem) -> Option<String> {
-    let (h, w) = util::infer_shape(&problem);
-    problem_to_url_with_context_and_site(
-        combinator(),
-        "keywest",
-        "https://pzprxs.vercel.app/p?",
-        problem.clone(),
-        &Context::sized(h, w),
-    )
+    problem_to_url_pzprxs(combinator(), "keywest", problem.clone())
 }
 
 pub fn deserialize_problem(url: &str) -> Option<Problem> {