diff --git a/src/paperpi/plugins/newyorker/README.md b/src/paperpi/plugins/newyorker/README.md index 04bfd80..ce814f7 100644 --- a/src/paperpi/plugins/newyorker/README.md +++ b/src/paperpi/plugins/newyorker/README.md @@ -45,7 +45,7 @@ Try it without a screen: `uv run paperpi render newyorker` (sample cartoon), or ## The cartoons -The cartoons and captions belong to The New Yorker and their cartoonists (© Condé Nast). PaperPi only downloads them to show on your own screen and does not share them. The sample cartoon, [`sample/island.png`](sample/island.png), its caption and its cartoonist ("Rosa Paperwhite") are made up: the drawing was made for this plugin with a short Pillow script (Pillow is the picture library PaperPi uses) and is under PaperPi's licence. +The cartoons and captions belong to The New Yorker and their cartoonists (© Condé Nast). PaperPi only downloads them to show on your own screen and does not share them. The sample cartoon, [`sample/therapist.png`](sample/therapist.png), its caption and its cartoonist ("Chatwell Gilbert Pennington Thurston (C.G.P.T.)") are made up: the drawing was made for PaperPi with an AI image tool and is under PaperPi's licence. It is stored in 16 shades of gray (the most a PaperPi screen shows), which keeps the file small. ## Sample images diff --git a/src/paperpi/plugins/newyorker/__init__.py b/src/paperpi/plugins/newyorker/__init__.py index 4fc2af5..e398247 100644 --- a/src/paperpi/plugins/newyorker/__init__.py +++ b/src/paperpi/plugins/newyorker/__init__.py @@ -44,7 +44,7 @@ PAGE_BYTES = PICTURE_BYTES = 2_000_000 FEED_SECONDS, PICTURE_SECONDS, PAGE_SECONDS = 20, 15, 10 NEW_YORK = "America/New_York" -SAMPLE = Path(__file__).parent / "sample" / "island.png" +SAMPLE = Path(__file__).parent / "sample" / "therapist.png" class Settings(PluginSettings): @@ -354,11 +354,12 @@ def draw(cartoon: Cartoon, context: Context) -> dict: layouts=LAYOUTS, fetch=fetch, draw=draw, - # A made-up cartoon, caption and cartoonist, drawn for PaperPi: not a New Yorker cartoon. + # A made-up cartoon, caption and cartoonist, made for PaperPi: not a New Yorker cartoon. sample=Cartoon( Texts( - "“Finally, a place where the news arrives only once a week.”", - "Cartoon by Rosa Paperwhite", + "“You keep saying you want to be more spontaneous, but have you considered that " + "spontaneity might be the problem?”", + "Cartoon by Chatwell Gilbert Pennington Thurston (C.G.P.T.)", "Monday, October 5", ), SAMPLE, diff --git a/src/paperpi/plugins/newyorker/sample/island.png b/src/paperpi/plugins/newyorker/sample/island.png deleted file mode 100644 index b51500c..0000000 Binary files a/src/paperpi/plugins/newyorker/sample/island.png and /dev/null differ diff --git a/src/paperpi/plugins/newyorker/sample/therapist.png b/src/paperpi/plugins/newyorker/sample/therapist.png new file mode 100644 index 0000000..9845d5d Binary files /dev/null and b/src/paperpi/plugins/newyorker/sample/therapist.png differ diff --git a/tests/images/newyorker-comic_caption-5in65.png b/tests/images/newyorker-comic_caption-5in65.png index 13a43c7..81943e3 100644 Binary files a/tests/images/newyorker-comic_caption-5in65.png and b/tests/images/newyorker-comic_caption-5in65.png differ diff --git a/tests/images/newyorker-comic_caption-7in5.png b/tests/images/newyorker-comic_caption-7in5.png index d9a5248..e7d5e18 100644 Binary files a/tests/images/newyorker-comic_caption-7in5.png and b/tests/images/newyorker-comic_caption-7in5.png differ diff --git a/tests/images/newyorker-comic_caption-9in7.png b/tests/images/newyorker-comic_caption-9in7.png index 2b188f4..22f9b42 100644 Binary files a/tests/images/newyorker-comic_caption-9in7.png and b/tests/images/newyorker-comic_caption-9in7.png differ diff --git a/tests/images/newyorker-comic_caption_date-5in65.png b/tests/images/newyorker-comic_caption_date-5in65.png index bdb4d51..1d264bb 100644 Binary files a/tests/images/newyorker-comic_caption_date-5in65.png and b/tests/images/newyorker-comic_caption_date-5in65.png differ diff --git a/tests/images/newyorker-comic_caption_date-7in5.png b/tests/images/newyorker-comic_caption_date-7in5.png index 97ef078..9ceab94 100644 Binary files a/tests/images/newyorker-comic_caption_date-7in5.png and b/tests/images/newyorker-comic_caption_date-7in5.png differ diff --git a/tests/images/newyorker-comic_caption_date-9in7.png b/tests/images/newyorker-comic_caption_date-9in7.png index a4fa892..3934baa 100644 Binary files a/tests/images/newyorker-comic_caption_date-9in7.png and b/tests/images/newyorker-comic_caption_date-9in7.png differ diff --git a/tests/images/newyorker-comic_only-5in65.png b/tests/images/newyorker-comic_only-5in65.png index 2085611..c3e6741 100644 Binary files a/tests/images/newyorker-comic_only-5in65.png and b/tests/images/newyorker-comic_only-5in65.png differ diff --git a/tests/images/newyorker-comic_only-7in5.png b/tests/images/newyorker-comic_only-7in5.png index a045e89..5839fd2 100644 Binary files a/tests/images/newyorker-comic_only-7in5.png and b/tests/images/newyorker-comic_only-7in5.png differ diff --git a/tests/images/newyorker-comic_only-9in7.png b/tests/images/newyorker-comic_only-9in7.png index bcfb1f5..ac08e7b 100644 Binary files a/tests/images/newyorker-comic_only-9in7.png and b/tests/images/newyorker-comic_only-9in7.png differ diff --git a/tests/test_newyorker.py b/tests/test_newyorker.py index 8073076..e63af37 100644 --- a/tests/test_newyorker.py +++ b/tests/test_newyorker.py @@ -442,7 +442,7 @@ def test_hostile_id_keeps_files_in_storage(tmp_path, monkeypatch, pick): def test_draw_gives_only_the_layouts_blocks(tmp_path, layout, blocks): values = newyorker.draw(PLUGIN.sample, context(tmp_path, layout)) assert set(values) == blocks - assert values["comic"].size == (800, 800) + assert values["comic"].size == (1000, 789) assert values.get("date", "Monday, October 5") == "Monday, October 5"