Merge branch 'feature-windows'

Author: pjkundert

GNUmakefile

@@ -446,7 +446,7 @@ dist/SLIP-39.app-checkids:	SLIP-39.spec
 #   - Find each dependent key, and look at its SHA fingerprint, and then see if you have
 #     that one in your System keychain, downloading all the named keys from apple 'til
 #     you find the one with the matching fingerprint.  Grr...  Repeat 'til check-signature works.
-dist/SLIP-39.app: 		SLIP-39.spec		\
+dist/SLIP-39.app: 		SLIP-39-macOS.spec	\
 				SLIP-39.metadata/entitlements.plist \
 				images/SLIP-39.icns
 	@echo "\n\n*** Rebuilding $@, version $(VERSION)..."
@@ -492,7 +492,7 @@ dist/SLIP-39.app: 		SLIP-39.spec		\
 #    +
 #                 bundle_identifier='ca.kundert.perry.SLIP39')
 
-SLIP-39.spec: SLIP-39.py
+SLIP-39-macOS.spec: SLIP-39.py
 	@echo "\n\n!!! Rebuilding $@; Must be manually edited..."
 	pyinstaller --noconfirm --windowed --onefile \
 	    --codesign-identity "$(DEVID)" \
@@ -502,6 +502,23 @@ SLIP-39.spec: SLIP-39.py
 	    --hidden-import slip39 \
 	    --collect-data slip39 \
 		$<
+	mv SLIP-39.spec $@
+	@echo "!!! Regenerated $@: must be manually corrected!"
+	false  # Make the build fail if we've regenerated the .spec
+
+
+dist/SLIP-39.exe:	SLIP-39-win32.spec
+	rm -rf build $@
+	pyinstaller --noconfirm $<
+
+SLIP-39-win32.spec: SLIP-39.py
+	@echo "\n\n!!! Rebuilding $@; Must be manually edited..."
+	pyinstaller --noconfirm --windowed --onefile \
+	    --collect-data shamir_mnemonic \
+	    --hidden-import slip39 \
+	    --collect-data slip39 \
+		$<
+	mv SLIP-39.spec $@
 	@echo "!!! Regenerated $@: must be manually corrected!"
 	false  # Make the build fail if we've regenerated the .spec
 

SLIP-39.spec SLIP-39-macOS.specSLIP-39.spec renamed to SLIP-39-macOS.spec

