Fix #169: Stop default options written to package.json

Author: jyapayne

command_line.py

@@ -35,7 +35,6 @@
 import subprocess
 import plistlib
 import codecs
-import ssl
 from datetime import datetime, timedelta
 
 from io import StringIO
@@ -125,9 +124,11 @@ def get_settings(self):
         for setting_group, setting_group_dict in sgroup_items:
             settings['setting_groups'].append(settings[setting_group])
 
-        self._setting_items = (list(config_obj['setting_groups'].items()) +
-                         [('export_settings', config_obj['export_settings'])] +
-                         [('compression', config_obj['compression'])])
+        self._setting_items = (
+            list(config_obj['setting_groups'].items()) +
+            [('export_settings', config_obj['export_settings'])] +
+            [('compression', config_obj['compression'])]
+        )
 
         config_obj.pop('setting_groups')
         config_obj.pop('export_settings')
@@ -339,7 +340,7 @@ def get_versions(self):
                     f.write(v+os.linesep)
         except IOError:
             exc_format = utils.format_exc_info(sys.exc_info)
-            self.show_error(error)
+            self.show_error(exc_format)
             self.enable_ui_after_error()
         finally:
             if f:
@@ -369,7 +370,7 @@ def download_file_with_error_handling(self):
                 os.remove(setting.save_file_path(version, location))
 
             exc_format = utils.format_exc_info(sys.exc_info)
-            self.show_error(error)
+            self.show_error(exc_format)
             self.enable_ui_after_error()
 
     def load_package_json(self, json_path=None):
@@ -472,7 +473,7 @@ def generate_json(self, global_json=False):
 
         self.process_webexe_settings(dic, global_json)
 
-        s = json.dumps(dic, indent=4)
+        s = json.dumps(dic, indent=4, sort_keys=True)
 
         return s
 
@@ -537,7 +538,6 @@ def load_from_json(self, json_str):
             for item in new_dic:
                 setting = self.get_setting(item)
                 if setting:
