Merge pull request #107 from ncornette/python-modules-update

Update python modules interfaces, improve update_all.py

tools/update_all.py

@@ -5,23 +5,29 @@ from glob import glob
 
 from os.path import basename, splitext, join
 
+import xrdb2konsole
+import xrdb2terminator
+import xrdb2Xresources
+import xrdb2putty
+import xrdb2xfce_terminal
+
 if __name__ == '__main__':
 
     for f in glob("../schemes/*.itermcolors"):
         base_name = splitext(basename(f))[0]
         xrdb_filepath = join('../xrdb', base_name + '.xrdb')
         with open(xrdb_filepath, 'w') as fout:
-            print("--> " + xrdb_filepath)
+            ret_code = subprocess.Popen(['./iterm2xrdb', f], stdout=fout).wait()
-            subprocess.Popen(['./iterm2xrdb', f], stdout=fout).wait()
+            print(ret_code and "ERROR" or "OK" + " --> " + xrdb_filepath)
 
-    konsole_path = "../konsole/"
+    print()
-    print("--> " + konsole_path)
+    xrdb2konsole.main('../xrdb/', '../konsole/')
-    subprocess.Popen(['./xrdb2konsole.py', '../xrdb/', '-d', konsole_path])
+    print('OK --> ' + '../konsole/')
-
+    xrdb2terminator.main('../xrdb/', '../terminator/')
-    terminator_path = '../terminator/'
+    print('OK --> ' + '../terminator/')
-    print("--> " + terminator_path)
+    xrdb2Xresources.main('../xrdb/', '../Xresources/')
-    subprocess.Popen(['./xrdb2terminator.py', '../xrdb/', '-d', terminator_path])
+    print('OK --> ' + '../Xresources/')
-
+    xrdb2putty.main('../xrdb/', '../putty/')
-    putty_path = '../putty/'
+    print('OK --> ' + '../putty/')
-    print("--> " + putty_path)
+    xrdb2xfce_terminal.main('../xrdb/', '../xfce4terminal/colorschemes/')
-    subprocess.Popen(['./xrdb2putty.py', '../xrdb/', '-d', putty_path])
+    print('OK --> ' + '../xfce4terminal/colorschemes/')

tools/xrdb2konsole.py

@@ -16,24 +16,18 @@ import re
 import argparse
 
 # Takes #000A0B and returns (0, 10, 11)
+
 def hex_to_rgb(color):
     return (int(color[1:3], 16), int(color[3:5], 16), int(color[5:7], 16))
 
+
 def build_konsole_color(name, r, g, b):
     return "[%s]\nColor=%d,%d,%d\n\n" % (name, r, g, b)
 
-if __name__ == "__main__":
-
-    parser = argparse.ArgumentParser(
-        description='Translate X color schemes to termiantor format')
-    parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
-    parser.add_argument('-d', '--out-directory', type=str, dest='output_path',
-                        help='path where terminator config files will be' +
-                        ' created, if not provided then will be printed')
-
-    args = parser.parse_args()
 
+def main(xrdb_path, output_path=None):
 
+    global xrdb_regex
     # The regexes to match the colors
     color_regex = re.compile("#define +Ansi_(\d+)_Color +(#[A-Fa-f0-9]{6})")
     bg_regex = re.compile("#define +Background_Color +(#[A-Fa-f0-9]{6})")
@@ -43,19 +37,18 @@ if __name__ == "__main__":
 
     # File regex
     xrdb_regex = re.compile("(.+)\.[xX][rR][dD][bB]")
-
+    for i in filter(lambda x: xrdb_regex.match(x), os.listdir(xrdb_path)):
-    for i in filter(lambda x: xrdb_regex.match(x), os.listdir(args.xrdb_path)):
         name = xrdb_regex.match(i).group(1)
 
         # Read XRDB file
-        with open(os.path.join(args.xrdb_path, i)) as f:
+        with open(os.path.join(xrdb_path, i)) as f:
             xrdb_data = f.read()
 
         # Open output file
         output = sys.stdout
 
