wordpress-markdown-blog-loader 1.5.0__tar.gz → 1.5.2__tar.gz

{wordpress_markdown_blog_loader-1.5.0 → wordpress_markdown_blog_loader-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wordpress-markdown-blog-loader
-Version: 1.5.0
+Version: 1.5.2
 Summary: load markdown blogs into wordpress
 Home-page: https://github.com/binxio/wordpress-markdown-blog-loader
 Author: Mark van Holsteijn
@@ -113,7 +113,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.5.0
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.5.2
 ```'
 Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 

{wordpress_markdown_blog_loader-1.5.0 → wordpress_markdown_blog_loader-1.5.2}/README.md

@@ -67,7 +67,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.5.0
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.5.2
 ```'
 Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 

{wordpress_markdown_blog_loader-1.5.0 → wordpress_markdown_blog_loader-1.5.2}/setup.py

@@ -27,7 +27,7 @@ with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
 
 setup(
     name="wordpress-markdown-blog-loader",
-    version="1.5.0",
+    version="1.5.2",
     url="https://github.com/binxio/wordpress-markdown-blog-loader",
     license="APL2",
     author="Mark van Holsteijn",

{wordpress_markdown_blog_loader-1.5.0 → wordpress_markdown_blog_loader-1.5.2}/src/wordpress_markdown_blog_loader/api.py

@@ -25,6 +25,7 @@ def get_default_host() -> Optional[str]:
     config.read(expanduser("~/.wordpress.ini"))
     return config.defaults().get("host")
 
+
 def get_password(host: str) -> Optional[str]:
     """
     Returns a password from the environment variable for the specified host.
@@ -65,7 +66,6 @@ class WordpressEndpoint:
         config = configparser.ConfigParser()
         config.read(expanduser("~/.wordpress.ini"))
 
-
         if not host:
             host = config.defaults().get("host")
             assert host, "no host specified and no default host found"
@@ -77,7 +77,9 @@ class WordpressEndpoint:
         self.username = config.get(host, "username")
         self.password = get_password(host)
         if not self.password:
-            logging.warning("taking plain text app password from configuration file, use WP_APP_PASSWORD environment variable instead!")
+            logging.warning(
+                "taking plain text app password from configuration file, use WP_APP_PASSWORD environment variable instead!"
+            )
             self.password = config.get(host, "password")
 
     def is_host_for(self, url: Union[str, ParseResult]) -> bool:
@@ -267,6 +269,7 @@ class PermissionDenied(Exception):
     def __init__(self, msg):
         super().__init__(msg)
 
+
 class Wordpress(object):
     def __init__(self, host: Optional[str] = None):
         self.endpoint = WordpressEndpoint.load(host)
@@ -312,7 +315,7 @@ class Wordpress(object):
                 page = page + 1
             else:
                 msg = f"failed to get all {resource}: {response.status_code}, {response.text}"
-                if response.status_code in [401,403]:
+                if response.status_code in [401, 403]:
                     raise PermissionDenied(msg)
                 else:
                     print(msg)
@@ -326,13 +329,14 @@ class Wordpress(object):
     def get_user_by_id(self, resource_id: int) -> "User":
         return User(self.get("users", resource_id))
 
-    def get_unique_user_by_name(self, name: str, email: Optional[str], author_id: Optional[str]) -> "User":
+    def get_unique_user_by_name(
+        self, name: str, email: Optional[str], author_id: Optional[str]
+    ) -> "User":
 
         user = self.get_user_by_id("me")
         if user and user.name == name:
             return user
 
-
         users = []
         try:
             # The email field is only returned when the context edit is passed.
@@ -347,17 +351,34 @@ class Wordpress(object):
         elif len(users) == 1:
             return users[0]
 
-        user = next(filter(lambda u: (author_id and u.slug == author_id) or (not author_id and email and u.email and u.email.lower() == email.lower()), users), None)
-        if not user:
-            if author_id:
-                raise ValueError(
-                    f"Multiple authors named '{name}' found, none with author id {author_id} (possible: { {u.slug for u in users} })."
-                )
-            else:
-                raise ValueError(
-                    f"Multiple authors named '{name}' found, but none with email {email} (possible: { {u.email for u in users} })."
-                )
-        return user
+        if user := next(
+            filter(
+                lambda u: (author_id and u.slug == author_id)
+                or (
+                    not author_id
+                    and email
+                    and u.email
+                    and u.email.lower() == email.lower()
+                ),
+                users,
+            ),
+            None,
+        ):
+            return user
+
+        candidates = ", ".join(["{} / {}".format(u.slug, u.email) for u in users])
+        if author_id:
+            raise ValueError(
+                f"Multiple authors named '{name}' found, none with author id {author_id} (possible: {candidates})."
+            )
+        elif email:
+            raise ValueError(
+                f"Multiple authors named '{name}' found, but none with email {email}. (possible: {candidates})."
+            )
+        else:
+            raise ValueError(
+                f"Multiple authors named '{name}' found. (possible: {candidates})."
+            )
 
     def posts(self, query: dict = None) -> Iterator["Post"]:
         for p in self.get_all("posts", query):
@@ -388,10 +409,11 @@ class Wordpress(object):
     @cache
     def categories(self) -> Dict[str, int]:
         return {c["slug"]: c["id"] for c in self.get_all("categories")}
+
     @property
     @cache
     def categories_by_id(self) -> Dict[int, str]:
-        return {id: slug for slug,id in self.categories.items()}
+        return {id: slug for slug, id in self.categories.items()}
 
     @property
     @cache
@@ -403,7 +425,6 @@ class Wordpress(object):
     def tags_by_id(self) -> Dict[int, str]:
         return {id: slug for slug, id in self.tags.items()}
 
-
     def search_for_image_by_slug(self, slug) -> Optional[Medium]:
         response = self.session.get(
             f"{self.url}/media",

{wordpress_markdown_blog_loader-1.5.0 → wordpress_markdown_blog_loader-1.5.2}/src/wordpress_markdown_blog_loader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wordpress-markdown-blog-loader
-Version: 1.5.0
+Version: 1.5.2
 Summary: load markdown blogs into wordpress
 Home-page: https://github.com/binxio/wordpress-markdown-blog-loader
 Author: Mark van Holsteijn
@@ -113,7 +113,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.5.0
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.5.2
 ```'
 Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`