fixing windows lnk installation

Author: s-n-g

devel/build_install_pyradio.bat

@@ -119,11 +119,17 @@ CD ..
 
 :: Install lnk file
 ECHO *** Installing Dekstop Shortcut
-COPY /Y %APPDATA%\pyradio\help\*.lnk %DESKTOP% >NUL
-IF EXIST "%APPDATA%\Microsoft\Windows\Start Menu\Programs" (
-    ECHO *** Installing Start Menu Shortcut
-    COPY /Y %APPDATA%\pyradio\help\*.lnk "%APPDATA%\Microsoft\Windows\Start Menu\Programs" >NUL
-)
+REM DEL %USERPROFILE%\desktop\PyRadio.lnk >NUL
+REM DEL "%APPDATA%\Microsoft\Windows\Start Menu\Programs\PyRadio.lnk" >NUL
+REM REM COPY /Y %APPDATA%\pyradio\help\PyRadio.lnk %DESKTOP% >NUL
+REM COPY /Y %APPDATA%\pyradio\help\PyRadio.lnk %USERPROFILE%\desktop >NUL
+REM IF EXIST "%APPDATA%\Microsoft\Windows\Start Menu\Programs" (
+REM     ECHO *** Installing Start Menu Shortcut
+REM     COPY /Y %APPDATA%\pyradio\help\PyRadio.lnk "%APPDATA%\Microsoft\Windows\Start Menu\Programs" >NUL
+REM )
+CD pyradio
+%PROGRAM% -c "from win import install_pyradio_link; install_pyradio_link()"
+CD ..
 
 :: Clean up
 CD pyradio

pyradio/cjkwrap.py

@@ -29,6 +29,9 @@
 import unicodedata
 import sys
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 PY3 = sys.version[0] == '3'
 
 if PY3:

pyradio/compare_files.py

@@ -1,5 +1,8 @@
 import hashlib
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 class CompareFiles(object):
     ''' Class to compare two files  by content '''
 

pyradio/config.py

@@ -41,6 +41,8 @@
 
 SUPPORTED_PLAYERS = ('mpv', 'mplayer', 'vlc')
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
 
 class PyRadioStations(object):
     ''' PyRadio stations file management '''

pyradio/del_vlc_log.py

@@ -1,6 +1,8 @@
 import os
 from sys import platform
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
 
 def RemoveWinVlcLogFiles(*args):
     ''' Removes all VLC log files within pyradio config

pyradio/install.py

@@ -7,6 +7,10 @@
 import json
 from time import sleep
 import site
+
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 try:
     from os.path import curdir, exists
     import ctypes

pyradio/log.py

@@ -13,6 +13,9 @@
 from .common import player_start_stop_token
 from .cjkwrap import cjklen, PY3
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 HAS_WIN10TOAST = True
 try:
     from win10toast import ToastNotifier

pyradio/main.py

@@ -15,6 +15,9 @@
 from .cjkwrap import cjklen, cjkslices, fill
 from .log import Log
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 PATTERN = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
 PATTERN_TITLE = '%(asctime)s | %(message)s'
 
@@ -400,7 +403,6 @@ def shell():
         ret = pyradio_config.read_playlist_file(
             stationFile=args.stations,
             is_last_playlist=is_last_playlist)
-        print('ret = {}'.format(ret))
         if ret < 0:
             print_playlist_selection_error(args.stations, pyradio_config, ret)
 

pyradio/ping.py

@@ -1,6 +1,9 @@
 import subprocess
 from sys import platform, version_info
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 def ping(server, count=10, timeout_in_seconds=1):
     ''' ping a server on any platform
         Returns:

pyradio/player.py

@@ -11,6 +11,10 @@
 import collections
 import json
 import socket
+
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 try:
     import psutil
 except:

pyradio/themes.py

