wordpress-markdown-blog-loader 1.7.3__tar.gz → 1.7.4__tar.gz

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wordpress-markdown-blog-loader
-Version: 1.7.3
+Version: 1.7.4
 Summary: load markdown blogs into wordpress
 Author-email: Mark van Holsteijn <markvanholsteijn@binx.io>
 License: APL2
@@ -119,7 +119,7 @@ alias wp-md='docker run \
  -v $HOME:$HOME \
  -v $HOME/.wordpress.ini:/root/.wordpress.ini \
  -v $PWD:/$PWD \
- -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.7.3
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.7.4
 ```'
 Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/README.md

@@ -68,7 +68,7 @@ alias wp-md='docker run \
  -v $HOME:$HOME \
  -v $HOME/.wordpress.ini:/root/.wordpress.ini \
  -v $PWD:/$PWD \
- -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.7.3
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.7.4
 ```'
 Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wordpress-markdown-blog-loader"
-version = "1.7.3"
+version = "1.7.4"
 authors = [{name = "Mark van Holsteijn", email = "markvanholsteijn@binx.io"}]
 license = {text = "APL2"}
 description = "load markdown blogs into wordpress"

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/src/wordpress_markdown_blog_loader/api.py

@@ -1,12 +1,11 @@
 import configparser
-import json
 import logging
 import mimetypes
 import os
 import re
-import sys
+import subprocess
 from datetime import datetime
-from functools import cache
+from functools import cache, lru_cache
 from os.path import expanduser
 from pathlib import Path
 from typing import List, Dict, Iterator
@@ -26,6 +25,21 @@ def get_default_host() -> Optional[str]:
     return config.defaults().get("host")
 
 
+@lru_cache
+def get_from_1password(password: str) -> str:
+    """
+    returns the password from 1password vault, if the password has the op:// prefix.
+    """
+    if not password.startswith("op://"):
+        return password
+    result = subprocess.run(
+        ["op", "read", password],
+        check=True,
+        capture_output=True,
+    )
+    return result.stdout.decode("utf-8").rstrip("\n")
+
+
 def get_password(host: str) -> Optional[str]:
     """
     Returns a password from the environment variable for the specified host.
@@ -46,10 +60,10 @@ def get_password(host: str) -> Optional[str]:
     'default_password'
     """
     h = re.sub(r"[^a-zA-Z-0-9]", "_", host).upper()
-    if result := os.getenv(f"WP_APP_PASSWORD_{h}"):
-        return result
+    if result := os.getenv(f"WP_APP_PASSWORD_{h}", os.getenv("WP_APP_PASSWORD")):
+        return get_from_1password(result)
 
-    return os.getenv("WP_APP_PASSWORD")
+    return None
 
 
 class WordpressEndpoint:
@@ -290,7 +304,7 @@ class Wordpress(object):
         self._media: List[Medium] = {}
         self.headers = {
             "accept": "application/json",
-            "User-Agent": "wordpress-blog-uploader/" + self.app_version
+            "User-Agent": "wordpress-blog-uploader/" + self.app_version,
         }
         self.session = requests.Session()
 
@@ -436,7 +450,7 @@ class Wordpress(object):
     @property
     @cache
     def industries_taxonomy_by_id(self) -> Dict[str, int]:
-        return  {id: slug for slug, id in self.industries_taxonomy.items()}
+        return {id: slug for slug, id in self.industries_taxonomy.items()}
 
     @property
     @cache
@@ -446,7 +460,7 @@ class Wordpress(object):
     @property
     @cache
     def partners_taxonomy_by_id(self) -> Dict[str, int]:
-        return  {id: slug for slug, id in self.partners_taxonomy.items()}
+        return {id: slug for slug, id in self.partners_taxonomy.items()}
 
     @property
     @cache
@@ -456,8 +470,7 @@ class Wordpress(object):
     @property
     @cache
     def capabilities_by_id(self) -> Dict[str, int]:
