Skip to content

Commit

Permalink
Merge pull request #5 from dardizzola/svil-010107
Browse files Browse the repository at this point in the history
Svil 010107
  • Loading branch information
dardizzola authored Jul 1, 2024
2 parents 247b7cc + 88bb73f commit c38e19c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion LaMuccaRossaVideoDownloader/DownloadUpdate.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private async Task StartUpdate()
await Dispatcher.InvokeAsync(() => HeadlineTextBlock.Text = $"{FindResource("DownloadingUpdateSetup")}");
using var fs = new ProgressStream(new FileStream(GlobalConsts.UpdateSetupLocation, FileMode.Create));
fs.BytesWritten += DownloadProgressChanged;
var latestVersionLink = await httpClient.GetAsync("https://raw.githubusercontent.com/dardizzola/LaMuccaRossaVideoDownloader/main/LaMuccaRossaVideoDownloader/latestVersionLink.txt").ConfigureAwait(false);
var latestVersionLink = await httpClient.GetAsync("https://raw.githubusercontent.com/dardizzola/YouTubeDownloaderAllInOne/main/LaMuccaRossaVideoDownloader/latestVersionLink.txt").ConfigureAwait(false);
var response = await httpClient.GetAsync(await latestVersionLink.Content.ReadAsStringAsync().ConfigureAwait(false)).ConfigureAwait(false);
await Dispatcher.InvokeAsync(() => CurrentDownloadProgressBar.Maximum = response.Content.Headers.ContentLength ?? 0);
await response.Content.CopyToAsync(fs, cancellationTokenSource.Token).ContinueWith(async a =>
Expand Down
2 changes: 1 addition & 1 deletion LaMuccaRossaVideoDownloader/GlobalConsts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ static class GlobalConsts
public static readonly string FFmpegFilePath;
private static readonly string _configFilePath;
private static readonly string _errorFilePath;
public static readonly Version VERSION = new(1, 9, 24);
public static readonly Version VERSION = new(1, 9, 25);
public static bool UpdateOnExit;
public static string UpdateSetupLocation;
public static bool UpdateFinishedDownloading;
Expand Down
4 changes: 2 additions & 2 deletions LaMuccaRossaVideoDownloader/Skeleton.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ private async Task CheckForUpdates()
{
using var client = new HttpClient();
client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue() { NoCache = true };
var response = await client.GetStringAsync("https://raw.githubusercontent.com/dardizzola/LaMuccaRossaVideoDownloader/main/LaMuccaRossaVideoDownloader/latestVersionWithRevision.txt");
var response = await client.GetStringAsync("https://raw.githubusercontent.com/dardizzola/YouTubeDownloaderAllInOne/main/LaMuccaRossaVideoDownloader/latestVersionWithRevision.txt");
var latestVersion = Version.Parse(response);

if (latestVersion > GlobalConsts.VERSION)
{
var changelog = await client.GetStringAsync("https://raw.githubusercontent.com/dardizzola/LaMuccaRossaVideoDownloader/main/LaMuccaRossaVideoDownloader/changelog.txt");
var changelog = await client.GetStringAsync("https://raw.githubusercontent.com/dardizzola/YouTubeDownloaderAllInOne/main/LaMuccaRossaVideoDownloader/changelog.txt");
var dialogSettings = new MetroDialogSettings()
{
AffirmativeButtonText = $"{FindResource("UpdateNow")}",
Expand Down
2 changes: 1 addition & 1 deletion LaMuccaRossaVideoDownloader/latestVersionLink.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/dardizzola/LaMuccaRossaVideoDownloader/releases/download/1.9.25/LaMuccaRossaVideoDownloader.exe
https://github.com/dardizzola/YouTubeDownloaderAllInOne/releases/download/1.9.25/Setup.LaMuccaRossaVideoDownloader.exe
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Questo programma, fornito gratuitamente da [La Mucca Rossa](https://muccarossa.com), serve per scaricare intere playlist o canali o anche singoli video da YouTube.


[Clicca qui per scaricare l'installer](https://github.com/dardizzola/LaMuccaRossaVideoDownloader/releases/download/1.9.25/LaMuccaRossaVideoDownloader.exe)
[Clicca qui per scaricare l'installer](https://github.com/dardizzola/YouTubeDownloaderAllInOne/releases/download/1.9.25/Setup.LaMuccaRossaVideoDownloader.exe)

## Caratteristiche principali
- TOTALMENTE GRATUITA
Expand Down
6 changes: 3 additions & 3 deletions YPDSetup/YPDSetup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ DefaultGroupName=La Mucca Rossa Video Downloader
AllowNoIcons=yes
OutputDir=..\Installer Output\1.9.25\
OutputBaseFilename=Setup.LaMuccaRossaVideoDownloader
SetupIconFile=..\YoutubePlaylistDownloader\finalIcon.ico
SetupIconFile=..\LaMuccaRossaVideoDownloader\finalIcon.ico
Compression=lzma
SolidCompression=yes
UninstallDisplayIcon=..\YoutubePlaylistDownloader\finalIcon.ico
UninstallDisplayIcon=..\LaMuccaRossaVideoDownloader\finalIcon.ico

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
Expand All @@ -35,7 +35,7 @@ Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";

[Files]
Source: "..\YoutubePlaylistDownloader\bin\Debug\net8.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\LaMuccaRossaVideoDownloader\bin\Debug\net8.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\FFmpeg\ffmpeg.exe"; DestDir: "{app}"; Flags: ignoreversion

; NOTE: Don't use "Flags: ignoreversion" on any shared system files
Expand Down

0 comments on commit c38e19c

Please sign in to comment.