mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 10:51:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Royce551 2021-04-04 18:07:52 -05:00
parent 18e0449488
commit 41478d98d3
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer.csproj
View file

@ -107,6 +107,7 @@
</Compile> </Compile>
<Compile Include="Forms\TagEditor\Integrations\IReleaseIntegration.cs" /> <Compile Include="Forms\TagEditor\Integrations\IReleaseIntegration.cs" />
<Compile Include="Forms\TagEditor\Integrations\MusicBrainzIntegration.cs" /> <Compile Include="Forms\TagEditor\Integrations\MusicBrainzIntegration.cs" />
<Compile Include="Forms\TagEditor\Integrations\OsuIntegration.cs" />
<Compile Include="Forms\TagEditor\Integrations\ReleaseIntegrationPage.xaml.cs"> <Compile Include="Forms\TagEditor\Integrations\ReleaseIntegrationPage.xaml.cs">
<DependentUpon>ReleaseIntegrationPage.xaml</DependentUpon> <DependentUpon>ReleaseIntegrationPage.xaml</DependentUpon>
</Compile> </Compile>

26
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs
View file

@ -80,6 +80,20 @@ namespace FRESHMusicPlayer
}; };
progressTimer.Tick += ProgressTimer_Tick; progressTimer.Tick += ProgressTimer_Tick;
LoggingHandler.Log("Reading library...");
LiteDatabase library;
try
{
library = new LiteDatabase(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FRESHMusicPlayer", "database.fdb2"));
Library = new GUILibrary(library, NotificationHandler);
}
catch (IOException) // library is *probably* being used by another FMP.
{
File.WriteAllLines(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FRESHMusicPlayer", "instance"), initialFile);
Application.Current.Shutdown();
}
watcher.Filter = "instance"; watcher.Filter = "instance";
watcher.IncludeSubdirectories = false; watcher.IncludeSubdirectories = false;
watcher.EnableRaisingEvents = true; watcher.EnableRaisingEvents = true;
@ -94,18 +108,6 @@ namespace FRESHMusicPlayer
File.Delete(args.FullPath); File.Delete(args.FullPath);
}); });
}; };
LoggingHandler.Log("Reading library...");
LiteDatabase library;
try
{
library = new LiteDatabase(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FRESHMusicPlayer", "database.fdb2"));
Library = new GUILibrary(library, NotificationHandler);
}
catch (IOException) // library is *probably* being used by another FMP.
{
File.WriteAllLines(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FRESHMusicPlayer", "instance"), initialFile);
Application.Current.Shutdown();
}
LoggingHandler.Log("Ready to go!"); LoggingHandler.Log("Ready to go!");
if (initialFile != null) if (initialFile != null)

2
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/ImportPage.xaml.cs
View file

@ -93,7 +93,7 @@ namespace FRESHMusicPlayer.Pages
private void Page_Drop(object sender, DragEventArgs e) private void Page_Drop(object sender, DragEventArgs e)
{ {
InterfaceUtils.DoDragDrop((string[])e.Data.GetData(DataFormats.FileDrop), window.Player, window.Library, enqueue: false); InterfaceUtils.DoDragDrop((string[])e.Data.GetData(DataFormats.FileDrop), window.Player, window.Library, clearqueue: false, enqueue: false);
} }
private void TextBoxButton_Click(object sender, RoutedEventArgs e) private void TextBoxButton_Click(object sender, RoutedEventArgs e)