upgrade_metadata_v8: no BOM in saved file; skip untranslated posts

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · May 5, 2018 · f79b5c5 · f79b5c5
1 parent 70f28b8
commit f79b5c5
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/v8/upgrade_metadata_v8/upgrade_metadata_v8.py b/v8/upgrade_metadata_v8/upgrade_metadata_v8.py
@@ -80,8 +80,8 @@ def _execute(self, options, args):
             if not options['yes']:
                 yesno = utils.ask_yesno("Proceed with metadata upgrade?")
             if options['yes'] or yesno:
-                no_converted = 0
-                no_converted_partial = 0
+                number_converted = 0
+                number_converted_partial = 0
                 for post in flagged:
                     converted = False
                     fully_converted = True
@@ -102,6 +102,10 @@ def _execute(self, options, args):
                             continue
 
                         # Read metadata and text from post file
+                        if not os.path.exists(fname):
+                            L.debug("File {0} does not exist, skipping.".format(fname))
+                            continue
+
                         with io.open(fname, "r", encoding="utf-8-sig") as meta_file:
                             source_text = meta_file.read()
                         if not is_two_file:
@@ -164,18 +168,18 @@ def _execute(self, options, args):
                                                         comment_wrap=(post.compiler.name != 'rest'), site=self.site)
                         final_str = meta_str if is_two_file else (meta_str + content_str)
 
-                        with io.open(fname, "w", encoding="utf-8-sig") as meta_file:
+                        with io.open(fname, "w", encoding="utf-8") as meta_file:
                             meta_file.write(final_str)
                             converted = True
 
                     if converted:
                         if fully_converted:
-                            no_converted += 1
+                            number_converted += 1
                         else:
-                            no_converted_partial += 1
+                            number_converted_partial += 1
 
                 L.info('{0} out of {2} posts upgraded; {1} only converted partially '
-                       '(see above output).'.format(no_converted + no_converted_partial, no_converted_partial, len(flagged)))
+                       '(see above output).'.format(number_converted + number_converted_partial, number_converted_partial, len(flagged)))
             else:
                 L.info('Metadata not upgraded.')
         else: