Merge pull request #697 from jacebrowning/disable-animation-update

Preserve template config when start/stop is passed
jacebrowning · Feb 23, 2022 · 6a8527b · 6a8527b
2 parents 5038eb0 + 5df2c4b
commit 6a8527b
Show file tree

Hide file tree

Showing 139 changed files with 285 additions and 301 deletions.
diff --git a/app/models/template.py b/app/models/template.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 
 import aiopath
-from datafiles import datafile, field
+from datafiles import datafile, field, hooks
 from furl import furl
 from sanic import Request
 from sanic.log import logger
@@ -15,19 +15,8 @@
 from .overlay import Overlay
 from .text import Text
 
-DEFAULT_TEXT = [
-    Text(start=0.0, stop=1.0),
-    Text(start=0.0, stop=1.0, anchor_x=0.0, anchor_y=0.8),
-]
-ANIMATED_TEXT = [
-    Text(start=0.2, stop=1.0),
-    Text(start=0.6, stop=1.0, anchor_x=0.0, anchor_y=0.8),
-]
-
-DEFAULT_EXAMPLE = [
-    "Top Line",
-    "Bottom Line",
-]
+DEFAULT_TEXT = [Text(), Text(anchor_x=0.0, anchor_y=0.8)]
+DEFAULT_EXAMPLE = ["Top Line", "Bottom Line"]
 
 
 @datafile("../../templates/{self.id}/config.yml", defaults=True)
@@ -316,8 +305,6 @@ async def _embed(
 
     @property
     def animated(self):
-        if self.text == DEFAULT_TEXT or self.text == ANIMATED_TEXT:
-            return False
         return any(text.animated for text in self.text)
 
     def animate(self, start: str = "0.2,0.6", stop: str = "1.0,1.0"):
@@ -328,13 +315,13 @@ def animate(self, start: str = "0.2,0.6", stop: str = "1.0,1.0"):
             logger.error(f"Invalid text animation: {start=} {stop=}")
             return
 
-        with suppress(IndexError):
-            for index, value in enumerate(starts):
-                self.text[index].start = value
-
-        with suppress(IndexError):
-            for index, value in enumerate(stops):
-                self.text[index].stop = value
+        with hooks.disabled():
+            with suppress(IndexError):
+                for index, value in enumerate(starts):
+                    self.text[index].start = value
+            with suppress(IndexError):
+                for index, value in enumerate(stops):
+                    self.text[index].stop = value
 
         if starts or stops:
             logger.info(f"Updated {self} with: {starts=} {stops=}")

diff --git a/app/tests/test_models_template.py b/app/tests/test_models_template.py
@@ -34,10 +34,7 @@ def it_only_includes_default_style_with_custom_overlay(
 
     def describe_text():
         def it_defaults_to_two_lines(expect, template):
-            expect(template.text) == [
-                Text(start=0.2),
-                Text(start=0.6, anchor_x=0.0, anchor_y=0.8),
-            ]
+            expect(template.text) == [Text(), Text(anchor_x=0.0, anchor_y=0.8)]
 
     def describe_image():
         def it_has_generic_extension_when_absent(expect, template):

diff --git a/templates/_error/config.yml b/templates/_error/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 0.8
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 0.8
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - Top Line

diff --git a/templates/_test/config.yml b/templates/_test/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - Top Line

diff --git a/templates/aag/config.yml b/templates/aag/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - ''

diff --git a/templates/ackbar/config.yml b/templates/ackbar/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - ''

diff --git a/templates/afraid/config.yml b/templates/afraid/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - i don't know what this meme is for

diff --git a/templates/agnes/config.yml b/templates/agnes/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - ''

diff --git a/templates/aint-got-time/config.yml b/templates/aint-got-time/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - memes?

diff --git a/templates/ams/config.yml b/templates/ams/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - when you're watching a movie

diff --git a/templates/ants/config.yml b/templates/ants/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - do you want ants?

diff --git a/templates/apcr/config.yml b/templates/apcr/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - I supported my sister's abortion

diff --git a/templates/atis/config.yml b/templates/atis/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - and then i said

diff --git a/templates/away/config.yml b/templates/away/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - life...

diff --git a/templates/awesome-awkward/config.yml b/templates/awesome-awkward/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - first day at new job

diff --git a/templates/awesome/config.yml b/templates/awesome/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - say a word wrong

diff --git a/templates/awkward-awesome/config.yml b/templates/awkward-awesome/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - trip guy on the street

diff --git a/templates/awkward/config.yml b/templates/awkward/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - start telling joke

diff --git a/templates/bad/config.yml b/templates/bad/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - your meme is bad

diff --git a/templates/badchoice/config.yml b/templates/badchoice/config.yml
@@ -9,7 +9,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.2
+    start: 0.0
     stop: 1.0
   - style: upper
     color: white
@@ -19,7 +19,7 @@ text:
     angle: 0.0
     scale_x: 1.0
     scale_y: 0.2
-    start: 0.6
+    start: 0.0
     stop: 1.0
 example:
   - milk