Skip to content

Commit

Permalink
WPF: Refactored UpdateLibraryService and Presenter to remove dependen…
Browse files Browse the repository at this point in the history 
…cy on configuration and remove modes.
  • Loading branch information
@ycastonguay
ycastonguay committed Oct 27, 2013
1 parent 948f55e commit ebca12b
Show file tree
Hide file tree
Showing 18 changed files with 318 additions and 248 deletions.
78 changes: 39 additions & 39 deletions MPfm/MPfm.Library/Services/Interfaces/IUpdateLibraryService.cs
View file
@@ -1,39 +1,39 @@
// Copyright © 2011-2013 Yanick Castonguay
//
// This file is part of MPfm.
//
// MPfm is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// MPfm is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with MPfm. If not, see <http://www.gnu.org/licenses/>.

using System;
using System.Collections.Generic;
using MPfm.Library.UpdateLibrary;
using MPfm.Library.Services.Events;

namespace MPfm.Library.Services.Interfaces
{
/// <summary>
/// Update Library window presenter interface.
/// </summary>
public interface IUpdateLibraryService
{
event EventHandler<RefreshStatusEventArgs> RaiseRefreshStatusEvent;
event EventHandler<ProcessEndedEventArgs> RaiseProcessEndedEvent;
void Dispose();
void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string folderPath);
void Cancel();
void SaveLog(string filePath);
}
}
// Copyright © 2011-2013 Yanick Castonguay
//
// This file is part of MPfm.
//
// MPfm is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// MPfm is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with MPfm. If not, see <http://www.gnu.org/licenses/>.

using System;
using System.Collections.Generic;
using MPfm.Library.Objects;
using MPfm.Library.UpdateLibrary;
using MPfm.Library.Services.Events;

namespace MPfm.Library.Services.Interfaces
{
/// <summary>
/// Update Library window presenter interface.
/// </summary>
public interface IUpdateLibraryService
{
event EventHandler<RefreshStatusEventArgs> RaiseRefreshStatusEvent;
event EventHandler<ProcessEndedEventArgs> RaiseProcessEndedEvent;

void UpdateLibrary(List<string> filePaths, List<Folder> folderPaths);
void Cancel();
void SaveLog(string filePath);
}
}

128 changes: 39 additions & 89 deletions MPfm/MPfm.Library/Services/UpdateLibraryService.cs
View file
Expand Up @@ -20,58 +20,47 @@
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using MPfm.Library.Objects;
using MPfm.Library.Services.Events;
using MPfm.Library.Services.Interfaces;
using MPfm.Library.UpdateLibrary;
using MPfm.Sound.AudioFiles;
using System.Text.RegularExpressions;
using MPfm.Library.Services.Interfaces;
using MPfm.Library.Services.Events;

#if (MACOSX || LINUX)
using Mono.Unix;
using Mono.Unix.Native;
#endif

namespace MPfm.MVP.Services
namespace MPfm.Library.Services
{
/// <summary>
/// Service used for updating the library with new audio files using a background worker.
/// </summary>
public class UpdateLibraryService : IUpdateLibraryService
{
private ILibraryService libraryService = null;
private BackgroundWorker workerUpdateLibrary = null;
private bool cancelUpdateLibrary = false;
private readonly ILibraryService _libraryService = null;
private BackgroundWorker _workerUpdateLibrary = null;
private bool _cancelUpdateLibrary = false;

public event EventHandler<RefreshStatusEventArgs> RaiseRefreshStatusEvent;
public event EventHandler<ProcessEndedEventArgs> RaiseProcessEndedEvent;

#region Constructor and Dispose

/// <summary>
/// Initializes a new instance of the <see cref="MPfm.UI.UpdateLibraryService"/> class.
/// </summary>
public UpdateLibraryService(ILibraryService libraryService)
{
if(libraryService == null)
throw new ArgumentNullException("The libraryService parameter cannot be null!");

this.libraryService = libraryService;

workerUpdateLibrary = new BackgroundWorker();
workerUpdateLibrary.WorkerReportsProgress = true;
workerUpdateLibrary.WorkerSupportsCancellation = true;
workerUpdateLibrary.DoWork += new DoWorkEventHandler(workerUpdateLibrary_DoWork);
workerUpdateLibrary.RunWorkerCompleted += new RunWorkerCompletedEventHandler(workerUpdateLibrary_RunWorkerCompleted);
}
throw new ArgumentNullException("The _libraryService parameter cannot be null!");

public void Dispose()
{
_libraryService = libraryService;
_workerUpdateLibrary = new BackgroundWorker();
_workerUpdateLibrary.WorkerReportsProgress = true;
_workerUpdateLibrary.WorkerSupportsCancellation = true;
_workerUpdateLibrary.DoWork += new DoWorkEventHandler(workerUpdateLibrary_DoWork);
_workerUpdateLibrary.RunWorkerCompleted += new RunWorkerCompletedEventHandler(workerUpdateLibrary_RunWorkerCompleted);
}

#endregion

#region Events

/// <summary>
/// Raises the refresh status event. Wraps the event invocation by
Expand All @@ -96,17 +85,13 @@ protected virtual void OnRaiseProcessEndedEvent(ProcessEndedEventArgs e)
handler(this, e);
}

#endregion

#region IUpdateLibraryPresenter implementation

/// <summary>
/// Cancels the update library process.
/// </summary>
public void Cancel()
{
// Cancel process
cancelUpdateLibrary = true;
_cancelUpdateLibrary = true;
}

/// <summary>
Expand Down Expand Up @@ -138,31 +123,17 @@ public void SaveLog(string filePath)
// tw.Close();
// }
}

#endregion

