Refactor(dotfiles2html): Reorder code blocks

[phdru.name/phdru.name.git] / dotfiles2html / dotfiles2html.py

diff --git a/dotfiles2html/dotfiles2html.py b/dotfiles2html/dotfiles2html.py
index a2805f432b7075e12a27a8c0eb0d1e8759c9a856..f18ff4a56a67cefa951343a1af547a623cf8fd8a 100755 (executable)
--- a/dotfiles2html/dotfiles2html.py
+++ b/dotfiles2html/dotfiles2html.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2004-2016 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2004-2020 PhiloSoft Design"
 
 import os, shutil, filecmp
 os.umask(0022) # octal; -rw-r--r--
@@ -54,10 +54,12 @@ def add_headers(fname, first, prev, next, last):
    html_file.close()
 
 
-home_file_types = (("bashrc", "sh"), ("profile", "sh"), ("shellrc", "sh"),
-    ("fvwm2rc", "fvwm2m4"), ("mailcap", "conf"), ("mime.types", "conf"),
+home_file_types = (
+    ("bashrc", "sh"), ("profile", "sh"), ("shellrc", "sh"),
+    ("mailcap", "conf"), ("mime.types", "conf"),
     ("muttrc", "muttrc"), ("procmailrc", "procmail"),
-    ("gitconfig", "gitconfig"), ("vimrc", "vim"))
+    ("gitconfig", "gitconfig"), ("vimrc", "vim"),
+)
 
 mc_file_types = (("mc.ext", "conf"), ("menu", "conf"))
 
@@ -71,15 +73,7 @@ def process_dotfile(i, fname, ftype, file_types):
    if not os.path.exists(fname):
       return
 
-   if fname == 'vimrc' and os.path.exists(fname):
-      file = open('vimrc', 'r')
-      text = file.read()
-      file.close()
-      file = open('vimrc', 'w')
-      file.write(text.replace('\033', '<Esc>'))
-      file.close()
-
-   elif fname in ('mailcap', 'mc.ext', 'menu') and os.path.exists(fname):
+   if fname in ('mailcap', 'mc.ext', 'menu') and os.path.exists(fname):
       file = open(fname, 'r')
       text = file.read()
       file.close()
@@ -93,6 +87,14 @@ def process_dotfile(i, fname, ftype, file_types):
       file.write(text)
       file.close()
 
+   elif fname == 'vimrc' and os.path.exists(fname):
+      file = open('vimrc', 'r')
+      text = file.read()
+      file.close()
+      file = open('vimrc', 'w')
+      file.write(text.replace('\033', '<Esc>'))
+      file.close()
+
    os.system("""exec gvim -f -c "set filetype=%s" -c ":source %s/dotfile2html.vim" "%s"
       """ % (ftype, home_dir, fname))
 
@@ -113,14 +115,14 @@ def process_dotfile(i, fname, ftype, file_types):
    else:
       os.rename(fname + ".html", fname + ".tmpl")
 
-   if fname == 'vimrc' and os.path.exists('.' + fname):
-      shutil.copy2('.' + fname, fname)
-
    if fname.endswith('.py'):
        new_name = fname + '.txt'
        os.rename(fname, new_name)
        fname = new_name
 
+   if fname == 'vimrc' and os.path.exists('.' + fname):
+      shutil.copy2('.' + fname, fname)
+
    if os.path.exists(fname):
        os.chmod(fname, 0644)