-        if args.output_path:
+        if output_path:
-            dest = os.path.join(args.output_path, name)
+            dest = os.path.join(output_path, name)
             output = open('{0}.colorscheme'.format(dest), 'w+')
         else:
             output.write('\n%s:\n' % name)
@@ -85,9 +78,24 @@ if __name__ == "__main__":
             color_index = int(match[0])
             color_rgb = hex_to_rgb(match[1])
 
-            color_name = 'Color%d' % color_index if color_index < 8 else 'Color%dIntense' % (color_index - 8)
+            color_name = 'Color%d' % color_index if color_index < 8 else 'Color%dIntense' % (
+            color_index - 8)
 
             output.write(build_konsole_color(color_name, *color_rgb))
 
-        if args.output_path:
+        if output_path:
             output.close()
+
+
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description='Translate X color schemes to termiantor format')
+    parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
+    parser.add_argument('-d', '--out-directory', type=str, dest='output_path',
+                        help='path where terminator config files will be' +
+                        ' created, if not provided then will be printed')
+
+    args = parser.parse_args()
+
+    main(args.xrdb_path, args.output_path)

tools/xrdb2putty.py

@@ -23,17 +23,7 @@ def hex_to_rgb(color):
 def build_putty_color(name, r, g, b):
 	return "\"%s\"=\"%d,%d,%d\"\n" % (name, r, g, b)
 
-if __name__ == "__main__":
+def main(xrdb_path, output_path=None):
-
-	parser = argparse.ArgumentParser(
-		description='Translate X color schemes to termiantor format')
-	parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
-	parser.add_argument('-d', '--out-directory', type=str, dest='output_path',
-		help='path where putty config files will be' +
-		' created, if not provided then will be printed')
-
-	args = parser.parse_args()
-
 
 	# The regexes to match the colors
 	color_regex = re.compile("#define +Ansi_(\d+)_Color +(#[A-Fa-f0-9]{6})")
@@ -46,18 +36,18 @@ if __name__ == "__main__":
 	# File regex
 	xrdb_regex = re.compile("(.+)\.[xX][rR][dD][bB]")
 
-	for i in filter(lambda x: xrdb_regex.match(x), os.listdir(args.xrdb_path)):
+	for i in filter(lambda x: xrdb_regex.match(x), os.listdir(xrdb_path)):
 		name = xrdb_regex.match(i).group(1)
 
 		# Read XRDB file
-		with open(os.path.join(args.xrdb_path, i)) as f:
+		with open(os.path.join(xrdb_path, i)) as f:
 			xrdb_data = f.read()
 
 		# Open output file
 		output = sys.stdout
 
-		if args.output_path:
+		if output_path:
-			dest = os.path.join(args.output_path, name)
+			dest = os.path.join(output_path, name)
 			output = open('{0}.reg'.format(dest), 'w+')
 		else:
 			output.write('\n%s:\n' % name)
@@ -121,5 +111,19 @@ if __name__ == "__main__":
 
 			output.write(build_putty_color(color_name, *color_rgb))
 
-		if args.output_path:
+		if output_path:
 			output.close()
+
+if __name__ == "__main__":
+
+	parser = argparse.ArgumentParser(
+		description='Translate X color schemes to termiantor format')
+	parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
+	parser.add_argument('-d', '--out-directory', type=str, dest='output_path',
+		help='path where putty config files will be' +
+		' created, if not provided then will be printed')
+
+	args = parser.parse_args()
+	main(args.xrdb_path, args.output_path)
+
+

tools/xrdb2terminator.py

@@ -9,35 +9,23 @@
 # Author: Xabier Larrakoetxea
 
 import os
-import sys
 import re
 import argparse
 
-if __name__ == "__main__":
-
-    parser = argparse.ArgumentParser(
-        description='Translate X color schemes to termiantor format')
-    parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
-    parser.add_argument('-d', '--destiny', type=str, dest='output_path',
-                        help='path where terminator config files will be' +
-                        ' created, if not provided then will be printed')
-
-    args = parser.parse_args()
-
 
