diff --git a/README.md b/README.md index 42fa817..1a8b09b 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,9 @@ Alle Downloads kommen von der eigenen Gitea-Instanz (git.24-music.de) oder offiz | 10 | Google Chrome | Google | | 11 | Habbo Launcher | Gitea: Habbo-Launcher | | 12 | JDownloader 2 + Backup | Gitea: JDownloader-Setup | -| 13 | Desktop-Ordner (Downloader Fertig/Downloader Unfertig/Entpackt) + File-Uploader | Gitea: File-Uploader | -| 14 | Scripte (Rename MKV AVI etc.) | Gitea: xabbo-scripts | -| 15 | Twitch VOD Manager | Gitea: Twitch-VOD-Manager | -| 16 | Multi-Hoster-Upload | Gitea: [Administrator/Multi-Hoster-Upload](https://git.24-music.de/Administrator/Multi-Hoster-Upload), latest Release | -| 17 | Real-Debrid-Downloader + `.mdd` Data-File auf Desktop | GitHub: Sucukdeluxe/multi-debrid-downloader | +| 13 | Twitch VOD Manager | Gitea: [Administrator/Twitch-VOD-Manager](https://git.24-music.de/Administrator/Twitch-VOD-Manager), latest Release | +| 14 | Multi-Hoster-Upload | Gitea: [Administrator/Multi-Hoster-Upload](https://git.24-music.de/Administrator/Multi-Hoster-Upload), latest Release | +| 15 | Multi-Debrid Downloader | GitHub: [Sucukdeluxe/multi-debrid-downloader](https://github.com/Sucukdeluxe/multi-debrid-downloader), latest Release | ## Windows-Einstellungen @@ -37,20 +35,18 @@ Alle Downloads kommen von der eigenen Gitea-Instanz (git.24-music.de) oder offiz ## Gitea Repos -Alle eigenen Tools werden ueber die Gitea API (latest Release) geladen. Der Multi-Debrid-Downloader kommt aus seinem kanonischen GitHub-Release: +Alle eigenen Tools werden ueber die Gitea API (latest Release) geladen. Der Multi-Debrid Downloader kommt aus seinem kanonischen GitHub-Release: | Repo | Inhalt | |------|--------| | [G-Earth](https://git.24-music.de/Administrator/G-Earth) | Habbo Packet Interceptor | | [Habbo-Launcher](https://git.24-music.de/Administrator/Habbo-Launcher) | Habbo Hotel Launcher | | [JDownloader-Setup](https://git.24-music.de/Administrator/JDownloader-Setup) | JD2 Installer + Config Backup | -| [File-Uploader](https://git.24-music.de/Administrator/File-Uploader) | File-Uploader fuer Desktop | -| [xabbo-scripts](https://git.24-music.de/Administrator/xabbo-scripts) | Xabbo Scripte | | [dotnet-runtimes](https://git.24-music.de/Administrator/dotnet-runtimes) | .NET 6.0 + 8.0 Desktop Runtime | | [ffmpeg](https://git.24-music.de/Administrator/ffmpeg) | FFmpeg Essentials Build (Mirror von gyan.dev) | -| [Twitch-VOD-Manager](https://git.24-music.de/Administrator/Twitch-VOD-Manager) | Twitch VOD Manager | +| [Twitch-VOD-Manager](https://git.24-music.de/Administrator/Twitch-VOD-Manager) | Twitch VOD Manager, latest Release | | [Multi-Hoster-Upload](https://git.24-music.de/Administrator/Multi-Hoster-Upload) | Multi-Hoster Upload Tool, latest Release | -| [multi-debrid-downloader](https://github.com/Sucukdeluxe/multi-debrid-downloader) | Real-Debrid Downloader + `.mdd` Data-File | +| [multi-debrid-downloader](https://github.com/Sucukdeluxe/multi-debrid-downloader) | Multi-Debrid Downloader, latest Release | ## Benutzung @@ -67,6 +63,15 @@ Alle eigenen Tools werden ueber die Gitea API (latest Release) geladen. Der Mult ## Changelog +### v2.6.0 +- Desktop-Ordner "Downloader Fertig", "Downloader Unfertig" und "Entpackt" werden nicht mehr angelegt +- File-Uploader wird nicht mehr installiert (Quelle `Administrator/File-Uploader` entfaellt) +- Scripte-Paket wird nicht mehr auf den Desktop entpackt (Quelle `Administrator/xabbo-scripts` entfaellt) +- Real-Debrid-Downloader heisst jetzt durchgaengig Multi-Debrid Downloader +- Veralteter `.mdd`-Download entfernt, da der aktuelle Downloader-Release kein `.mdd`-Asset mehr veroeffentlicht +- Twitch VOD Manager und Multi-Hoster-Upload beziehen weiterhin automatisch das aktuelle Gitea-Release (aktuell 1.0.5 bzw. 2.1.13) +- Setup umfasst jetzt 16 statt 18 Schritte + ### v2.5.1 - Multi-Hoster-Upload bleibt auf der kanonischen Gitea-Quelle `Administrator/Multi-Hoster-Upload` und bezieht automatisch das aktuelle Setup-Asset. - Uploader-Produktrelease v2.0.4 wird ueber den privaten Transport-Tag v3.3.112 ausgeliefert. diff --git a/VServerSetup.ps1 b/VServerSetup.ps1 index d4c1b33..886f182 100644 --- a/VServerSetup.ps1 +++ b/VServerSetup.ps1 @@ -8,13 +8,13 @@ $ProgressPreference = "SilentlyContinue" $tempDir = "$env:TEMP\vserver-setup" $desktopPath = [Environment]::GetFolderPath("Desktop") $winrarPath = "C:\Program Files\WinRAR\WinRAR.exe" -$vserverSetupVersion = "2.5.1" +$vserverSetupVersion = "2.6.0" $giteaBaseUrl = "https://git.24-music.de" $githubApiBaseUrl = "https://api.github.com" $githubDownloaderRepo = "Sucukdeluxe/multi-debrid-downloader" $multiHosterRepo = "Multi-Hoster-Upload" $multiHosterSourceUrl = "$giteaBaseUrl/Administrator/$multiHosterRepo" -$totalSteps = 18 +$totalSteps = 16 New-Item -ItemType Directory -Force -Path $tempDir | Out-Null @@ -76,27 +76,6 @@ function Get-GitHub-Latest-Asset { return $asset } -function Copy-Gitea-DataFile-To-Desktop { - param($Repo, $Filter) - try { - $asset = Get-Gitea-Latest-Asset -Repo $Repo -Filter $Filter - if (-not $asset) { - Write-Host " WARNUNG: Kein Asset '$Filter' im Release gefunden" -ForegroundColor Yellow - return - } - $destPath = Join-Path $desktopPath $asset.name - if (Test-Path $destPath) { - Write-Host " $($asset.name) bereits vorhanden - ueberspringe." -ForegroundColor Gray - return - } - if (Download-File -Url $asset.browser_download_url -Output $destPath) { - Write-Host " $($asset.name) auf Desktop!" -ForegroundColor Green - } - } catch { - Write-Host " FEHLER beim Laden der Data-Datei: $_" -ForegroundColor Red - } -} - function Install-Gitea-App { param($Name, $Repo, $StepNum, $DetectPaths, $ProcessName) Write-Host "" @@ -165,27 +144,6 @@ function Install-GitHub-App { } } -function Copy-GitHub-DataFile-To-Desktop { - param($Repo, $Filter) - try { - $asset = Get-GitHub-Latest-Asset -Repo $Repo -Filter $Filter - if (-not $asset) { - Write-Host " WARNUNG: Kein Asset '$Filter' im GitHub-Release gefunden" -ForegroundColor Yellow - return - } - $destPath = Join-Path $desktopPath $asset.name - if (Test-Path $destPath) { - Write-Host " $($asset.name) bereits vorhanden - ueberspringe." -ForegroundColor Gray - return - } - if (Download-File -Url $asset.browser_download_url -Output $destPath) { - Write-Host " $($asset.name) auf Desktop!" -ForegroundColor Green - } - } catch { - Write-Host " FEHLER beim Laden der GitHub-Datei: $_" -ForegroundColor Red - } -} - # 1. PYTHON Write-Host "" Write-Host "[1/$totalSteps] Python..." -ForegroundColor Yellow @@ -486,75 +444,28 @@ if ($jdPath) { Write-Host " JDownloader-Ordner nicht gefunden - Backup uebersprungen" -ForegroundColor Yellow } -# 13. DESKTOP ORDNER + FILE-UPLOADER -Write-Host "" -Write-Host "[13/$totalSteps] Desktop Ordner..." -ForegroundColor Yellow - -foreach ($folder in @("Downloader Fertig", "Downloader Unfertig", "Entpackt")) { - if (Test-Path "$desktopPath\$folder") { - Write-Host " Ordner '$folder' bereits vorhanden." -ForegroundColor Gray - } else { - Write-Host " Erstelle Ordner '$folder'..." -ForegroundColor Gray - New-Item -ItemType Directory -Force -Path "$desktopPath\$folder" | Out-Null - } -} - -if (Test-Path "$desktopPath\File-Uploader") { - Write-Host " File-Uploader bereits vorhanden - ueberspringe." -ForegroundColor Gray -} else { - Write-Host " Hole File-Uploader von Gitea..." -ForegroundColor Gray - try { - $fuAsset = Get-Gitea-Latest-Asset -Repo "File-Uploader" -Filter "*.rar" - } catch { $fuAsset = $null } - $uploaderRar = "$tempDir\FileUploader.rar" - if ($fuAsset -and (Download-File -Url $fuAsset.browser_download_url -Output $uploaderRar)) { - if (Unrar-File -RarPath $uploaderRar -DestPath $desktopPath) { - Write-Host " File-Uploader installiert!" -ForegroundColor Green - } - } -} - -# 14. SCRIPTE -Write-Host "" -Write-Host "[14/$totalSteps] Scripte..." -ForegroundColor Yellow -if (Test-Path "$desktopPath\Rename MKV AVI.py") { - Write-Host " Bereits vorhanden - ueberspringe." -ForegroundColor Gray -} else { - try { - $scriptAsset = Get-Gitea-Latest-Asset -Repo "xabbo-scripts" -Filter "*.rar" - } catch { $scriptAsset = $null } - $scripteRar = "$tempDir\Scripte.rar" - if ($scriptAsset -and (Download-File -Url $scriptAsset.browser_download_url -Output $scripteRar)) { - Write-Host " Entpacke Scripte auf Desktop..." -ForegroundColor Gray - if (Unrar-File -RarPath $scripteRar -DestPath $desktopPath) { - Write-Host " Scripte installiert!" -ForegroundColor Green - } - } -} - -# 15. TWITCH VOD MANAGER (von Gitea) +# 13. TWITCH VOD MANAGER (von Gitea) Install-Gitea-App -Name "Twitch VOD Manager" -Repo "Twitch-VOD-Manager" ` - -StepNum 15 ` + -StepNum 13 ` -DetectPaths @("$env:LOCALAPPDATA\Programs\twitch-vod-manager\Twitch VOD Manager.exe", "$desktopPath\Twitch VOD Manager.lnk") ` -ProcessName "Twitch VOD Manager" -# 16. MULTI-HOSTER-UPLOAD (von Gitea) +# 14. MULTI-HOSTER-UPLOAD (von Gitea) Write-Host " Quelle: $multiHosterSourceUrl (latest Release)" -ForegroundColor Gray Install-Gitea-App -Name "Multi-Hoster-Upload" -Repo $multiHosterRepo ` - -StepNum 16 ` + -StepNum 14 ` -DetectPaths @("$env:LOCALAPPDATA\Programs\multi-hoster-upload\Multi-Hoster-Upload.exe", "$desktopPath\Multi-Hoster-Upload.lnk") ` -ProcessName "Multi-Hoster-Upload" -# 17. REAL-DEBRID-DOWNLOADER (von GitHub) -Install-GitHub-App -Name "Real-Debrid-Downloader" -Repo $githubDownloaderRepo ` - -StepNum 17 ` +# 15. MULTI-DEBRID DOWNLOADER (von GitHub) +Install-GitHub-App -Name "Multi-Debrid Downloader" -Repo $githubDownloaderRepo ` + -StepNum 15 ` -DetectPaths @("$env:LOCALAPPDATA\Programs\real-debrid-downloader\Real-Debrid-Downloader.exe", "$desktopPath\Real-Debrid-Downloader.lnk") ` -ProcessName "Real-Debrid-Downloader" -Copy-GitHub-DataFile-To-Desktop -Repo $githubDownloaderRepo -Filter "*.mdd" -# 18. WINDOWS EINSTELLUNGEN +# 16. WINDOWS EINSTELLUNGEN Write-Host "" -Write-Host "[18/$totalSteps] Windows Einstellungen..." -ForegroundColor Yellow +Write-Host "[16/$totalSteps] Windows Einstellungen..." -ForegroundColor Yellow # IE Enhanced Security Configuration deaktivieren Write-Host " IE Enhanced Security deaktivieren..." -ForegroundColor Gray