Check-in [078495e7da]
Overview
Comment: | Minor changes to winstaller script and default package content. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
078495e7dab968ad2ab7ede43d8f1a39 |
User & Date: | mario on 2016-12-01 13:18:51 |
Other Links: | manifest | tags |
Context
2016-12-01
| ||
13:19 | Fix help.chm lookup and default Windows paths. check-in: a88fe29963 user: mario tags: trunk | |
13:18 | Minor changes to winstaller script and default package content. check-in: 078495e7da user: mario tags: trunk | |
2016-11-29
| ||
20:29 | Expanded the manual on the search function, added more gui/key markup. check-in: cc545daac0 user: mario tags: trunk | |
Changes
Modified dev/install_python_gtk.ps1 from [54898f5dc1] to [b3f784399d].
︙ | ︙ | |||
25 26 27 28 29 30 31 | [string]$AboutLink = "http://freshcode.club/projects/streamtuner2" #[string]$ModifyPath = $MyInvocation.MyCommand.Path -replace (".ps1", ".bat") ) #-- paths $UsrFolder = $MyInvocation.MyCommand.Path -replace ("([\\/][^\\/]+){4}$","") $UninstallPath = "$UsrFolder\share\streamtuner2\dev\uninstall.cmd" | | > < < | | > | > | > | > | > | > | | > | < < < < | < < < < | < < < < | < < < < | < < < < | < < < < | < < < < | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | [string]$AboutLink = "http://freshcode.club/projects/streamtuner2" #[string]$ModifyPath = $MyInvocation.MyCommand.Path -replace (".ps1", ".bat") ) #-- paths $UsrFolder = $MyInvocation.MyCommand.Path -replace ("([\\/][^\\/]+){4}$","") $UninstallPath = "$UsrFolder\share\streamtuner2\dev\uninstall.cmd" $ModifyPath = $MyInvocation.MyCommand.Path -replace ("[.]ps1$", ".bat") $IconPath = "$UsrFolder\share\pixmaps\streamtuner2.ico" #-- system configuration $ErrorActionPreference = "SilentlyContinue" # ignore all path/registry lookup errors $OutputEncoding = [System.Text.Encoding]::UTF8 $regPathCU = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Uninstall" $regPathLM = "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall" #64-Bit machine if(!(Test-Path $regPathLM)) { #32-Bit machine $regPathLM = "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall" $ProgramFiles = "%ProgramFiles%" } $STREAMRIPPER = "$ProgramFiles\Streamripper" #-- what and how to install # each row is a list of (title, url, cmd, msi args, regkey, pathcheck, is_optional, prelookup) $tasks = @( @( "Python 2.7.12", # title "https://www.python.org/ftp/python/2.7.12/python-2.7.12.msi", # url "", # custom cmd 'TARGETDIR="{PYTHON}" /qb-!', # msi args "$regPathLM\{9DA28CE5-0AA5-429E-86D8-686ED898C665}", # registry "{PYTHON}\pythonw.exe", # installed check "", # is optional? '' # check-prerequisiteβ$_found? ), @( "PyGtk 2.24.2", "http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.24/pygtk-all-in-one-2.24.2.win32-py2.7.msi", "", 'TARGETDIR="{PYTHON}" ADDLOCAL=ALL REMOVE=PythonExtensionModulePyGtkSourceview2,PythonExtensionModulePyGoocanvas,PythonExtensionModulePyRsvg,DevelopmentTools /qb-!', "$regPathLM\{09F82967-D26B-48AC-830E-33191EC177C8}", "$regPathLM\{09F82967-D26B-48AC-830E-33191EC177C8}", "", '' ), @( "Python requests", "requests", # no download url, pip handles this "easy_install", "", "", "{PYTHON}\Lib\site-packages\requests-2.12.1-py2.7.egg", "", '' ), @( "LXML 2.3", "https://pypi.python.org/packages/d4/fa/e4e0c7a8fe971b10e275cdc20efd16f553a225e700c400c11da25276e4f4/lxml-2.3-py2.7-win32.egg", "easy_install", "", "", "{PYTHON}\Lib\site-packages\lxml-2.3-py2.7-win32.egg", "", '' ), @( "PyQuery 1.2.1", "https://pypi.python.org/packages/62/71/8ac1f5c0251e51714d20e4b102710d5eee1683c916616129552b0a025ba5/pyquery-1.2.17-py2.py3-none-any.whl", "pip", "--disable-pip-version-check", "", "{PYTHON}\Lib\site-packages\pyquery-1.2.17.dist-info", "", '' ), @( "PIL 1.1.7", "http://effbot.org/downloads/PIL-1.1.7.win32-py2.7.exe", "", "", "$regPathCU\PIL-py2.7", "{PYTHON}\Lib\site-packages\PIL", "", '' ), @( "Streamripper 1.64.6", "https://netcologne.dl.sourceforge.net/project/streamripper/streamripper%20%28current%29/1.64.6/streamripper-windows-installer-1.64.6.exe", "", "/S /D={STREAMRIPPER}" #NSIS does not use double quotes in /D parm, "$regPathLM\Streamripper", "{STREAMRIPPER}\streamripper.exe", '($true)', # β could use '((Ask "Install streamripper too [y/N]") -match N)' instead '(($_found = (Get-ITPV "Streamripper")) -AND ($script:STREAMRIPPER = $_found))' # look up path in Check-Prerequisites ), @( "Uninstall script", "", 'Create-Uninstallscript' ), @( "Desktop shortcut", "", 'Make-Shortcut -dir $Home\Desktop -name Streamtuner2.lnk -target $PYTHON\pythonw.exe -arg $UsrFolder\bin\streamtuner2' ), @( "Startmenu shortcut", "", 'Make-Shortcut -dir "$StartMenu\Streamtuner2" -name Streamtuner2.lnk -target $PYTHON\pythonw.exe -arg $UsrFolder\bin\streamtuner2' ), @( "Startmenu help.chm", "", 'Make-Shortcut -dir "$StartMenu\Streamtuner2" -name Help.lnk -target $UsrFolder\share\streamtuner2\help\help.chm' ), @( "Startmenu uninstall", "", 'Make-Shortcut -dir "$StartMenu\Streamtuner2" -name Uninstall.lnk -target $UninstallPath' ), @( "Startmenu Internet", "", 'Make-Shortcut -dir "$StartMenu\Streamtuner2" -name "Streamtuner2 on the Web.lnk" -target "$AboutLink"' ), @( "Startmenu Reconfigure", "", 'Make-Shortcut -dir "$StartMenu\Streamtuner2" -name "Reconfigure.lnk" -target $ModifyPath' ), @( "FINISHED" ) ) #-- startup messages function Display-Logo { |
︙ | ︙ | |||
201 202 203 204 205 206 207 | | | | Installer for Python 2.7.12 & Gtk 2.24.2 | βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ "@ } function Ask-First { Write-Host "" | | | > | | | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | | | | Installer for Python 2.7.12 & Gtk 2.24.2 | βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ "@ } function Ask-First { Write-Host "" if ((Ask "Do you want to install Python and Gtk now? [Y/n] ") -notmatch "^[yY]|^$") { $tasks = $tasks[7..($tasks.length-1)] return } $reuseCachedFiles = (Ask "Reuse any cached setup files? [r]euse/[I]gnore) ") -match "^[Rr]" $optionalInstall = (Ask "Install optional components? [y/N] ") -match "^[Yy]" Write-Host "" return $reuseCachedFiles, $optionalInstall } function Console-MaxHeight { if ($Host.Name -match "console") { $MaxHeight = $host.UI.RawUI.MaxPhysicalWindowSize.Height |
︙ | ︙ | |||
230 231 232 233 234 235 236 | } #-- create Desktop/Startmenu shortcuts function Make-Shortcut { [CmdletBinding()] param($dir, $name, $target, $arg=$false) if (!(Test-Path -Path $dir)) { | | > | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | } #-- create Desktop/Startmenu shortcuts function Make-Shortcut { [CmdletBinding()] param($dir, $name, $target, $arg=$false) if (!(Test-Path -Path $dir)) { New-Item -Path $dir -ItemType directory 2> $null } $wsh = New-Object -ComObject WScript.Shell if (!$wsh) { return } $lnk = $wsh.CreateShortcut("$dir\$name") $lnk.TargetPath = $target if ($arg) { $lnk.Arguments = '"'+$arg+'"' $lnk.IconLocation = "$IconPath" $lnk.WorkingDirectory = "$UsrFolder\bin" } |
︙ | ︙ | |||
255 256 257 258 259 260 261 | $UninstallScriptPath = "$UsrFolder\share\streamtuner2\dev\uninstall.cmd" $installFolder = $usrFolder.substring(0,$usrFolder.LastIndexOf('\')) $UninstallScript = Get-Content -Path $UninstallScriptPath Out-File -FilePath $UninstallScriptPath -Encoding ascii -InputObject "@set installFolder=$installFolder" Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject "@set usrFolder=$usrFolder" Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject "@set Python=$PYTHON" Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject "@set StreamripperFolder=$STREAMRIPPER" | < < | < < | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | $UninstallScriptPath = "$UsrFolder\share\streamtuner2\dev\uninstall.cmd" $installFolder = $usrFolder.substring(0,$usrFolder.LastIndexOf('\')) $UninstallScript = Get-Content -Path $UninstallScriptPath Out-File -FilePath $UninstallScriptPath -Encoding ascii -InputObject "@set installFolder=$installFolder" Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject "@set usrFolder=$usrFolder" Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject "@set Python=$PYTHON" Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject "@set StreamripperFolder=$STREAMRIPPER" Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject "@echo off" for ($i=4; $i -lt $UninstallScript.Length ; $i++) { Out-File -FilePath $UninstallScriptPath -Encoding ascii -Append -InputObject $UninstallScript[$i] } #Out-File -FilePath "$UsrFolder\share\streamtuner2\dev\Y" -Encoding ascii -InputObject "Y" #if (Test-IsElevated) { #Write-Host " Writing to registry" Remove-Item -Path $regPathCU\Streamtuner2 2> $null |
︙ | ︙ | |||
311 312 313 314 315 316 317 318 319 320 | function Check-Package { if (!(Test-Path -Path("$UsrFolder\bin\streamtuner2"))) { Write-Host -b DarkRed -f White "`nThe bin\streamtuner2 start script could not be found.`nThe installation cannot continue.`nDo not change the folder structure of the Streamtuner2 package!`nIf you want to run the install_python_gtk.ps1 script post-install,`nplease use the -UsrFolder parameter.`n" Any-Key Red ; exit } } #-- Check if previous Python 2.7 installation exists function Check-PythonInstall { | > > > > > > < | | | | | 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 | function Check-Package { if (!(Test-Path -Path("$UsrFolder\bin\streamtuner2"))) { Write-Host -b DarkRed -f White "`nThe bin\streamtuner2 start script could not be found.`nThe installation cannot continue.`nDo not change the folder structure of the Streamtuner2 package!`nIf you want to run the install_python_gtk.ps1 script post-install,`nplease use the -UsrFolder parameter.`n" Any-Key Red ; exit } } #-- shortcut Get-ItemPropertyValue over multiple registry hives function Get-ITPV($regpath, $value="(default)") { @('HKLM:\Software\WOW6432Node', 'HKLM:\Software', 'HKCU:\Software') | % { if (($val = (Get-ItemProperty -path "$_\$regpath" 2>$null).$value) -AND (Test-Path $val)) { return $val } } } #-- Check if previous Python 2.7 installation exists function Check-PythonInstall { $PythonInstalledPath = Get-ITPV('Python\PythonCore\2.7\InstallPath\') #-- if Python 2.7.12 installed, reuse installation folder if (Get-Item -path "$regPathLM\{9DA28CE5-0AA5-429E-86D8-686ED898C665}" 2> $null ) { $PYTHON = $pythonInstalledPath -replace "\\$", "" } #-- older 2.7 version found else { if ($PythonInstalledPath) { Write-Host "" Write-Host -b Red -f White @" Setup has detected an older version of Python 2.7 in $PythonInstalledPath. It is strongly recommended to exit this setup now and uninstall the previous Python version before installing Streamtuner2. |
︙ | ︙ | |||
349 350 351 352 353 354 355 | return $PYTHON } #-- check prereqs installation function Check-Prerequisites { [CmdletBinding()] param($result = 1) | < | < > | < | < < < | < < > > | < < < | < | < < | | < < < < | | | | < < | < | | | | | < < > < < > | < < | | | | | 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 | return $PYTHON } #-- check prereqs installation function Check-Prerequisites { [CmdletBinding()] param($result = 1) ForEach ($task in $tasks) { $title, $url, $cmd, $args, $regkey, $checkpath, $is_optional, $presearch, $_found = $task; $checkpath = $checkpath -replace "{PYTHON}","$PYTHON" if (($is_optional -and !$optionalInstall) -or (!$regkey -and !$checkpath)) { continue } if ($presearch) { # expression for e.g. registry β path lookup Invoke-Expression $presearch # should set $_found + global $PLACEHOLDER variable } elseif ($checkpath) { if (Test-Path $checkpath) { $_found = $checkpath } } elseif ($regkey -and (Test-Path $regkey)) { $_found = $regkey -replace ".+\\", "" } if (!$_found) { Write-Host " - $title not found" $result = 0; } else { Write-Host -n " + $title found " # and display shortened path: Write-Host -f DarkGray "($($_found -replace '(?<!^.{1,4})(\\[^\\]+(?=\\)){2,5}(?!.?$)', '...'))" } } if ($result) { Write-Host -f Yellow @" `nAll required Python components are already installed. Use 'none', 'skip' or 'S' to skip them. Or just press ENTER on each prompt. If you want to reinstall them though, use 'all' or 'reinstall' or 'R'.`n "@ } else { Write-Host "" Write-Host -f Yellow "Setup is ready for installation now." } Any-Key Green } #-- ask before running Clear-Host Console-MaxHeight Display-Logo Check-Package $PYTHON = Check-PythonInstall $reuseCachedFiles, $optionalInstall = Ask-First Check-Prerequisites #-- process :tasks ForEach ($task in $tasks) { $title, $url, $cmd, $args, $regkey, $testpath, $is_optional, $presearch = $task | % { [regex]::Replace($_, "[#{](\w+)[}#]", { param($m) Invoke-Expression ("$"+$m.Groups[1].Value) }) } # options if ($is_optional -AND (Invoke-Expression $is_optional) -AND !$optionalInstall) { continue # optional expression test } # print step if ($title -match "\d+\.\d+") { $title = "Installing $title" } Write-Host -b DarkBlue "`n $title `n" chdir($TEMP); # test if element (file path or registry key) already exists: if ($testpath -AND ($reinstall -ne "all") -AND (Test-Path -Path $testpath)) { Write-Host -f Green -NoNewline " β Is already present." if ($reinstall -eq "none") { continue tasks } Switch -regex ( Ask " Reinstall [y/N/all/none]? " ) { "^all|always|re|^A" { $reinstall = "all"; break } "never|none|skip|^S" { $reinstall = "none"; continue tasks } "^y|yes|1|go|^R" { break } # YES ".*" { continue tasks } # everything else counts as NO } } # get "filename" part from url $file = [regex]::match($url, "/([^/]+?)([\?\#]|$)").Groups[1].Value; |
︙ | ︙ | |||
475 476 477 478 479 480 481 | if (!($file)) { $cmd = "& `"$PYTHON\Scripts\easy_install.exe`" $url" #" } else { $cmd = "& `"$PYTHON\Scripts\easy_install.exe`" $TEMP\$file" #" } } | < | < | > > > | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 | if (!($file)) { $cmd = "& `"$PYTHON\Scripts\easy_install.exe`" $url" #" } else { $cmd = "& `"$PYTHON\Scripts\easy_install.exe`" $TEMP\$file" #" } } Write-Host -f DarkYellow " β $cmd" Invoke-Expression "$cmd" } # msi elseif ($file -match ".+.msi$") { Write-Host -f DarkYellow (" β msiexec /i " + "$file " + $args) Start-Process -Wait msiexec -ArgumentList /i,"$TEMP\$file", $args if ($regkey) { Set-ItemProperty -Path "$regkey" -Name "WindowsInstaller" -Value "0" } } # exe elseif ($file -match ".+.exe$") { write-host -f DarkYellow " β $file $args" if ($args) { Start-Process -Wait "$TEMP\$file" -ArgumentList $args } else { Start-Process -Wait "$TEMP\$file" } } # other files elseif ($file) { echo " β $file" & "$TEMP\$file" } } #Clear-Host #Display-Logo Any-Key Green |
Modified st2.py from [05596eca4a] to [b518fe984d].
1 2 3 4 5 6 | #!/usr/bin/env python # encoding: UTF-8 # api: python # type: application # title: streamtuner2 # description: Directory browser for internet radio, audio and video streams | | | | | > | | | > | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | #!/usr/bin/env python # encoding: UTF-8 # api: python # type: application # title: streamtuner2 # description: Directory browser for internet radio, audio and video streams # version: 2.2.0-rc2 # state: stable # author: Mario Salzer <mario@include-once.org> # license: Public Domain # url: http://freshcode.club/projects/streamtuner2 # config: # { type: env, name: HTTP_PROXY, description: proxy for HTTP access } # { type: env, name: XDG_CONFIG_HOME, description: relocates user .config subdirectory } # category: sound # depends: pygtk | gi, threading, requests, pyquery, lxml # id: streamtuner2 # pack: *.py, gtk3.xml.gz, bin, channels/__init__.py, bundle/*.py, CREDITS, help/index.page, # streamtuner2.desktop, README, help/streamtuner2.1=/usr/share/man/man1/, # NEWS=/usr/share/doc/streamtuner2/, icon.png=/usr/share/pixmaps/streamtuner2.png # architecture: all # # Streamtuner2 is a GUI for browsing internet radio directories, # music collections, and video services - grouped by genres or # categories. It runs your preferred audio player or streamripper # for recording. # # It's an independent rewrite of streamtuner1. Being written in # Python, can be more easily extended and fixed. The mix of # JSON APIs, regex or PyQuery extraction simplifies collecting # station lists. # # Primarily radio stations are displayed, some channels however # are music collections. Commercial and sign-up services are not # an objective. # standard modules import sys import os import re from copy import copy |
︙ | ︙ |