/// <summary>
/// Starts the update library process in a background thread.
/// </summary>
/// <param name='mode'>Update library mode</param>
/// <param name='filePaths'>Audio file paths to add to the database</param>
/// <param name='folderPath'>Folder path to add to the database</param>
public void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string folderPath)
public void UpdateLibrary(List<string> filePaths, List<Folder> folderPaths)
{
UpdateLibraryArgument arg = new UpdateLibraryArgument();
arg.Mode = mode;
var arg = new UpdateLibraryArgument();
arg.FilePaths = filePaths;
arg.FolderPath = folderPath;
arg.FolderPaths = folderPaths;

cancelUpdateLibrary = false;

if (mode == UpdateLibraryMode.SpecificFolder)
libraryService.AddFolder(folderPath, true);
else if(mode == UpdateLibraryMode.SpecificFiles)
libraryService.AddFiles(filePaths);
_cancelUpdateLibrary = false;

// Start the background process
workerUpdateLibrary.RunWorkerAsync(arg);
_workerUpdateLibrary.RunWorkerAsync(arg);

// TODO: Add time elapsed/time remaining
// // // Set start time when the process has finished finding the files and is ready to add files into library
Expand Down Expand Up @@ -219,46 +190,31 @@ protected void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
{
List<string> filePaths = new List<string>();
UpdateLibraryArgument arg = (UpdateLibraryArgument)e.Argument;
filePaths.AddRange(arg.FilePaths);

try
{
if (cancelUpdateLibrary) throw new UpdateLibraryException();
if (arg.Mode == UpdateLibraryMode.WholeLibrary)
{
// Remove broken songs from the library
OnRaiseRefreshStatusEvent(new UpdateLibraryEntity() {
Title = "Checking for broken file paths",
Subtitle = "Checking if songs have been deleted on your hard disk but not removed from the library..",
PercentageDone = 0
});
libraryService.RemoveAudioFilesWithBrokenFilePaths();
// Remove broken songs from the library
OnRaiseRefreshStatusEvent(new UpdateLibraryEntity() {
Title = "Checking for broken file paths",
Subtitle = "Checking if songs have been deleted on your hard disk but not removed from the library..",
PercentageDone = 0
});
_libraryService.RemoveAudioFilesWithBrokenFilePaths();

if (cancelUpdateLibrary) throw new UpdateLibraryException();
if (_cancelUpdateLibrary) throw new UpdateLibraryException();

filePaths = SearchMediaFilesInFolders();
}
else if (arg.Mode == UpdateLibraryMode.SpecificFiles)
{
// Set the media files passed in the argument
filePaths = arg.FilePaths;
}
else if (arg.Mode == UpdateLibraryMode.SpecificFolder)
{
// Search the files in the specified folder
Console.WriteLine("UpdateLibraryService - Looking for audio files in {0}...", arg.FolderPath);
filePaths = SearchMediaFilesInFolders(arg.FolderPath, true);
Console.WriteLine("UpdateLibraryService - Found {0} audio files in {0}", filePaths.Count, arg.FolderPath);
}
filePaths = SearchMediaFilesInFolders(arg.FolderPaths);

if (cancelUpdateLibrary) throw new UpdateLibraryException();
if (_cancelUpdateLibrary) throw new UpdateLibraryException();

// Get the list of audio files from the database
IEnumerable<string> filePathsDatabase = libraryService.SelectFilePaths();
IEnumerable<string> filePathsDatabase = _libraryService.SelectFilePaths();
IEnumerable<string> filePathsToUpdate = filePaths.Except(filePathsDatabase);

for(int a = 0; a < filePathsToUpdate.Count(); a++)
{
if (cancelUpdateLibrary) throw new UpdateLibraryException();
if (_cancelUpdateLibrary) throw new UpdateLibraryException();

// Get current file path and calculate stats
string filePath = filePathsToUpdate.ElementAt(a);
Expand All @@ -273,12 +229,12 @@ protected void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
filePath.ToUpper().Contains(".XSPF"))
{
PlaylistFile playlistFile = new PlaylistFile(filePath);
libraryService.InsertPlaylistFile(playlistFile);
_libraryService.InsertPlaylistFile(playlistFile);
}
else
{
AudioFile audioFile = new AudioFile(filePath, Guid.NewGuid(), true);
libraryService.InsertAudioFile(audioFile);
_libraryService.InsertAudioFile(audioFile);
}

// Display update
Expand Down Expand Up @@ -308,15 +264,15 @@ protected void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
}

// Cancel thread if necessary
if (cancelUpdateLibrary) throw new UpdateLibraryException();
if (_cancelUpdateLibrary) throw new UpdateLibraryException();

// Compact database
OnRaiseRefreshStatusEvent(new UpdateLibraryEntity() {
Title = "Compacting database",
Subtitle = "Compacting database...",
PercentageDone = 1
});
libraryService.CompactDatabase();
_libraryService.CompactDatabase();
}
catch (UpdateLibraryException ex)
{
Expand Down Expand Up @@ -345,16 +301,10 @@ private void workerUpdateLibrary_RunWorkerCompleted(object sender, RunWorkerComp
OnRaiseProcessEndedEvent(new ProcessEndedEventArgs(e.Cancelled));
}

/// <summary>
/// Searches for songs in all configured folders.
/// </summary>
/// <returns>List of songs (file paths)</returns>
public List<string> SearchMediaFilesInFolders()
public List<string> SearchMediaFilesInFolders(List<Folder> folders)
{
List<string> files = new List<string>();
IEnumerable<Folder> folders = libraryService.SelectFolders();

foreach (Folder folder in folders)
foreach (var folder in folders)
{
List<string> newFiles = SearchMediaFilesInFolders(folder.FolderPath, (bool)folder.IsRecursive);
files.AddRange(newFiles);
Expand Down

0 comments on commit ebca12b

Please sign in to comment.