Fix compatibility with .meta files

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jul 3, 2017 · 4a21369 · 4a21369
1 parent f7679bc
commit 4a21369
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/nikola/plugin_categories.py b/nikola/plugin_categories.py
@@ -404,7 +404,7 @@ def _split_metadata_from_text(self, source_text: str) -> (str, str):
         else:
             split_result = self.split_metadata_re.split(source_text.lstrip(), maxsplit=1)
             if len(split_result) == 1:
-                return '', split_result[0]
+                return split_result[0], split_result[0]
             else:
                 # Necessary?
                 return split_result[0], split_result[-1]

diff --git a/nikola/post.py b/nikola/post.py
@@ -972,7 +972,6 @@ def get_metadata_from_file(source_path, post, config, lang, metadata_extractors_
 
             if found_in_priority:
                 break
-
         return meta, used_extractors
     except (UnicodeDecodeError, UnicodeEncodeError):
         msg = 'Error reading {0}: Nikola only supports UTF-8 files'.format(source_path)
@@ -990,13 +989,12 @@ def get_metadata_from_meta_file(path, post, config, lang, metadata_extractors_by
     elif lang:
         meta_path += '.' + lang
     if os.path.isfile(meta_path):
-        return get_metadata_from_file(path, post, config, lang, metadata_extractors_by)[0]
-
+        return get_metadata_from_file(meta_path, post, config, lang, metadata_extractors_by)[0]
     elif lang:
         # Metadata file doesn't exist, but not default language,
         # So, if default language metadata exists, return that.
         # This makes the 2-file format detection more reliable (Issue #525)
-        return get_metadata_from_meta_file(path, post, config, None, metadata_extractors_by)[0]
+        return get_metadata_from_meta_file(meta_path, post, config, None, metadata_extractors_by)[0]
     else:  # No 2-file metadata
         return {}