-        return  {id: slug for slug, id in self.capabilities.items()}
-
+        return {id: slug for slug, id in self.capabilities.items()}
 
     @property
     @cache
@@ -647,7 +660,6 @@ class Wordpress(object):
             )
         )
 
-
     def get_tag_id_by_name(self, tag: str) -> str:
         if tag in self.tags:
             return self.tags[tag]

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/src/wordpress_markdown_blog_loader/blog.py

@@ -230,6 +230,14 @@ class Blog(object):
     def tags(self, tags: list[str]):
         self.blog.metadata["tags"] = tags
 
+    @property
+    def capabilities(self):
+        return self.blog.metadata.get("capabilities", [])
+
+    @capabilities.setter
+    def capabilities(self, capabilities: list[str]):
+        self.blog.metadata["capabilities"] = capabilities
+
     @property
     def guid(self):
         return self.blog.metadata.get("guid")
@@ -401,6 +409,7 @@ class Blog(object):
             "status": self.status,
             "author": author.id,
             "categories": [wp.get_category_id_by_name(c) for c in self.categories],
+            "capabilities": [wp.get_capability_id_by_name(c) for c in self.capabilities],
             "tags": [wp.get_tag_id_by_name(c) for c in self.tags],
             "acf": {"show_header_image": bool(self.image)},
             "industries_taxonomy": [wp.get_industry_by_name(c) for c in self.industries],

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/src/wordpress_markdown_blog_loader/html_to_gutenberg.py

@@ -24,7 +24,7 @@ def _wrap_paragraph(element):
 
 
 def _wrap_quote(element):
-    element["class"] = ["wp-block-quote"]
+    element["class"] = ["wp-block-quote is-layout-flow wp-block-quote-is-layout-flow"]
     # Wrap nested elements
     for child in list(element.contents):
         if isinstance(child, (NavigableString, Comment)):
@@ -34,8 +34,7 @@ def _wrap_quote(element):
         # Since _wrap_in_gutenberg_comments returns a string,
         # we replace the child with a NavigableString of that result
         wrapped_child = _wrap_in_gutenberg_comments(child)
-        if wrapped_child != str(child):
-            child.replace_with(BeautifulSoup(wrapped_child, "html.parser"))
+        child.replace_with(BeautifulSoup(wrapped_child, "html.parser"))
 
     return f"<!-- wp:quote -->\n{str(element)}\n<!-- /wp:quote -->"
 

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/src/wordpress_markdown_blog_loader/new.py

@@ -42,6 +42,7 @@ class ImageType(click.ParamType):
 @click.option("--email", required=False, help="of the author")
 @click.option("--image", required=False, type=ImageType(), help="for the banner")
 @click.option("--image-credits", required=False, type=str, help="for the used image")
+@click.option("--capability", required=False, multiple=True, help="for the used capabilities selection")
 @click.option(
     "--brand",
     type=click.Choice(["xebia.com", "binx.io"]),
@@ -49,12 +50,12 @@ class ImageType(click.ParamType):
     default="xebia.com",
     help="of the banner",
 )
-def command(title, subtitle, author, image, brand, email, image_credits):
+def command(title, subtitle, author, image, brand, email, image_credits, capability):
     """
     a new frontmatter blog
 
     the index.md will be written in a subdirectory with the name of the slug for the blog.
-    The slug is created from the title. The image will be resized and cropped to 1200x630.
+    The slug is created from the title. The image will be resized and cropped to 1440x460.
     """
     slug = slugify(title)
 
@@ -78,6 +79,8 @@ def command(title, subtitle, author, image, brand, email, image_credits):
     blog.date = (datetime.now().astimezone() + timedelta(days=7)).replace(
         hour=0, minute=0, second=0, microsecond=0
     )
+    if capability:
+        blog.capabilities = list(capability)
 
     if not blog.title:
         click.echo("a title is required", err=True)
