diff --git a/MediaBrowser.Common.Implementations/Security/MbAdmin.cs b/MediaBrowser.Common.Implementations/Security/MbAdmin.cs
index 76ff92c2eb..ab4a83257c 100644
--- a/MediaBrowser.Common.Implementations/Security/MbAdmin.cs
+++ b/MediaBrowser.Common.Implementations/Security/MbAdmin.cs
@@ -3,11 +3,11 @@ namespace MediaBrowser.Common.Implementations.Security
{
public class MbAdmin
{
- public const string HttpUrl = "https://www.mb3admin.com/admin/";
+ public const string HttpUrl = "http://www.mb3admin.com/admin/";
///
/// Leaving as http for now until we get it squared away
///
- public const string HttpsUrl = "https://www.mb3admin.com/admin/";
+ public const string HttpsUrl = "http://www.mb3admin.com/admin/";
}
}
diff --git a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
index d751083f08..a6dbf77e98 100644
--- a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
+++ b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Common.Implementations.Security
public class PluginSecurityManager : ISecurityManager
{
private const string MBValidateUrl = MbAdmin.HttpsUrl + "service/registration/validate";
- private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "https://mb3admin.com/admin/service/appstore/register";
+ private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "http://mb3admin.com/admin/service/appstore/register";
///
/// The _is MB supporter
diff --git a/MediaBrowser.Controller/FileOrganization/IFileOrganizationService.cs b/MediaBrowser.Controller/FileOrganization/IFileOrganizationService.cs
index 8d7f4e1173..daa670d836 100644
--- a/MediaBrowser.Controller/FileOrganization/IFileOrganizationService.cs
+++ b/MediaBrowser.Controller/FileOrganization/IFileOrganizationService.cs
@@ -78,8 +78,8 @@ namespace MediaBrowser.Controller.FileOrganization
///
/// Deletes a smart match entry.
///
- /// Item Id.
+ /// Item name.
/// The match string to delete.
- void DeleteSmartMatchEntry(string Id, string matchString);
+ void DeleteSmartMatchEntry(string ItemName, string matchString);
}
}
diff --git a/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs
index a6bc66e499..28c99b89bb 100644
--- a/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs
+++ b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs
@@ -3,8 +3,8 @@ namespace MediaBrowser.Model.FileOrganization
{
public class SmartMatchInfo
{
- public string Id { get; set; }
- public string Name { get; set; }
+ public string ItemName { get; set; }
+ public string DisplayName { get; set; }
public FileOrganizerType OrganizerType { get; set; }
public string[] MatchStrings { get; set; }
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index 6509b016a4..9d43dabcde 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -301,15 +301,14 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
private void SaveSmartMatchString(string matchString, Series series, AutoOrganizeOptions options)
{
- var seriesIdString = series.Id.ToString("N");
- SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(i => string.Equals(i.Id, seriesIdString));
+ SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(i => string.Equals(i.ItemName, series.Name, StringComparison.OrdinalIgnoreCase));
if (info == null)
{
info = new SmartMatchInfo();
- info.Id = series.Id.ToString("N");
+ info.ItemName = series.Name;
info.OrganizerType = FileOrganizerType.Episode;
- info.Name = series.Name;
+ info.DisplayName = series.Name;
var list = options.SmartMatchInfos.ToList();
list.Add(info);
options.SmartMatchInfos = list.ToArray();
@@ -499,7 +498,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
series = _libraryManager.RootFolder
.GetRecursiveChildren(i => i is Series)
.Cast()
- .FirstOrDefault(i => string.Equals(i.Id.ToString("N"), info.Id));
+ .FirstOrDefault(i => string.Equals(i.Name, info.ItemName, StringComparison.OrdinalIgnoreCase));
}
}
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs b/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs
index ce388bd8e1..cf1387b0eb 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs
@@ -149,13 +149,11 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
};
}
- public void DeleteSmartMatchEntry(string IdString, string matchString)
+ public void DeleteSmartMatchEntry(string itemName, string matchString)
{
- Guid Id;
-
- if (!Guid.TryParse(IdString, out Id))
+ if (string.IsNullOrEmpty(itemName))
{
- throw new ArgumentNullException("Id");
+ throw new ArgumentNullException("itemName");
}
if (string.IsNullOrEmpty(matchString))
@@ -165,7 +163,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
var options = GetAutoOrganizeptions();
- SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(i => string.Equals(i.Id, IdString));
+ SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(i => string.Equals(i.ItemName, itemName));
if (info != null && info.MatchStrings.Contains(matchString))
{