diff --git a/src/Ombi.Api.Emby/Models/PublicInfo.cs b/src/Ombi.Api.Emby/Models/PublicInfo.cs
index 75be0f172..23db412b5 100644
--- a/src/Ombi.Api.Emby/Models/PublicInfo.cs
+++ b/src/Ombi.Api.Emby/Models/PublicInfo.cs
@@ -5,7 +5,6 @@
public string LocalAddress { get; set; }
public string ServerName { get; set; }
public string Version { get; set; }
-
public string OperatingSystem { get; set; }
public string Id { get; set; }
}
diff --git a/src/Ombi.Api.Jellyfin/Models/PublicInfo.cs b/src/Ombi.Api.Jellyfin/Models/PublicInfo.cs
index 56ae605e2..6687cf3c9 100644
--- a/src/Ombi.Api.Jellyfin/Models/PublicInfo.cs
+++ b/src/Ombi.Api.Jellyfin/Models/PublicInfo.cs
@@ -5,15 +5,8 @@
public string LocalAddress { get; set; }
public string ServerName { get; set; }
public string Version { get; set; }
- ///
- /// Only populated for Jellyfin
- ///
- public string ProductName { get; set; }
-
- public bool IsJellyfin => !string.IsNullOrEmpty(ProductName) && ProductName.Contains("Jellyfin");
-
public string OperatingSystem { get; set; }
public string Id { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
index 75b6633bb..3fe11cbc4 100644
--- a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
@@ -70,11 +70,11 @@ namespace Ombi.Core.Rule.Rules.Search
var server = s.Servers.FirstOrDefault(x => x.ServerHostname != null);
if ((server?.ServerHostname ?? string.Empty).HasValue())
{
- obj.EmbyUrl = EmbyHelper.GetEmbyMediaUrl(item.EmbyId, server?.ServerId, server?.ServerHostname, s.IsJellyfin);
+ obj.EmbyUrl = EmbyHelper.GetEmbyMediaUrl(item.EmbyId, server?.ServerId, server?.ServerHostname);
}
else
{
- obj.EmbyUrl = EmbyHelper.GetEmbyMediaUrl(item.EmbyId, server?.ServerId, null, s.IsJellyfin);
+ obj.EmbyUrl = EmbyHelper.GetEmbyMediaUrl(item.EmbyId, server?.ServerId, null);
}
}
@@ -100,4 +100,4 @@ namespace Ombi.Core.Rule.Rules.Search
return Success();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs
index c900844a3..2f6a39f91 100644
--- a/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/JellyfinAvailabilityRule.cs
@@ -70,11 +70,11 @@ namespace Ombi.Core.Rule.Rules.Search
var server = s.Servers.FirstOrDefault(x => x.ServerHostname != null);
if ((server?.ServerHostname ?? string.Empty).HasValue())
{
- obj.JellyfinUrl = JellyfinHelper.GetJellyfinMediaUrl(item.JellyfinId, server?.ServerId, server?.ServerHostname, s.IsJellyfin);
+ obj.JellyfinUrl = JellyfinHelper.GetJellyfinMediaUrl(item.JellyfinId, server?.ServerId, server?.ServerHostname);
}
else
{
- obj.JellyfinUrl = JellyfinHelper.GetJellyfinMediaUrl(item.JellyfinId, server?.ServerId, null, s.IsJellyfin);
+ obj.JellyfinUrl = JellyfinHelper.GetJellyfinMediaUrl(item.JellyfinId, server?.ServerId, null);
}
}
diff --git a/src/Ombi.Helpers/EmbyHelper.cs b/src/Ombi.Helpers/EmbyHelper.cs
index 785ca47d4..db739b375 100644
--- a/src/Ombi.Helpers/EmbyHelper.cs
+++ b/src/Ombi.Helpers/EmbyHelper.cs
@@ -2,14 +2,10 @@
{
public static class EmbyHelper
{
- public static string GetEmbyMediaUrl(string mediaId, string serverId, string customerServerUrl = null, bool isJellyfin = false)
+ public static string GetEmbyMediaUrl(string mediaId, string serverId, string customerServerUrl = null)
{
//web/index.html#!/details|item
string path = "item";
- if (isJellyfin)
- {
- path = "details";
- }
if (customerServerUrl.HasValue())
{
if (!customerServerUrl.EndsWith("/"))
diff --git a/src/Ombi.Helpers/JellyfinHelper.cs b/src/Ombi.Helpers/JellyfinHelper.cs
index 7a342160e..506341d7d 100644
--- a/src/Ombi.Helpers/JellyfinHelper.cs
+++ b/src/Ombi.Helpers/JellyfinHelper.cs
@@ -2,14 +2,10 @@
{
public static class JellyfinHelper
{
- public static string GetJellyfinMediaUrl(string mediaId, string serverId, string customerServerUrl = null, bool isJellyfin = false)
+ public static string GetJellyfinMediaUrl(string mediaId, string serverId, string customerServerUrl = null)
{
//web/index.html#!/details|item
- string path = "item";
- if (isJellyfin)
- {
- path = "details";
- }
+ string path = "details";
if (customerServerUrl.HasValue())
{
if (!customerServerUrl.EndsWith("/"))
@@ -20,7 +16,7 @@
}
else
{
- return $"https://app.jellyfin.media/web/index.html#!/{path}?id={mediaId}&serverId={serverId}";
+ return $"http://localhost:8096/web/index.html#!/{path}?id={mediaId}&serverId={serverId}";
}
}
}
diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs
index f8bde2755..866216fe4 100644
--- a/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs
+++ b/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs
@@ -58,7 +58,7 @@ namespace Ombi.Schedule.Jobs.Emby
{
await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
.SendAsync(NotificationHub.NotificationEvent, "Emby Content Sync Failed");
- _logger.LogError(e, "Exception when caching {1} for server {0}", server.Name, embySettings.IsJellyfin ? "Jellyfin" : "Emby");
+ _logger.LogError(e, "Exception when caching Emby for server {0}", server.Name);
}
}
@@ -145,7 +145,7 @@ namespace Ombi.Schedule.Jobs.Emby
Title = tvShow.Name,
Type = EmbyMediaType.Series,
EmbyId = tvShow.Id,
- Url = EmbyHelper.GetEmbyMediaUrl(tvShow.Id, server?.ServerId, server.ServerHostname, settings.IsJellyfin),
+ Url = EmbyHelper.GetEmbyMediaUrl(tvShow.Id, server?.ServerId, server.ServerHostname),
AddedAt = DateTime.UtcNow
});
}
@@ -228,4 +228,4 @@ namespace Ombi.Schedule.Jobs.Emby
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs
index 1207e1f42..13821f5d9 100644
--- a/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs
+++ b/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs
@@ -80,7 +80,7 @@ namespace Ombi.Schedule.Jobs.Emby
Api = _apiFactory.CreateClient(settings);
await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
- .SendAsync(NotificationHub.NotificationEvent, $"{(settings.IsJellyfin ? "Jellyfin" : "Emby")} User Importer Started");
+ .SendAsync(NotificationHub.NotificationEvent, $"Emby User Importer Started");
var allUsers = await _userManager.Users.Where(x => x.UserType == UserType.EmbyUser || x.UserType == UserType.EmbyConnectUser).ToListAsync();
foreach (var server in settings.Servers)
{
@@ -180,4 +180,4 @@ namespace Ombi.Schedule.Jobs.Emby
GC.SuppressFinalize(this);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs
index 2453f2008..ff96e2130 100644
--- a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs
+++ b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs
@@ -58,7 +58,7 @@ namespace Ombi.Schedule.Jobs.Jellyfin
{
await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
.SendAsync(NotificationHub.NotificationEvent, "Jellyfin Content Sync Failed");
- _logger.LogError(e, "Exception when caching {1} for server {0}", server.Name, jellyfinSettings.IsJellyfin ? "Jellyfin" : "Jellyfin");
+ _logger.LogError(e, "Exception when caching Jellyfin for server {0}", server.Name);
}
}
@@ -145,7 +145,7 @@ namespace Ombi.Schedule.Jobs.Jellyfin
Title = tvShow.Name,
Type = JellyfinMediaType.Series,
JellyfinId = tvShow.Id,
- Url = JellyfinHelper.GetJellyfinMediaUrl(tvShow.Id, server?.ServerId, server.ServerHostname, settings.IsJellyfin),
+ Url = JellyfinHelper.GetJellyfinMediaUrl(tvShow.Id, server?.ServerId, server.ServerHostname),
AddedAt = DateTime.UtcNow
});
}
@@ -228,4 +228,4 @@ namespace Ombi.Schedule.Jobs.Jellyfin
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinUserImporter.cs b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinUserImporter.cs
index 2c39616ff..c7322daa9 100644
--- a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinUserImporter.cs
+++ b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinUserImporter.cs
@@ -80,7 +80,7 @@ namespace Ombi.Schedule.Jobs.Jellyfin
Api = _apiFactory.CreateClient(settings);
await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
- .SendAsync(NotificationHub.NotificationEvent, $"{(settings.IsJellyfin ? "Jellyfin" : "Jellyfin")} User Importer Started");
+ .SendAsync(NotificationHub.NotificationEvent, $"Jellyfin User Importer Started");
var allUsers = await _userManager.Users.Where(x => x.UserType == UserType.JellyfinUser).ToListAsync();
foreach (var server in settings.Servers)
{
diff --git a/src/Ombi.Settings/Settings/Models/External/EmbySettings.cs b/src/Ombi.Settings/Settings/Models/External/EmbySettings.cs
index b3ffce0e1..5bd7cea93 100644
--- a/src/Ombi.Settings/Settings/Models/External/EmbySettings.cs
+++ b/src/Ombi.Settings/Settings/Models/External/EmbySettings.cs
@@ -6,7 +6,6 @@ namespace Ombi.Core.Settings.Models.External
public sealed class EmbySettings : Ombi.Settings.Settings.Models.Settings
{
public bool Enable { get; set; }
- public bool IsJellyfin { get; set; }
public List Servers { get; set; } = new List();
}
@@ -19,4 +18,4 @@ namespace Ombi.Core.Settings.Models.External
public string ServerHostname { get; set; }
public bool EnableEpisodeSearching { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/src/Ombi.Settings/Settings/Models/External/JellyfinSettings.cs b/src/Ombi.Settings/Settings/Models/External/JellyfinSettings.cs
index 0785137c5..3bee56848 100644
--- a/src/Ombi.Settings/Settings/Models/External/JellyfinSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/External/JellyfinSettings.cs
@@ -6,7 +6,6 @@ namespace Ombi.Core.Settings.Models.External
public sealed class JellyfinSettings : Ombi.Settings.Settings.Models.Settings
{
public bool Enable { get; set; }
- public bool IsJellyfin { get; set; }
public List Servers { get; set; } = new List();
}
diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
index bcd0e7d4a..744148ff9 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
@@ -36,7 +36,6 @@ export interface IUpdateSettings extends ISettings {
export interface IEmbySettings extends ISettings {
enable: boolean;
- isJellyfin: boolean;
servers: IEmbyServer[];
}
@@ -56,7 +55,6 @@ export interface IPublicInfo {
export interface IJellyfinSettings extends ISettings {
enable: boolean;
- isJellyfin: boolean;
servers: IJellyfinServer[];
}
diff --git a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html
index c1d8c1a83..e7dd34504 100644
--- a/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/emby/emby.component.html
@@ -70,8 +70,8 @@
- Current URL: "{{server.serverHostname}}/#!/{{settings.isJellyfin ? ("itemdetails"): ("item/item")}}.html?id=1"
- Current URL: "https://app.emby.media/#!/{{settings.isJellyfin ? ("itemdetails"): ("item/item")}}.html?id=1
+ Current URL: "{{server.serverHostname}}/#!/item/item.html?id=1"
+ Current URL: "https://app.emby.media/#!/item/item.html?id=1
diff --git a/src/Ombi/ClientApp/src/app/settings/jellyfin/jellyfin.component.html b/src/Ombi/ClientApp/src/app/settings/jellyfin/jellyfin.component.html
index 8eb1f90ed..4ff8991c1 100644
--- a/src/Ombi/ClientApp/src/app/settings/jellyfin/jellyfin.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/jellyfin/jellyfin.component.html
@@ -70,8 +70,8 @@
- Current URL: "{{server.serverHostname}}/#!/{{settings.isJellyfin ? ("itemdetails"): ("item/item")}}.html?id=1"
- Current URL: "https://app.jellyfin.media/#!/{{settings.isJellyfin ? ("itemdetails"): ("item/item")}}.html?id=1
+ Current URL: "{{server.serverHostname}}/#!/itemdetails.html?id=1"
+ Current URL: "https://app.jellyfin.media/#!/itemdetails.html?id=1
diff --git a/src/Ombi/ClientApp/src/app/wizard/emby/emby.component.ts b/src/Ombi/ClientApp/src/app/wizard/emby/emby.component.ts
index 58d5dd3f6..f528d8be3 100644
--- a/src/Ombi/ClientApp/src/app/wizard/emby/emby.component.ts
+++ b/src/Ombi/ClientApp/src/app/wizard/emby/emby.component.ts
@@ -20,7 +20,6 @@ export class EmbyComponent implements OnInit {
public ngOnInit() {
this.embySettings = {
servers: [],
- isJellyfin: false,
id: 0,
enable: true,
};
diff --git a/src/Ombi/ClientApp/src/app/wizard/jellyfin/jellyfin.component.ts b/src/Ombi/ClientApp/src/app/wizard/jellyfin/jellyfin.component.ts
index 4c42c88ac..e6b96d0f7 100644
--- a/src/Ombi/ClientApp/src/app/wizard/jellyfin/jellyfin.component.ts
+++ b/src/Ombi/ClientApp/src/app/wizard/jellyfin/jellyfin.component.ts
@@ -20,7 +20,6 @@ export class JellyfinComponent implements OnInit {
public ngOnInit() {
this.jellyfinSettings = {
servers: [],
- isJellyfin: false,
id: 0,
enable: true,
};