@@ -14,6 +14,9 @@
 
 logger = logging.getLogger(__name__)
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 def isLightOrDark(rgbColor=[0,128,255]):
     [r,g,b]=rgbColor
     '''

pyradio/win.py

@@ -12,6 +12,9 @@
 import subprocess
 from urllib.request import urlretrieve
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 HAVE_PYUNPACK = True
 try:
     from pyunpack import Archive
@@ -454,28 +457,106 @@ def clean_up(print_msg=True):
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL)
 
+def get_path(exe):
+    out_exe = ''
+    chk = []
+
+    for n in site.getsitepackages():
+        # print('adding: "{}"'.format(join(n, exe)))
+        # print('adding: "{}"'.format(join(n, 'Scripts', exe)))
+        chk.append(join(n, exe))
+        chk.append(join(n, 'Scripts', exe))
+    # print('------------------------')
+    x = site.getusersitepackages()
+    if isinstance(x, str):
+            # print('adding: "{}"'.format(join(x, exe)))
+            # print('adding: "{}"'.format(join(x, 'Scripts', exe)))
+            chk.append(join(x, exe))
+            chk.append(join(x, 'Scripts', exe))
+            # print('adding: "{}"'.format(join(x, exe)).replace('\site-packages', ''))
+            # print('adding: "{}"'.format(join(x, 'Scripts', exe)).replace('\site-packages', ''))
+            chk.append(join(x, exe).replace('\site-packages', ''))
+            chk.append(join(x, 'Scripts', exe).replace('\site-packages', ''))
+    else:
+        for n in site.getusersitepackages():
+            # print('adding: "{}"'.format(join(n, exe)))
+            # print('adding: "{}"'.format(join(n, 'Scripts', exe)))
+            chk.append(join(n, exe))
+            chk.append(join(n, 'Scripts', exe))
+    # print('------------------------')
+    for n in site.PREFIXES:
+        # print('adding: "{}"'.format(join(n, exe)))
+        # print('adding: "{}"'.format(join(n, 'Scripts', exe)))
+        chk.append(join(n, exe))
+        chk.append(join(n, 'Scripts', exe))
+    # for n in range(0,4):
+    #     print('')
+    # for n in chk:
+    #     print(n)
+    # print('------------------------')
+    for n in chk:
+        # print('checking: "{}'.format(n))
+        if exists(n):
+            return n
+    return ''
+
+def get_pyradio():
+    return get_path('pyradio.exe')
+
+def get_pylnk():
+    return get_path('pylnk3.exe')
+
 def create_pyradio_link():
-    sp = site.USER_SITE.split(sep)
-    sp[-1] = 'Scripts'
-    scripts_path = sep.join(sp)
-    pyradio_exe = join(scripts_path, 'pyradio.exe')
-    pylnk_exe = join(scripts_path, 'pylnk3.exe')
+    pyradio_exe = 'pyradio'
+    pyradio_exe = get_pyradio()
+    pylnk_exe = get_pylnk()
+    # print('pyradio_exe = "{}"'.format(pyradio_exe))
+    # print('pylnk_exe = "{}"'.format(pylnk_exe))
     icon = join(environ['APPDATA'], 'pyradio', 'help', 'pyradio.ico')
+    # print('icon = "{}"'.format(icon))
     link_path = join(environ['APPDATA'], 'pyradio', 'help', 'PyRadio.lnk')
+    # print('link_path = "{}"'.format(link_path))
     workdir = join(environ['APPDATA'], 'pyradio')
-    if exists(pyradio_exe):
-        print('*** Updating Dekstop Shortcut')
+    # print('workdir = "{}"'.format(workdir))
+    # print('*** Updating Dekstop Shortcut')
+    if not exists(workdir):
+        makedirs(workdir, exist_ok=True)
         if not exists(workdir):
-            makedirs(workdir, exist_ok=True)
-            if not exists(workdir):
-                print('Cannot create "' + workdir + '"')
-                sys.exit(1)
-        if not exists(pylnk_exe):
-            install_pylnk(workdir)
-        cmd = pylnk_exe + ' c --icon ' + icon + ' --workdir ' + workdir \
-            + ' ' + pyradio_exe + ' ' + link_path
-        #print(cmd)
-        subprocess.call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            print('Cannot create "' + workdir + '"')
+            sys.exit(1)
+    if not exists(pylnk_exe):
+        install_pylnk(workdir)
+    pylnk_exe = get_pylnk()
+    # print('pylnk_exe = "{}"'.format(pylnk_exe))
+    cmd = pylnk_exe + ' c --icon ' + icon + ' --workdir ' + workdir \
+        + ' ' + pyradio_exe + ' ' + link_path
+    # print('cmd = "{}"'.format(cmd))
+    subprocess.Popen(
+        [pylnk_exe, 'c', '--icon', icon, '--workdir', workdir, pyradio_exe, link_path],
+        shell=True,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL
+    )
+
+def install_pyradio_link():
+    from shutil import copy
+    desktop = getenv('DESKTOP')
+    user_profile = getenv('USERPROFILE')
+    appdata = getenv('APPDATA')
+    to_desktop = desktop if desktop is not None else join(user_profile, 'desktop')
+    to_start_menu = join(appdata, 'Microsoft', 'Windows', 'Start Menu', 'Programs')
+
+    if exists(to_desktop):
+            copy(
+                join(appdata, 'pyradio', 'help', 'PyRadio.lnk'),
+                join(to_desktop, 'PyRadio.lnk')
+            )
+
+    if exists(to_start_menu):
+            copy(
+                join(appdata, 'pyradio', 'help', 'PyRadio.lnk'),
+                join(to_start_menu, 'PyRadio.lnk')
+            )
 
 if __name__ == '__main__':
     # _post_download(1, "C:\\Users\\spiros\\AppData\\Roaming\\pyradio")

pyradio/win_del_old_inst.py

@@ -2,6 +2,9 @@
 import os
 from sys import platform
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 def win_del_old_inst():
     if not platform.startswith('win'):
         return False

pyradio/window_stack.py

@@ -5,6 +5,9 @@
 locale.setlocale(locale.LC_ALL, "")
 logger = logging.getLogger(__name__)
 
+import locale
+locale.setlocale(locale.LC_ALL, "")
+
 
 class Window_Stack_Constants(object):
     ''' Modes of Operation '''