+def main(xrdb_path, output_path=None):
+    global color_regex, xrdb_regex
     # The regexes to match the colors
     color_regex = re.compile("#define +Ansi_(\d+)_Color +(#[A-Fa-f0-9]{6})")
     bg_regex = re.compile("#define +Background_Color +(#[A-Fa-f0-9]{6})")
     fg_regex = re.compile("#define +Foreground_Color +(#[A-Fa-f0-9]{6})")
     cursor_regex = re.compile("#define +Cursor_Color +(#[A-Fa-f0-9]{6})")
-
     # File regex
     xrdb_regex = re.compile("(.+)\.[xX][rR][dD][bB]")
-
+    for i in filter(lambda x: xrdb_regex.match(x), os.listdir(xrdb_path)):
-    for i in filter(lambda x: xrdb_regex.match(x), os.listdir(args.xrdb_path)):
 
         # per file
-        with open(os.path.join(args.xrdb_path, i)) as f:
+        with open(os.path.join(xrdb_path, i)) as f:
             lines = f.readlines()
 
         # Search special colors
@@ -69,9 +57,23 @@ if __name__ == "__main__":
                                cr=cursor_color,
                                fg=fg_color)
 
-        if not args.output_path:
+        if not output_path:
             print(output)
         else:
-            dest = os.path.join(args.output_path, xrdb_regex.match(i).group(1))
+            dest = os.path.join(output_path, xrdb_regex.match(i).group(1))
             with open('{0}.config'.format(dest), 'w+') as f:
                 f.write(output)
+
+
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description='Translate X color schemes to termiantor format')
+    parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
+    parser.add_argument('-d', '--destiny', type=str, dest='output_path',
+                        help='path where terminator config files will be' +
+                        ' created, if not provided then will be printed')
+
+    args = parser.parse_args()
+
+    main(args.xrdb_path, args.output_path)

tools/xrdb2xfce_terminal.py

@@ -14,17 +14,7 @@ import sys
 import re
 import argparse
 
-if __name__ == "__main__":
+def main(xrdb_path, output_path=None):
-
-    parser = argparse.ArgumentParser(
-        description='Translate X color schemes to termiantor format')
-    parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
-    parser.add_argument('-d', '--destiny', type=str, dest='output_path',
-                        help='path where terminator config files will be' +
-                        ' created, if not provided then will be printed')
-
-    args = parser.parse_args()
-
 
     # The regexes to match the colors
     color_regex = re.compile("#define +Ansi_(\d+)_Color +(#[A-Fa-f0-9]{6})")
@@ -35,10 +25,10 @@ if __name__ == "__main__":
     # File regex
     xrdb_regex = re.compile("(.+)\.[xX][rR][dD][bB]")
 
-    for i in filter(lambda x: xrdb_regex.match(x), os.listdir(args.xrdb_path)):
+    for i in filter(lambda x: xrdb_regex.match(x), os.listdir(xrdb_path)):
 
         # per file
-        with open(os.path.join(args.xrdb_path, i)) as f:
+        with open(os.path.join(xrdb_path, i)) as f:
             lines = f.readlines()
 
         # Search special colors
@@ -70,9 +60,23 @@ ColorPalette={pl}
                                cr=cursor_color,
                                fg=fg_color)
 
-        if not args.output_path:
+        if not output_path:
             print(output)
         else:
-            dest = os.path.join(args.output_path, xrdb_regex.match(i).group(1))
+            dest = os.path.join(output_path, xrdb_regex.match(i).group(1))
             with open('{0}.theme'.format(dest), 'w+') as f:
                 f.write(output)
+
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description='Translate X color schemes to termiantor format')
+    parser.add_argument('xrdb_path', type=str, help='path to xrdb files')
+    parser.add_argument('-d', '--destiny', type=str, dest='output_path',
+                        help='path where terminator config files will be' +
+                        ' created, if not provided then will be printed')
+
+    args = parser.parse_args()
+
+    main(args.xrdb_path, args.output_path)
+