-                    setting_list.append(setting)
                     if (setting.type == 'file' or
                         setting.type == 'string' or
                             setting.type == 'folder' or
@@ -556,6 +556,8 @@ def load_from_json(self, json_str):
                         setting.value = val_str
                     if setting.type == 'range':
                         setting.value = new_dic[item]
+
+                    setting_list.append(setting)
                 if isinstance(new_dic[item], dict):
                     stack.append((item, new_dic[item]))
         return setting_list
@@ -877,8 +879,8 @@ def try_make_output_dirs(self):
             self.make_output_dirs()
         except Exception:
             exc_format = utils.format_exc_info(sys.exc_info)
-            self.logger.error(error)
-            self.output_err += error
+            self.logger.error(exc_format)
+            self.output_err += exc_format
         finally:
             temp_dir = utils.path_join(config.TEMP_DIR, 'webexectemp')
             utils.rmtree(temp_dir, onerror=self.remove_readonly)
@@ -1101,6 +1103,8 @@ def copy_files_to_project_folder(self):
 
     def convert_val_to_str(self, val):
         """Convert a setting value to a string path"""
+        if val is None:
+            return None
         if isinstance(val, (list, tuple)):
             return ', '.join(val)
         return str(val).replace(self.project_dir()+os.path.sep, '')

config.py

@@ -84,7 +84,7 @@ def is_installed():
 UPX_LIN64_PATH = 'files/compressors/upx-linux-x64'
 
 ENV_VARS_PY_PATH = 'files/env_vars.py'
-ENV_VARS_BAT_FILE = 'files/env_vars.bat'
+ENV_VARS_BAT_PATH = 'files/env_vars.bat'
 ENV_VARS_BASH_PATH = 'files/env_vars.bash'
 
 ## Logger setup ----------------------------------------------

files/settings.cfg

@@ -28,139 +28,139 @@ linux_64_dir_prefix = 'nwjs-v{}-linux-x64'
             type='string'
             description='The name that your executable or app will have when exported.'
         [[[description]]]
-            default_value=''
+            default_value=None
             type='string'
         [[[version]]]
-            default_value='0.1.0'
+            default_value=None
             type='string'
         [[[keywords]]]
-            default_value=''
+            default_value=None
             type='string'
         [[[nodejs]]]
             display_name='Include Nodejs'
-            default_value=True
+            default_value=None
             type='check'
         [[[node-main]]]
             display_name='Node Main'
-            default_value=''
+            default_value=None
             type='file'
             file_types='*.js'
             description='A path to a nodejs script file that will be executed on startup.'
         [[[domain]]]
-            default_value=''
+            default_value=None
             type='string'
             description='Specify the host in the chrome-extension:// protocol URL used fo\n the application. The web engine will share the same cookies between your\napplication and the website under the same domain.'
         [[[user-agent]]]
             display_name='User Agent'
-            default_value=''
+            default_value=None
             type='string'
             description='Overrides the User-Agent header in http requests.\n\nThe following placeholders are available to composite the user agent dynamically:\n\n%name: replaced by the name field in the manifest.\n%ver: replaced by the version field in the manifest, if available.\n%nwver: replaced by the version of NW.js.\n%webkit_ver: replaced by the version of WebKit engine.\n%osinfo: replaced by the OS and CPU information you would see in browser’s user agent string.'
         [[[node-remote]]]
             display_name='Node Remote'
-            default_value=''
+            default_value=None
             type='strings'
             description='Enable calling node in remote pages. See the node-webkit\nmanifest format for more info.'
         [[[chromium-args]]]
             display_name='Chromium Args'
-            default_value=''
+            default_value=None
             type='string'
             description='Specify chromium command line arguments.\nExample value: "--disable-accelerated-video --force-cpu-draw"'
         [[[js-flags]]]
             display_name='JS Flags'
-            default_value=''
+            default_value=None
             type='string'
             description='Specify flags passed to the js engine.\nExample value: "--harmony_proxies --harmony_collecions"'
         [[[bg-script]]]
             display_name='Background Script'
-            default_value=''
+            default_value=None
             type='file'
             file_types='*.js'
             description='Background script. The script is executed in the background page at\nthe start of application.'
         [[[inject_js_start]]]
             display_name='Inject JS Start'
-            default_value=''
+            default_value=None
             type='file'
             file_types='*.js'
             description='A path to a js file that will be executed before any\nother script is run.'
         [[[inject_js_end]]]
             display_name='Inject JS End'
-            default_value=''
+            default_value=None
             type='file'
             file_types='*.js'
             description='A path to a js file that will be executed after the\nDOM is loaded.'
         [[[additional_trust_anchors]]]
             display_name='Trust Anchors'
-            default_value=''
+            default_value=None
             type='strings'
             description='A list of PEM-encoded certificates. Used as additional root\ncertificates for validation to allow connecting to services using a self-signed certificate.'
         [[[dom_storage_quota]]]
             display_name='DOM Storage (MB)'
-            default_value=''
+            default_value=None
             type='int'
             description='Number of mega bytes (MB) for the quota of the DOM storage.\nThe suggestion is to put double the value you want.'
 
     [[webkit_settings]]
         [[[plugin]]]
             display_name='Load Plugins'
-            default_value=True
+            default_value=None
             type='check'
             description='Whether to load external browser plugins like Flash.\nFor example, put the Pepper flash dll or so file in a directory at the root of\nyour project called "PepperFlash" and it will be loaded.'
         [[[double_tap_to_zoom_enabled]]]
             display_name='Double-Tap Zoom'
-            default_value=False
+            default_value=None
             type='check'
             description='Enable zooming with double tapping on Mac OS X with 2 fingers. Mac OS X only'
 
     [[web2exe_settings]]
         [[[export_dir]]]
             display_name='Output Directory'
-            default_value=''
+            default_value=None
             type='string'
             description='The output directory relative to the project directory.'
         [[[custom_script]]]
             display_name='Execute Script'
-            default_value=''
+            default_value=None
             copy=False
             type='file'
             description='The script to execute after a project was successfully exported.'
         [[[output_pattern]]]
             display_name='Output Name Pattern'
-            default_value=''
+            default_value=None
             type='string'
             description='Instead of using the App Name for the output directory, this field can\nbe used to reference different settings of the package.json to name the output folder.'
 
     [[window_settings]]
         [[[id]]]
-            default_value=''
+            default_value=None
             type='string'
             description='The id used to identify the window. This will be used to remember the\nsize and position of the window and restore that geometry when a\nwindow with the same id is later opened. '
         [[[title]]]
-            default_value=''
+            default_value=None
             type='string'
             description='The default title of window created by NW.js, it’s very useful\nif you want to show your own title when the app is starting.'
         [[[icon]]]
             display_name='Window Icon'
-            default_value=''
+            default_value=None
             type='file'
             action='set_window_icon'
             file_types='*.png *.jpg *.jpeg'
         [[[mac_icon]]]
-            default_value=''
+            default_value=None
             type='file'
             action='set_mac_icon'
             file_types='*.png *.jpg *.jpeg *.icns'
             description='This icon to be displayed for the Mac Application.\nDefaults to Window Icon'
         [[[exe_icon]]]
-            default_value=''
+            default_value=None
             type='file'
             action='set_exe_icon'
             file_types='*.png *.jpg *.jpeg'
             description='This icon to be displayed for the windows exe of the app.\nDefaults to Window icon.'
         [[[width]]]
-            default_value='640'
+            default_value=None
             type='int'
         [[[height]]]
-            default_value='480'
+            default_value=None
             type='int'
         [[[min_width]]]
             default_value=None
@@ -176,39 +176,39 @@ linux_64_dir_prefix = 'nwjs-v{}-linux-x64'
             type='int'
         [[[always_on_top]]]
             display_name='Keep on Top'
-            default_value=False
+            default_value=None
             type='check'
             description='Makes the window always on top of other windows.'
         [[[frame]]]
             display_name='Window Frame'
-            default_value=True
+            default_value=None
             type='check'
             description='Show the frame of the window'
         [[[show_in_taskbar]]]
             display_name='Taskbar'
-            default_value=True
+            default_value=None
             type='check'
             description='Show the app running in the taskbar'
         [[[show]]]
             display_name='Show'
-            default_value=True
+            default_value=None
             type='check'
             description='Uncheck to make your app hidden on startup.'
         [[[visible_on_all_workspaces]]]
             display_name='All Workspaces'
-            default_value=False
+            default_value=None
             type='check'
             description='If checked, the exported app will be visible on all workspaces.\nMac & Linux Only'
         [[[visible]]]
-            default_value=True
+            default_value=None
             type='check'
             description='If unchecked, the app will have to be manually set to\nvisible in javascript.'
         [[[resizable]]]
-            default_value=False
+            default_value=None
             type='check'
             description=''
         [[[fullscreen]]]
-            default_value=False
+            default_value=None
             type='check'
             description=''
         [[[position]]]
@@ -218,27 +218,27 @@ linux_64_dir_prefix = 'nwjs-v{}-linux-x64'
             type='list'
             description='The position to place the window when it opens.'
         [[[as_desktop]]]
-            default_value=False
+            default_value=None
             type='check'
             description='Show as desktop background window under X11 environment. Linux Only.'
         [[[transparent]]]
-            default_value=False
+            default_value=None
             type='check'
             description='Allows window tranparency.'
         [[[kiosk]]]
-            default_value=False
+            default_value=None
             type='check'
             description='Puts the application is kiosk mode.'
         [[[kiosk_emulation]]]
-            default_value=False
+            default_value=None
             type='check'
             description='Puts the application is kiosk emulation mode. Will\nautomatically check off required settings that will emulate kiosk.'
             check_action='set_kiosk_emulation_options'
 
     [[download_settings]]
         [[[nw_version]]]
             display_name='NW.js version'
-            default_value='0.16.0'
+            default_value=None
             values=[]
             type='list'
             button='Update'
@@ -254,32 +254,32 @@ linux_64_dir_prefix = 'nwjs-v{}-linux-x64'
             type='check'
         [[[download_dir]]]
             display_name='Download location'
-            default_value='{DEFAULT_DOWNLOAD_PATH}'
+            default_value=''
             type='folder'
 
 [export_settings]
     [[windows-x32]]
-        default_value=False
+        default_value=None
         type='check'
         url='%(base_url)s%(win_32_dir_prefix)s.zip'
         binary_location='nw.exe'
     [[windows-x64]]
-        default_value=False
+        default_value=None
         type='check'
         url='%(base_url)s%(win_64_dir_prefix)s.zip'
         binary_location='nw.exe'
     [[mac-x64]]
-        default_value=False
+        default_value=None
         type='check'
         url='%(base_url)s%(mac_64_dir_prefix)s.zip'
 
     [[linux-x64]]
-        default_value=False
+        default_value=None
         type='check'
         url='%(base_url)s%(linux_64_dir_prefix)s.tar.gz'
         binary_location='nw'
     [[linux-x32]]
-        default_value=False
+        default_value=None
         type='check'
         url='%(base_url)s%(linux_32_dir_prefix)s.tar.gz'
         binary_location='nw'