From 643201278f999c5a3ba6ed4ff9ee24383bcef11e Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Tue, 11 Dec 2018 01:28:44 -0500 Subject: [PATCH 1/3] Update the DLNA profile links - updates ManufacturerUrl and ModelUrl to jellyfin repo --- Emby.Dlna/Profiles/DefaultProfile.cs | 4 ++-- Emby.Dlna/Profiles/Xml/Default.xml | 6 +++--- Emby.Dlna/Profiles/Xml/Denon AVR.xml | 6 +++--- Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml | 6 +++--- Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml | 6 +++--- Emby.Dlna/Profiles/Xml/LG Smart TV.xml | 6 +++--- Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml | 6 +++--- Emby.Dlna/Profiles/Xml/Marantz.xml | 6 +++--- Emby.Dlna/Profiles/Xml/MediaMonkey.xml | 6 +++--- Emby.Dlna/Profiles/Xml/Panasonic Viera.xml | 6 +++--- Emby.Dlna/Profiles/Xml/Popcorn Hour.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml | 4 ++-- Emby.Dlna/Profiles/Xml/WDTV Live.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Xbox One.xml | 4 ++-- Emby.Dlna/Profiles/Xml/foobar2000.xml | 6 +++--- 23 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs index 4007d8870..ddc575700 100644 --- a/Emby.Dlna/Profiles/DefaultProfile.cs +++ b/Emby.Dlna/Profiles/DefaultProfile.cs @@ -18,8 +18,8 @@ namespace Emby.Dlna.Profiles ModelDescription = "UPnP/AV 1.0 Compliant Media Server"; ModelName = "Emby Server"; ModelNumber = "01"; - ModelUrl = "https://emby.media"; - ManufacturerUrl = "https://emby.media"; + ModelUrl = "https://github.com/jellyfin/jellyfin"; + ManufacturerUrl = "https://github.com/jellyfin/jellyfin"; AlbumArtPn = "JPEG_SM"; diff --git a/Emby.Dlna/Profiles/Xml/Default.xml b/Emby.Dlna/Profiles/Xml/Default.xml index cdbf3bbe5..5d23a71ff 100644 --- a/Emby.Dlna/Profiles/Xml/Default.xml +++ b/Emby.Dlna/Profiles/Xml/Default.xml @@ -2,11 +2,11 @@ Generic Device Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/Denon AVR.xml b/Emby.Dlna/Profiles/Xml/Denon AVR.xml index 14e89d006..ff341e56f 100644 --- a/Emby.Dlna/Profiles/Xml/Denon AVR.xml +++ b/Emby.Dlna/Profiles/Xml/Denon AVR.xml @@ -7,11 +7,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -64,4 +64,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml index cfd2edfae..211d5a131 100644 --- a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml +++ b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml @@ -8,11 +8,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml index d95b8dc96..865f8dd6a 100644 --- a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml +++ b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml @@ -9,11 +9,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -92,4 +92,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml index 1c579321b..ee4634e76 100644 --- a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml @@ -8,11 +8,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -88,4 +88,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml index d98f2bb07..17dc336a7 100644 --- a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -6,11 +6,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/Marantz.xml b/Emby.Dlna/Profiles/Xml/Marantz.xml index 81bea492f..b672d77a5 100644 --- a/Emby.Dlna/Profiles/Xml/Marantz.xml +++ b/Emby.Dlna/Profiles/Xml/Marantz.xml @@ -8,11 +8,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml index a144b3475..83ddb6ac0 100644 --- a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml +++ b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml @@ -8,11 +8,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml index 47a130444..59d1fdd17 100644 --- a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -9,11 +9,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -83,4 +83,4 @@ - \ No newline at end of file + diff --git a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml index a695de8fd..a435d1484 100644 --- a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml +++ b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml @@ -2,11 +2,11 @@ Popcorn Hour Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml index 6f7a59efc..89167c9aa 100644 --- a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -8,11 +8,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin true true false diff --git a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml index 73c4d2ff5..c9d428e57 100644 --- a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml +++ b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml @@ -8,11 +8,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml index 9219569b8..0cb0c52c2 100644 --- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml +++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml @@ -12,11 +12,11 @@ Microsoft Corporation - https://emby.media + https://github.com/jellyfin/jellyfin Windows Media Player Sharing UPnP/AV 1.0 Compliant Media Server 3.0 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml index d7a53832d..602c54f61 100644 --- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml +++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml @@ -12,11 +12,11 @@ Microsoft Corporation - https://emby.media + https://github.com/jellyfin/jellyfin Windows Media Player Sharing UPnP/AV 1.0 Compliant Media Server 3.0 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml index 316aa6de2..701aba85f 100644 --- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml +++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml @@ -10,11 +10,11 @@ Microsoft Corporation - https://emby.media + https://github.com/jellyfin/jellyfin Windows Media Player Sharing UPnP/AV 1.0 Compliant Media Server 3.0 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml index f6e93a191..5f9012678 100644 --- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml +++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml @@ -10,11 +10,11 @@ Microsoft Corporation - https://emby.media + https://github.com/jellyfin/jellyfin Windows Media Player Sharing UPnP/AV 1.0 Compliant Media Server 3.0 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index f9212cccb..765d5d5fe 100644 --- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -10,11 +10,11 @@ Microsoft Corporation - https://emby.media + https://github.com/jellyfin/jellyfin Windows Media Player Sharing UPnP/AV 1.0 Compliant Media Server 3.0 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml index d603010d0..01d4bc086 100644 --- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -9,11 +9,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false true false diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml index 9540debff..47aa84488 100644 --- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml +++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml @@ -9,11 +9,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false true false diff --git a/Emby.Dlna/Profiles/Xml/WDTV Live.xml b/Emby.Dlna/Profiles/Xml/WDTV Live.xml index 79d9ba2ce..f7e43368a 100644 --- a/Emby.Dlna/Profiles/Xml/WDTV Live.xml +++ b/Emby.Dlna/Profiles/Xml/WDTV Live.xml @@ -9,11 +9,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/Xbox One.xml b/Emby.Dlna/Profiles/Xml/Xbox One.xml index b05b21455..a9a302854 100644 --- a/Emby.Dlna/Profiles/Xml/Xbox One.xml +++ b/Emby.Dlna/Profiles/Xml/Xbox One.xml @@ -9,11 +9,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false diff --git a/Emby.Dlna/Profiles/Xml/foobar2000.xml b/Emby.Dlna/Profiles/Xml/foobar2000.xml index 56c04e1e7..ba0fcf739 100644 --- a/Emby.Dlna/Profiles/Xml/foobar2000.xml +++ b/Emby.Dlna/Profiles/Xml/foobar2000.xml @@ -8,11 +8,11 @@ Emby - https://emby.media + https://github.com/jellyfin/jellyfin Emby Server UPnP/AV 1.0 Compliant Media Server 01 - https://emby.media + https://github.com/jellyfin/jellyfin false false false @@ -63,4 +63,4 @@ - \ No newline at end of file + From 71b8602a3d89ceb6799c20d96cc251b149338324 Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Tue, 11 Dec 2018 01:31:08 -0500 Subject: [PATCH 2/3] Updates all other emby.media links to repo page --- Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 2 +- Emby.Server.Implementations/News/NewsEntryPoint.cs | 2 +- MediaBrowser.Providers/Movies/MovieDbProvider.cs | 8 ++++---- MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index d21abb74e..167f2a84b 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -279,7 +279,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV public string HomePageUrl { - get { return "https://emby.media"; } + get { return "https://github.com/jellyfin/jellyfin"; } } public async Task RefreshSeriesTimers(CancellationToken cancellationToken, IProgress progress) diff --git a/Emby.Server.Implementations/News/NewsEntryPoint.cs b/Emby.Server.Implementations/News/NewsEntryPoint.cs index 3ce3d2315..38a250593 100644 --- a/Emby.Server.Implementations/News/NewsEntryPoint.cs +++ b/Emby.Server.Implementations/News/NewsEntryPoint.cs @@ -82,7 +82,7 @@ namespace Emby.Server.Implementations.News var requestOptions = new HttpRequestOptions { - Url = "https://emby.media/community/index.php?/blog/rss/1-media-browser-developers-blog", + Url = "https://github.com/jellyfin/jellyfin", Progress = new SimpleProgress(), UserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.42 Safari/537.36", BufferContent = false diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index 6266e717e..37cf997c3 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs @@ -287,7 +287,7 @@ namespace MediaBrowser.Providers.Movies if (!string.IsNullOrEmpty(language)) { // They require this to be uppercase - // https://emby.media/community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148 + // /community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148 var parts = language.Split('-'); if (parts.Length == 2) @@ -301,9 +301,9 @@ namespace MediaBrowser.Providers.Movies public static string AdjustImageLanguage(string imageLanguage, string requestLanguage) { - if (!string.IsNullOrEmpty(imageLanguage) - && !string.IsNullOrEmpty(requestLanguage) - && requestLanguage.Length > 2 + if (!string.IsNullOrEmpty(imageLanguage) + && !string.IsNullOrEmpty(requestLanguage) + && requestLanguage.Length > 2 && imageLanguage.Length == 2 && requestLanguage.StartsWith(imageLanguage, StringComparison.OrdinalIgnoreCase)) { diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs index 505fec65f..af9f0785f 100644 --- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs @@ -353,7 +353,7 @@ namespace MediaBrowser.XbmcMetadata.Savers if (!string.IsNullOrEmpty(stream.Language)) { - // https://emby.media/community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify + // /community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify writer.WriteElementString("language", RemoveInvalidXMLChars(stream.Language)); } @@ -777,7 +777,7 @@ namespace MediaBrowser.XbmcMetadata.Savers //Logger.Debug("Verifying custom provider tagname {0}", tagName); XmlConvert.VerifyName(tagName); //Logger.Debug("Saving custom provider tagname {0}", tagName); - + writer.WriteElementString(GetTagForProviderKey(providerKey), providerId); } catch (ArgumentException) From 99482f07362b02d2edf0a7ac34bd7d682c67baf3 Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Tue, 11 Dec 2018 01:42:52 -0500 Subject: [PATCH 3/3] Reverts changes to forum URLs - restores the original URL for some comments, keeping context --- MediaBrowser.Providers/Movies/MovieDbProvider.cs | 2 +- MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index 37cf997c3..e68ce19de 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs @@ -287,7 +287,7 @@ namespace MediaBrowser.Providers.Movies if (!string.IsNullOrEmpty(language)) { // They require this to be uppercase - // /community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148 + // https://emby.media/community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148 var parts = language.Split('-'); if (parts.Length == 2) diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs index af9f0785f..f6ea9b4b2 100644 --- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs @@ -353,7 +353,7 @@ namespace MediaBrowser.XbmcMetadata.Savers if (!string.IsNullOrEmpty(stream.Language)) { - // /community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify + // https://emby.media/community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify writer.WriteElementString("language", RemoveInvalidXMLChars(stream.Language)); }