@@ -100,26 +103,26 @@ def command(title, subtitle, author, image, brand, email, image_credits):
 
 def save_og_image(image: Image, path: Path) -> Path:
     """
-    save the image to be the perfect og image size: 1200x630px
+    save the image to be the perfect og image size: 1440x460px
     """
     width, height = image.size
-    if width != 1200:
-        new_height = int(height * 1200 / width)
-        logging.info("resizing %dx%d to %dx%d", width, height, 1200, new_height)
-        image = image.resize((1200, new_height))
-        width = 1200
+    if width != 1440:
+        new_height = int(height * 1440 / width)
+        logging.info("resizing %dx%d to %dx%d", width, height, 1440, new_height)
+        image = image.resize((1440, new_height))
+        width = 1440
         width, height = image.size
 
-    if height > 630:
-        logging.info("cropping to maximum height of 630px")
-        top = int((height - 630) / 2)
-        bottom = 630 + top
-        image = image.crop((0, top, 1200, bottom))
+    if height > 460:
+        logging.info("cropping to maximum height of 460px")
+        top = int((height - 460) / 2)
+        bottom = 460 + top
+        image = image.crop((0, top, 1440, bottom))
         width, height = image.size
 
-    if height < 630:
-        new_image = Image.new("RGBA", (1200, 630), (255, 0, 0, 0))
-        new_image.paste(image, (0, int((630 - height) / 2)))
+    if height < 460:
+        new_image = Image.new("RGBA", (1440, 460), (255, 0, 0, 0))
+        new_image.paste(image, (0, int((460 - height) / 2)))
         image = new_image
 
     path.parent.mkdir(exist_ok=True, parents=True)
@@ -144,7 +147,7 @@ def update_banner_command(blog, image, brand):
     """
     of the blog.
 
-    reads the image, crops it to the 1200x630 dimensions and updates the blog's banner property.
+    reads the image, crops it to the 1440x460 dimensions and updates the blog's banner property.
     Regenerates and updates the og-banner too.
     """
     path = Path(blog).joinpath("index.md")

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/src/wordpress_markdown_blog_loader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wordpress-markdown-blog-loader
-Version: 1.7.3
+Version: 1.7.4
 Summary: load markdown blogs into wordpress
 Author-email: Mark van Holsteijn <markvanholsteijn@binx.io>
 License: APL2
@@ -119,7 +119,7 @@ alias wp-md='docker run \
  -v $HOME:$HOME \
  -v $HOME/.wordpress.ini:/root/.wordpress.ini \
  -v $PWD:/$PWD \
- -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.7.3
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.7.4
 ```'
 Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 

{wordpress_markdown_blog_loader-1.7.3 → wordpress_markdown_blog_loader-1.7.4}/tests/test_html_to_gutenberg.py

@@ -97,7 +97,10 @@ class TestGutenbergWrapFunctions(unittest.TestCase):
         soup = BeautifulSoup("<blockquote>quotie quote</blockquote>", "html.parser")
         elem = soup.blockquote
         result = _wrap_quote(elem)
-        self.assertEqual(result, '<!-- wp:quote -->\n<blockquote class="wp-block-quote">quotie quote</blockquote>\n<!-- /wp:quote -->')
+        self.assertEqual(
+            result,
+            '<!-- wp:quote -->\n<blockquote class="wp-block-quote is-layout-flow wp-block-quote-is-layout-flow">quotie quote</blockquote>\n<!-- /wp:quote -->',
+        )
 
     def test_wrap_quote_nested_elements(self):
         html = "<blockquote><p>Quote line 1</p><p>Quote line 2</p></blockquote>"
@@ -154,5 +157,6 @@ class TestConvertFunction(unittest.TestCase):
         self.assertIn("<!-- wp:heading -->", result)
         self.assertIn("<!-- wp:code -->", result)
 
+
 if __name__ == "__main__":
     unittest.main()