Fixed saving a root-folder with files.

StefH · Apr 4, 2018 · dc08dd4 · dc08dd4
1 parent 38bcb59
commit dc08dd4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/src/WebDAV-AudioPlayer/Audio/Player.cs b/src/WebDAV-AudioPlayer/Audio/Player.cs
@@ -101,15 +101,15 @@ public async void Play(int index, CancellationToken cancellationToken)
 
             Stop(false);
 
-            Log(string.Format(@"Reading : '{0}'", resourceItem.DisplayName));
+            Log($@"Reading : '{resourceItem.DisplayName}'");
             var status = await _client.GetStreamAsync(resourceItem, cancellationToken);
             if (status != ResourceLoadStatus.Ok && status != ResourceLoadStatus.StreamExisting)
             {
-                Log(string.Format(@"Reading error : {0}", status));
+                Log($@"Reading error : {status}");
                 return;
             }
 
-            Log(string.Format(@"Reading done : {0}", status));
+            Log($@"Reading done : {status}");
 
             _resourceItemQueue.Enqueue(resourceItem);
 
@@ -157,23 +157,27 @@ public async void Play(int index, CancellationToken cancellationToken)
         private async void PreloadNext(CancellationToken cancellationToken)
         {
             if (cancellationToken.IsCancellationRequested)
+            {
                 return;
+            }
 
             int nextIndex = SelectedIndex + 1;
             if (nextIndex < Items.Count)
             {
                 var resourceItem = Items[nextIndex];
-                Log(string.Format("Preloading : '{0}'", resourceItem.DisplayName));
+                Log($"Preloading : '{resourceItem.DisplayName}'");
                 var status = await _client.GetStreamAsync(resourceItem, cancellationToken);
                 if (status != ResourceLoadStatus.Ok && status != ResourceLoadStatus.StreamExisting)
                 {
-                    Log(string.Format(@"Preloading error : {0}", status));
+                    Log($@"Preloading error : {status}");
                     return;
                 }
 
-                Log(string.Format(@"Preloading done : {0}", status));
+                Log($@"Preloading done : {status}");
                 _resourceItemQueue.Enqueue(resourceItem);
             }
+
+            // Try to open next folder
         }
 
         public void Next(CancellationToken cancelAction)

diff --git a/src/WebDAV-AudioPlayer/Client/MyWebDavClient.cs b/src/WebDAV-AudioPlayer/Client/MyWebDavClient.cs
@@ -153,7 +153,7 @@ public async Task<ResourceLoadStatus> DownloadFolderAsync(ResourceItem folder, s
                     }
                     finally
                     {
-                        resourceItem.Stream.Dispose();
+                        resourceItem.Stream?.Dispose();
                         resourceItem.Stream = null;
                     }
                 }

diff --git a/src/WebDAV-AudioPlayer/UI/MainForm.cs b/src/WebDAV-AudioPlayer/UI/MainForm.cs
@@ -38,11 +38,8 @@ public MainForm(AssemblyConfig config)
 
             Func<ResourceItem, string, string> updateTitle = (resourceItem, action) =>
             {
-                string bitrate = resourceItem.MediaDetails.Bitrate != null ?
-                    $"{resourceItem.MediaDetails.Bitrate / 1000}"
-                    : "?";
-                string text =
-                    $"{action} : '{resourceItem.Parent.DisplayName}\\{resourceItem.DisplayName}' ({resourceItem.MediaDetails.Mode} {bitrate} kbps)";
+                string bitrate = resourceItem.MediaDetails.Bitrate != null ? $"{resourceItem.MediaDetails.Bitrate / 1000}" : "?";
+                string text = $"{action} : '{resourceItem.Parent.DisplayName}\\{resourceItem.DisplayName}' ({resourceItem.MediaDetails.Mode} {bitrate} kbps)";
                 Text = @"WebDAV-AudioPlayer " + text;
 
                 return text;
@@ -54,9 +51,7 @@ public MainForm(AssemblyConfig config)
 
                 PlayStarted = (selectedIndex, resourceItem) =>
                 {
-                    string bitrate = resourceItem.MediaDetails.Bitrate != null ?
-                        $"{resourceItem.MediaDetails.Bitrate / 1000}"
-                        : "?";
+                    string bitrate = resourceItem.MediaDetails.Bitrate != null ? $"{resourceItem.MediaDetails.Bitrate / 1000}" : "?";
                     string text = updateTitle(resourceItem, "Playing");
                     textBoxSong.Text = text;
 
@@ -113,7 +108,7 @@ private async Task RefreshTreeAsync()
             Cursor.Current = Cursors.WaitCursor;
 
             treeView.Nodes.Clear();
-            
+
             var root = new ResourceItem
             {
                 DisplayName = _config.RootFolder,
@@ -122,7 +117,9 @@ private async Task RefreshTreeAsync()
 
             var result = await _client.FetchChildResourcesAsync(root, _cancelToken, 0);
             if (result != ResourceLoadStatus.Ok)
+            {
                 return;
+            }
 
             var rootNode = new TreeNode
             {
@@ -140,7 +137,9 @@ private async Task RefreshTreeAsync()
         private void PopulateTree(ref TreeNode node, IList<ResourceItem> resourceItems)
         {
             if (resourceItems == null)
+            {
                 return;
+            }
 
             if (node == null)
             {
@@ -199,15 +198,15 @@ private async Task ShowFolderSaveDialogAsync(ResourceItem resourceItem)
 
                     await Task.Delay(TimeSpan.FromMilliseconds(500), _cancelToken);
                 }
-                catch (Exception)
+                catch (Exception e)
                 {
+                    int i = 9;
                 }
                 finally
                 {
-                    if (status == ResourceLoadStatus.Ok)
-                        Log($"Folder '{resourceItem.DisplayName}' saved to '{folderBrowserDialog1.SelectedPath}'");
-                    else
-                        Log($"Folder '{resourceItem.DisplayName}' was not saved correctly : {status}");
+                    Log(status == ResourceLoadStatus.Ok
+                        ? $"Folder '{resourceItem.DisplayName}' saved to '{folderBrowserDialog1.SelectedPath}'"
+                        : $"Folder '{resourceItem.DisplayName}' was not saved correctly : {status}");
 
                     progress.Close();
                     InitCancellationTokenSource();