Skip to content

Commit ec205ad

Browse files
InzaniityInzaniity
committed
Removed Core project
Raise Version number to 1.5.2
1 parent c09f9e9 commit ec205ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+347
-381
lines changed

‎Songify Slim.sln

+3-13
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.2.32616.157
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Songify Slim", "Songify Slim\Songify Slim.csproj", "{79210295-B0CC-46F4-B77A-26C7D27F4754}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Songify-Core", "Songify-Core\Songify-Core.csproj", "{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}"
9-
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1210
Debug|Any CPU = Debug|Any CPU
@@ -23,22 +21,14 @@ Global
2321
{79210295-B0CC-46F4-B77A-26C7D27F4754}.Release|Any CPU.Build.0 = Release|Any CPU
2422
{79210295-B0CC-46F4-B77A-26C7D27F4754}.Release|x64.ActiveCfg = Release|x64
2523
{79210295-B0CC-46F4-B77A-26C7D27F4754}.Release|x64.Build.0 = Release|x64
26-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Debug|x64.ActiveCfg = Debug|Any CPU
29-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Debug|x64.Build.0 = Debug|Any CPU
30-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Release|x64.ActiveCfg = Release|Any CPU
33-
{B3B5CF61-3D11-4FDF-A599-F78983AB54E9}.Release|x64.Build.0 = Release|Any CPU
3424
EndGlobalSection
3525
GlobalSection(SolutionProperties) = preSolution
3626
HideSolutionNode = FALSE
3727
EndGlobalSection
3828
GlobalSection(ExtensibilityGlobals) = postSolution
39-
SolutionGuid = {12169756-2254-4CD3-86A9-6FCF593762EC}
40-
RESX_SortFileContentOnSave = False
41-
RESX_AutoCreateNewLanguageFiles = True
4229
RESX_PrefixTranslations = False
30+
RESX_AutoCreateNewLanguageFiles = True
31+
RESX_SortFileContentOnSave = False
32+
SolutionGuid = {12169756-2254-4CD3-86A9-6FCF593762EC}
4333
EndGlobalSection
4434
EndGlobal

‎Songify Slim/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
// You can specify all the values or you can default the Build and Revision Numbers
5151
// by using the '*' as shown below:
5252
// [assembly: AssemblyVersion("1.0.*")]
53-
[assembly: AssemblyVersion("1.5.1.3")]
54-
[assembly: AssemblyFileVersion("1.5.1.3")]
53+
[assembly: AssemblyVersion("1.5.2.0")]
54+
[assembly: AssemblyFileVersion("1.5.2.0")]
5555
[assembly: NeutralResourcesLanguage("en")]
5656
[assembly: Guid("442379e3-32d8-42d1-ab09-cba229672453")]

‎Songify Slim/Util/General/GlobalObjects.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static class GlobalObjects
1818
public static FlowDocument ConsoleDocument = new FlowDocument();
1919
public static TrackInfo CurrentSong;
2020
public static bool DetachConsole = false;
21-
public static bool IsBeta = true;
21+
public static bool IsBeta = false;
2222
public static bool IsInPlaylist;
2323
public static ObservableCollection<RequestObject> ReqList = new ObservableCollection<RequestObject>();
2424
public static string Requester = "";

‎Songify Slim/Util/Songify/Apihandler.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public static class ApiHandler
3333
// Spotify Authentication flow with the webserver
3434
private static TokenSwapAuth _auth;
3535

36-
public static async
37-
Task
38-
DoAuthAsync()
36+
public static async Task DoAuthAsync()
3937
{
4038
if (Settings.Settings.UseOwnApp)
4139
{

‎Songify Slim/Util/Songify/SongFetcher.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,10 @@ public async Task<TrackInfo> FetchSpotifyWeb()
448448
Logger.LogStr($"QUEUE: Trying to remove {previous.Artist} - {previous.Title}");
449449
do
450450
{
451-
//GlobalObjects.ReqList.Remove(previous);
452-
GlobalObjects.ReqList.Remove(GlobalObjects.ReqList.Select(o => o).Where(o => o.Trackid == previous.Trackid).First());
453-
451+
Application.Current.Dispatcher.BeginInvoke(() =>
452+
{
453+
GlobalObjects.ReqList.Remove(previous);
454+
});
454455
Thread.Sleep(250);
455456
} while (GlobalObjects.ReqList.Contains(previous));
456457

‎Songify Slim/Views/MainWindow.xaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ private void WriteSong(string rArtist, string rTitle, string rExtra, string rCov
11591159
string temp = File.ReadAllText(_songPath);
11601160

11611161
// if the text file is different to _currSong (fetched song) or update is forced
1162-
if (temp.Trim() != CurrSong.Trim() || forceUpdate || _firstRun)
1162+
if (temp.Replace("\n","").Replace("\r","").Trim() != Regex.Replace(CurrSong.Replace("\\n", "").Replace("\\r", "").Trim(), "\\s+", " ") || forceUpdate || _firstRun)
11631163
{
11641164
if (temp.Trim() != CurrSong.Trim())
11651165
// Clear the SkipVotes list in TwitchHandler Class

‎Songify-Core/MainWindow.xaml

-12
This file was deleted.

‎Songify-Core/MainWindow.xaml.cs

-28
This file was deleted.

‎Songify-Core/Models/BotResponseItem.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Songify_Slim.Models
1+
namespace Songify_Core.Models
22
{
33
internal class BotResponseItem
44
{

‎Songify-Core/Models/PlayerType.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Songify_Slim.Models
1+
namespace Songify_Core.Models
22
{
33
public static class PlayerType
44
{

‎Songify-Core/Models/QueueItem.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Songify_Slim.Models
1+
namespace Songify_Core.Models
22
{
33
internal class QueueItem
44
{

‎Songify-Core/Models/RequestModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Newtonsoft.Json;
22

3-
namespace Songify_Slim.Models
3+
namespace Songify_Core.Models
44
{
55
public class RequestObject
66
{

‎Songify-Core/Models/SongInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using SpotifyAPI.Web;
22
using System.Collections.Generic;
33

4-
namespace Songify_Slim.Models
4+
namespace Songify_Core.Models
55
{
66
public class SongInfo
77
{

‎Songify-Core/Models/TrackInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using SpotifyAPI.Web;
22
using System.Collections.Generic;
33

4-
namespace Songify_Slim.Models
4+
namespace Songify_Core.Models
55
{
66
public class TrackInfo
77
{

0 commit comments

Comments
 (0)