Minor cleanup (#1065)

* Use minimally required file permissions * Cleanup
lay295 · May 18, 2024 · 398b102 · 398b102
1 parent 7331863
commit 398b102
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/TwitchDownloaderCore/Chat/ChatHtml.cs b/TwitchDownloaderCore/Chat/ChatHtml.cs
@@ -41,7 +41,7 @@ public static async Task SerializeAsync(string filePath, ChatRoot chatRoot, ITas
                 TwitchHelper.CreateDirectory(outputDirectory.FullName);
             }
 
-            await using var fs = File.Create(filePath);
+            await using var fs = File.Open(filePath, FileMode.Create, FileAccess.Write, FileShare.Read);
             await using var sw = new StreamWriter(fs);
 
             while (!templateReader.EndOfStream)

diff --git a/TwitchDownloaderCore/Chat/ChatJson.cs b/TwitchDownloaderCore/Chat/ChatJson.cs
@@ -171,7 +171,7 @@ private static async Task<JsonDocument> GetJsonDocumentAsync(Stream stream, stri
             }
         }
 
-#pragma warning disable CS0618
+#pragma warning disable CS0618 // Type or member is obsolete
         private static async Task UpgradeChatJson(ChatRoot chatRoot)
         {
             const int MAX_STREAM_LENGTH = 172_800; // 48 hours in seconds. https://help.twitch.tv/s/article/broadcast-guidelines
@@ -239,7 +239,7 @@ private static async Task UpgradeChatJson(ChatRoot chatRoot)
                 }
             }
         }
-#pragma warning restore CS0618
+#pragma warning restore CS0618 // Type or member is obsolete
 
         /// <summary>
         /// Asynchronously serializes a chat json file.
@@ -254,7 +254,7 @@ public static async Task SerializeAsync(string filePath, ChatRoot chatRoot, Chat
                 TwitchHelper.CreateDirectory(outputDirectory.FullName);
             }
 
-            await using var fs = File.Create(filePath);
+            await using var fs = File.Open(filePath, FileMode.Create, FileAccess.Write, FileShare.Read);
             switch (compression)
             {
                 case ChatCompression.None:

diff --git a/TwitchDownloaderCore/Tools/FfmpegMetadata.cs b/TwitchDownloaderCore/Tools/FfmpegMetadata.cs
@@ -8,15 +8,15 @@
 
 namespace TwitchDownloaderCore.Tools
 {
-    // https://ffmpeg.org/ffmpeg-formats.html#Metadata-1
+    // https://ffmpeg.org/ffmpeg-formats.html#Metadata-2
     public static class FfmpegMetadata
     {
         private const string LINE_FEED = "\u000A";
 
         public static async Task SerializeAsync(string filePath, string streamerName, string videoId, string videoTitle, DateTime videoCreation, int viewCount, string videoDescription = null,
             TimeSpan startOffset = default, IEnumerable<VideoMomentEdge> videoMomentEdges = null, CancellationToken cancellationToken = default)
         {
-            await using var fs = new FileStream(filePath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.Read);
+            await using var fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read);
             await using var sw = new StreamWriter(fs) { NewLine = LINE_FEED };
 
             await SerializeGlobalMetadata(sw, streamerName, videoId, videoTitle, videoCreation, viewCount, videoDescription);

diff --git a/TwitchDownloaderWPF/WindowSettings.xaml.cs b/TwitchDownloaderWPF/WindowSettings.xaml.cs
@@ -8,7 +8,6 @@
 using TwitchDownloaderWPF.Models;
 using TwitchDownloaderWPF.Properties;
 using TwitchDownloaderWPF.Services;
-using CheckComboBox = HandyControl.Controls.CheckComboBox;
 using CheckComboBoxItem = HandyControl.Controls.CheckComboBoxItem;
 
 namespace TwitchDownloaderWPF
@@ -70,20 +69,11 @@ private void Window_Initialized(object sender, EventArgs e)
             }
 
             // Setup culture dropdown
-            foreach (var culture in AvailableCultures.All)
-            {
-                ComboLocale.Items.Add(culture.NativeName);
-            }
             var currentCulture = Settings.Default.GuiCulture;
-            var selectedIndex = AvailableCultures.All.Select((item, index) => (item, index))
-                .Where(x => x.item.Code == currentCulture)
-                .Select(x => x.index)
-                .DefaultIfEmpty(-1)
-                .First();
-
-            if (selectedIndex > -1)
+            foreach (var (culture, index) in AvailableCultures.All.Select((x, index) => (x, index)))
             {
-                ComboLocale.SelectedIndex = selectedIndex;
+                ComboLocale.Items.Add(culture.NativeName);
+                if (culture.Code == currentCulture) ComboLocale.SelectedIndex = index;
             }
 
             ComboLogLevels.Items.Add(new CheckComboBoxItem { Content = Translations.Strings.LogLevelVerbose, Tag = LogLevel.Verbose });