@@ -50,9 +50,9 @@ coll = COLLECT(exe,
 app = BUNDLE(coll,
              name='SLIP-39.app',
              icon='images/SLIP-39.icns',
-             version='7.2.1',
+             version='7.3.0',
              info_plist={
-                 'CFBundleVersion':'7.2.1',
+                 'CFBundleVersion':'7.3.0',
                  'CFBundlePackageType':'APPL',
                  'LSApplicationCategoryType':'public.app-category.finance',
                  'LSMinimumSystemVersion':'10.15.0',

SLIP-39-win32.spec

@@ -0,0 +1,45 @@
+# -*- mode: python ; coding: utf-8 -*-
+from PyInstaller.utils.hooks import collect_data_files
+
+datas = []
+datas += collect_data_files('shamir_mnemonic')
+datas += collect_data_files('slip39')
+
+
+block_cipher = None
+
+
+a = Analysis(['SLIP-39.py'],
+             pathex=[],
+             binaries=[],
+             datas=datas,
+             hiddenimports=['slip39'],
+             hookspath=[],
+             hooksconfig={},
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,  
+          [],
+          name='SLIP-39',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=False,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None )

slip39/gui/main.py

@@ -24,9 +24,11 @@
 
 log				= logging.getLogger( __package__ )
 
-font				= ('Courier', 14)
-font_small			= ('Courier', 10)
-font_bold			= ('Courier', 16, 'bold italic')
+
+disp_points			= 14 # if sys.platform == 'darwin' else 9
+font				= ('Courier', disp_points+0)
+font_small			= ('Courier', disp_points-4)
+font_bold			= ('Courier', disp_points+2, 'bold italic')
 
 I_kwds				= dict(
     change_submits	= True,
@@ -638,13 +640,64 @@ def update_seed_recovered( window, values, details, passphrase=None ):
         return f"Recovered Seed {recohex!r} doesn't match expected: {window['-SEED-'].get()!r}"
 
 
+def user_name_full():
+    full_name			= None
+    if sys.platform == 'darwin':
+        command			= [ '/usr/sbin/scutil' ]
+        command_input		= "show State:/Users/ConsoleUser"
+    elif sys.platform == 'win32':
+        command			= [ 'net', 'user', os.environ['USERNAME'] ]
+        command_input		= None
+    else:  # assume *nix
+        command			= [ 'getent', 'passwd', os.environ['USER'] ]
+        command_input		= None
+
+    subproc			= subprocess.run(
+        command,
+        input		= command_input,
+        capture_output	= True,
+        encoding	= 'UTF-8',
+    )
+    assert subproc.returncode == 0 and subproc.stdout, \
+        f"{' '.join( command )!r} command failed, or no output returned"
+
+    if sys.platform == 'darwin':
+        for li in subproc.stdout.split( '\n' ):
+            if 'kCGSessionLongUserNameKey' in li:
+                # eg.: "      kCGSessionLongUserNameKey : Perry Kundert"
+                full_name	= li.split( ':' )[1].strip()
+                break
+    elif sys.platform == 'win32':
+        for li in subproc.stdout.split( '\n' ):
+            if li.startswith( 'Full Name' ):
+                # eg.: "Full Name                IEUser"
+                full_name	= li[9:].strip()
+                break
+    else:
+        # getent="perry:x:1002:1004:Perry Kundert,,,:/home/perry:/bin/bash"
+        # >>> getent.split(':')
+        # ['perry', 'x', '1002', '1004', 'Perry Kundert,,,', '/home/perry', '/bin/bash']
+        pwents			= subproc.stdout.split( ':' )
+        assert len( pwents ) > 4, \
+                f"Unrecognized passwd entry: {li}"
+        gecos			= pwents[4]
+        full_name		= gecos.split( ',' )[0]  # Discard ...,building,room,phone,...
+
+    assert full_name, \
+        "User's full name not found"
+    log.info( f"Current user's full name: {full_name!r}" )
+    return full_name
+
+
 def app(
     names			= None,
     group			= None,
     threshold			= None,
     cryptocurrency		= None,
     edit			= None,
     passphrase			= None,
+    scaling			= None,
+    no_titlebar			= False,
 ):
     """Convert sequence of group specifications into standard { "<group>": (<needs>, <size>) ... }"""
 
@@ -677,24 +730,9 @@ def app(
     #
     # If no name(s) supplied, try to get the User's full name.
     #
-    if not names and sys.platform == 'darwin':
+    if not names:
         try:
-            scutil		= subprocess.run(
-                [ '/usr/sbin/scutil' ],
-                input		= "show State:/Users/ConsoleUser",
-                capture_output	= True,
-                encoding	= 'UTF-8',
-            )
-            print( repr( scutil ))
-            assert scutil.returncode == 0 and scutil.stdout, \
-                "'scutil' command failed, or no output returned"
-            for li in scutil.stdout.split( '\n' ):
-                if 'kCGSessionLongUserNameKey' in li:
-                    # eg.: "      kCGSessionLongUserNameKey : Perry Kundert"
-                    full_name	= li.split( ':' )[1].strip()
-                    log.info( f"Current user's full name: {full_name!r}" )
-                    names	= [ full_name ]
-                    break
+            names		= [ user_name_full() ]
         except Exception as exc:
             logging.exception( f"Failed to discover user full name: {exc}" )
 
@@ -739,7 +777,10 @@ def app(
             window['-GROUPS-F-'].expand( expand_x=True )
         else:
             window		= sg.Window(
-                f"{', '.join( names or [ 'SLIP-39' ] )} Mnemonic Cards", layout, grab_anywhere=True,
+                f"{', '.join( names or [ 'SLIP-39' ] )} Mnemonic Cards", layout,
+                grab_anywhere	= True,
+                no_titlebar	= no_titlebar,
+                scaling		= scaling,
             )
             timeout		= 0 		# First time through w/ new window, refresh immediately
 
@@ -1050,6 +1091,11 @@ def main( argv=None ):
     ap.add_argument( '--passphrase',
                      default=None,
                      help="Encrypt the master secret w/ this passphrase, '-' reads it from stdin (default: None/'')" )
+    ap.add_argument( '-s', '--scaling',
+                     default=1, type=float,
+                     help="Scaling for display (eg. 1.5, 0.5 for high-resolution displays), if not automatically detected")
+    ap.add_argument( '--no-titlebar', default=False, action='store_true',
+                     help="Avoid displaying a title bar and border on main window" )
     ap.add_argument( 'names', nargs="*",
                      help="Account names to produce")
     args			= ap.parse_args( argv )
@@ -1061,6 +1107,12 @@ def main( argv=None ):
     if args.verbose:
         logging.getLogger().setLevel( log_cfg['level'] )
 
+    if sys.platform == 'win32':
+        # Establishes a common baseline size on macOS and Windows, as long as
+        # SetProcessDpiAwareness( 1 ) is set, and scaling == 1.0.  Ignored on macOS.
+        from ctypes import windll
+        windll.shcore.SetProcessDpiAwareness(1)
+
     try:
         app(
             names		= args.names,
@@ -1069,6 +1121,8 @@ def main( argv=None ):
             cryptocurrency	= args.cryptocurrency,
             edit		= args.path,
             passphrase		= args.passphrase,
+            no_titlebar		= args.no_titlebar,
+            scaling		= args.scaling,
         )
     except Exception as exc:
         log.exception( f"Failed running App: {exc}" )

slip39/version.py

@@ -1,2 +1,2 @@
-__version_info__		= ( 7, 2, 1 )
+__version_info__		= ( 7, 3, 0 )
 __version__			= '.'.join( map( str, __version_info__ ))