Merge pull request #2 from chandlerj/saves

major changes: save states & refactoring

1 files changed, 14 insertions, 3 deletions

diff --git a/src/instant_rice.py b/src/instant_rice.py
index e94dc64..4102fa1 100644
--- a/src/instant_rice.py
+++ b/src/instant_rice.py
@@ -4,7 +4,6 @@ import user_interface
 import update_rofi
 import update_i3
 import update_polybar
-import initialize_i3
 import initialize_rofi
 from get_args import get_args,usage
 from load_config import systemConfig      
@@ -14,17 +13,29 @@ if __name__ == '__main__':
     if len(sys.argv) > 1:
         
         config = systemConfig()
-        img_path, initialize, reconfigure, color_save = get_args(sys.argv, config.wallpaper_directory) 
+        
+        img_path, initialize, reconfigure, theme = get_args(sys.argv, config.wallpaper_directory) 
+
         if initialize:
             initialize_rofi.reconfigureRofi()
             print('[bold green]Initialization Completed. Exiting...')
             exit(0)
-        hex_colors, hex_compliments = user_interface.colorPickerUI(img_path, config.num_palettes)
+
+        if theme == None:
+            hex_colors, hex_compliments = user_interface.colorPickerUI(img_path, config.num_palettes)
+            user_interface.saveThemePrompt(hex_colors, hex_compliments, img_path, config.theme_directory)
+        else:
+            hex_colors = theme['colors']
+            hex_compliments = theme['comp_colors']
+
         if config.polybar_config: 
             update_polybar.updatePolybarTheme(config.polybar_config, hex_colors, hex_compliments)
+        
         if config.rofi_config:
             update_rofi.updateRofiTheme(config.rofi_config, hex_colors, hex_compliments)
+        
         if config.i3_config:
             update_i3.updatei3Theme(config.i3_config, img_path, hex_colors, hex_compliments, config.generate_i3_lock, config.use_dmenu, config.i3_lock_image, config.menu_keybind)
+
     else:
         usage(sys.argv)