Fixed bug with entering paths on Windows.

GUI has its own entry-point now, 'nescient-ui'.
Ensured the GUI cannot be interacted with when adding files.

Author: aarant

README.rst

@@ -89,7 +89,7 @@ Unless otherwise specified via command line flags, Nescient packs and unpacks fi
 
 Command line help can be viewed with ``nescient -h``.
 
-Nescient also has a GUI mode, which can be run by simply running ``nescient``.
+Nescient also has a GUI mode, which can be run by simply running ``nescient-ui``.
 
 Development
 ===========

dist/Nescient-0.6.1-cp36-cp36m-win_amd64.whl

@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 # nescient/__init__.py
-"""Nescient v0.6.0
+"""Nescient v0.6.1
 
 A Python program for packing/unpacking encrypted, salted, and authenticated file containers.
 
@@ -30,7 +30,7 @@
 
 # Versions will always take the form major.minor.patch[.develop]. The develop increment is optional.
 # A valid version will have the string form *.*.*[.dev*], where any integer may take the place of a *.
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 url = 'https://github.com/arantonitis/nescient'
 
 

dist/Nescient-0.6.1.tar.gz

@@ -14,7 +14,7 @@
 from nescient.packer import PACKING_MODES, DEFAULT_PACKING_MODE, NescientPacker, PackingError
 from nescient.timing import estimate_time, EstimatedTimer, load_benchmarks, benchmark_mode
 from nescient.process import start_packer_process
-from nescient.gui import NescientUI
+from nescient.gui import main as start_gui
 
 
 # Prompt the user with a yes-no question
@@ -40,8 +40,7 @@ def ask_yesno(prompt, default=True, newline=False, noprompt=False):
 def main():
     # If run with no arguments, start the GUI
     if len(sys.argv) == 1:
-        gui = NescientUI()
-        gui.mainloop()
+        start_gui()
         sys.exit(0)
     parser = ArgumentParser(prog='nescient', description=description, formatter_class=RawTextHelpFormatter)
     parser.add_argument('packing_choice', choices=['pack', 'unpack'], metavar='pack|unpack',

nescient/__init__.py

@@ -5,6 +5,7 @@
 """ Graphical User Interface (GUI) for Nescient. """
 # TODO: Options, documentation, better path awareness, working directory changes, non-blocking benchmarking, About
 import os
+import sys
 import glob
 import webbrowser
 from tkinter import Tk, Label, PhotoImage, OptionMenu, StringVar, Frame, Text, Scrollbar, RIGHT, Y, WORD, DISABLED, \
@@ -210,7 +211,7 @@ def close(self):
 
 # The main UI
 class NescientUI(Tk):
-    def __init__(self):
+    def __init__(self, paths=None):
         Tk.__init__(self)
         self.title('Nescient ' + __version__)
         try:
@@ -239,6 +240,8 @@ def __init__(self):
         self.grid_columnconfigure(1, weight=1)
         # Set up initial variables
         self.paths = []
+        if paths:
+            self.add_files('auto', paths)
         self.state = 'ready'
         self.open_dir = os.getcwd()
 
@@ -278,22 +281,24 @@ def threaded_task(self, func, *args, **kwargs):
         self.state = 'ready'
         return return_value
 
-    def add_files(self, choice):
+    def add_files(self, choice, paths=None):
         self.status.config(text='Adding files...')
+        self.global_widget_state(DISABLED)
         if choice == 'glob':
             pattern = self.path_select.entry.get()
             paths = [path for path in glob.glob(pattern, recursive=True) if os.path.isfile(path)]
-        else:  # choice == 'dialog':
+        elif choice == 'dialog':
             paths = list(filedialog.askopenfilenames(initialdir=self.open_dir, parent=self, title='Add files'))
             if paths:
                 self.open_dir = os.path.dirname(paths[0])
         for path in paths:
             if not self.paths:
                 self.text.clear()
             if path not in self.paths:
-                self.text.insert(path + '\n', path.replace(' ', '?'))
+                self.text.insert(path + '\n', 'path%s' % len(self.paths))
                 self.paths.append(path)
         self.status.config(text='Ready.')
+        self.global_widget_state(NORMAL)
 
     def clear_paths(self):
         self.status.config(text='Clearing paths...')
@@ -323,10 +328,10 @@ def password_failed(self, password):
 
     def packing_loop(self, choice, packer):
         self.title('Nescient %s - %s' % (__version__, 'Packing' if choice == 'pack' else 'Unpacking'))
-        for path in self.paths:
+        for path_num, path in enumerate(self.paths):
             try:
                 # Color and scroll to the tag
-                tag = path.replace(' ', '?')
+                tag = 'path%s' % path_num
                 self.text.text.see('%s.first' % tag)
                 self.text.tag_config(tag, background='#369a9d')
                 # Fix the out path and set up display text
@@ -389,8 +394,12 @@ def benchmark_all_modes(self):
         self.mode_select.display_rate_info()
         self.status.config(text='Ready')
         self.title('Nescient ' + __version__)
+
+def main():
+    paths = sys.argv[1:] if len(sys.argv) > 1 else None
+    gui = NescientUI(paths)
+    gui.mainloop()
 
 
 if __name__ == '__main__':
-    gui = NescientUI()
-    gui.mainloop()
+    main()

nescient/__main__.py

@@ -27,9 +27,10 @@
       author_email='[email protected]',
       url=url,
       packages=['nescient', 'nescient.crypto', 'nescient.resources'],
-      package_data={'nescient': ['*.png'], 'nescient.crypto': ['*.pyx'], 'nescient.resources': ['*gif']},
+      package_data={'nescient': ['*.png', '*.ico'], 'nescient.crypto': ['*.pyx'], 'nescient.resources': ['*gif']},
       ext_modules=extensions,
-      entry_points={'console_scripts': ['nescient = nescient.__main__:main']},
+      entry_points={'console_scripts': ['nescient = nescient.__main__:main'],
+                    'gui_scripts': ['nescient-ui = nescient.gui:main']},
       license='MIT',
       classifiers=['License :: OSI Approved :: MIT License'],
       python_requires='>=3.3'