From b6e8ff53b2a57b5d70f13bb1e54527378a98d5e1 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Tue, 11 Oct 2022 17:05:20 +0200 Subject: [PATCH] fix invalid metadata fix issues with invalid data from CR #542 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 151040 -> 154624 bytes Crunchyroll Downloader/Main.vb | 30 ++++++++++++++---- .../My Project/Resources.Designer.vb | 21 ++++++++++++ .../My Project/Resources.resx | 15 +++++++++ .../einstellungen.Designer.vb | 4 +-- Crunchyroll Downloader/einstellungen.resx | 3 -- 6 files changed, 61 insertions(+), 12 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 36e88109c1f8e4b9ed0d02eab7d5bc3475e7faa6..3ffdceea33b5f03c6eedab9bd88531a0e889b78e 100644 GIT binary patch delta 7422 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 + ''' Sucht eine lokalisierte Zeichenfolge, die ;FFMETADATA1 + '''title=[Titel] + ''' + '''[CHAPTER] + '''TIMEBASE=1/1000 + '''START=1 + '''END=[Start-1] + ''' + '''[CHAPTER] + '''TIMEBASE=1/1000 + '''START=[Start] + '''END=[duration_ms] + '''title=Ending ähnelt. + ''' + Friend ReadOnly Property ffmpeg_metadata_out() As String + Get + Return ResourceManager.GetString("ffmpeg_metadata_out", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0" ähnelt. ''' diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx index 0e2956b..aa84b5a 100644 --- a/Crunchyroll Downloader/My Project/Resources.resx +++ b/Crunchyroll Downloader/My Project/Resources.resx @@ -547,4 +547,19 @@ TIMEBASE=1/1000 START=[after] END=[duration_ms] + + ;FFMETADATA1 +title=[Titel] + +[CHAPTER] +TIMEBASE=1/1000 +START=1 +END=[Start-1] + +[CHAPTER] +TIMEBASE=1/1000 +START=[Start] +END=[duration_ms] +title=Ending + \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 8d14f8f..68f3fe7 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -534,7 +534,7 @@ Partial Class Einstellungen Me.CB_Merge.IntegralHeight = False Me.CB_Merge.ItemHeight = 23 Me.CB_Merge.Items.AddRange(New Object() {"[Merge Disabeld]"}) - Me.CB_Merge.Location = New System.Drawing.Point(249, 31) + Me.CB_Merge.Location = New System.Drawing.Point(265, 25) Me.CB_Merge.Name = "CB_Merge" Me.CB_Merge.Size = New System.Drawing.Size(175, 29) Me.CB_Merge.TabIndex = 19 @@ -548,7 +548,7 @@ Partial Class Einstellungen Me.CB_Format.IntegralHeight = False Me.CB_Format.ItemHeight = 23 Me.CB_Format.Items.AddRange(New Object() {"MP4", "MKV", "AAC (Audio only)"}) - Me.CB_Format.Location = New System.Drawing.Point(25, 31) + Me.CB_Format.Location = New System.Drawing.Point(50, 25) Me.CB_Format.Name = "CB_Format" Me.CB_Format.Size = New System.Drawing.Size(175, 29) Me.CB_Format.TabIndex = 17 diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index f49b9b4..e809bf5 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,9 +126,6 @@ 118, 20 - - 118, 20 - 332, 20