Merge pull request #4225 from Ombi-app/develop-kuraki

Develop kuraki
Ombi-app · Jun 12, 2021 · 09ac840 · 09ac840
2 parents be975d8 + 31427c3
commit 09ac840
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
@@ -27,9 +27,12 @@ public async Task<RuleResult> Execute(SearchViewModel obj)
             var useTheMovieDb = false;
             var useId = false;
             var useTvDb = false;
+
+            PlexMediaTypeEntity type = ConvertType(obj.Type);
+
             if (obj.ImdbId.HasValue())
             {
-                item = await PlexContentRepository.Get(obj.ImdbId, ProviderType.ImdbId);
+                item = await PlexContentRepository.GetByType(obj.ImdbId, ProviderType.ImdbId, type);
                 if (item != null)
                 {
                     useImdb = true;
@@ -39,15 +42,15 @@ public async Task<RuleResult> Execute(SearchViewModel obj)
             {
                 if (obj.Id > 0)
                 {
-                    item = await PlexContentRepository.Get(obj.Id.ToString(), ProviderType.TheMovieDbId);
+                    item = await PlexContentRepository.GetByType(obj.Id.ToString(), ProviderType.TheMovieDbId, type);
                     if (item != null)
                     {
                         useId = true;
                     }
                 }
                 if (obj.TheMovieDbId.HasValue())
                 {
-                    item = await PlexContentRepository.Get(obj.TheMovieDbId, ProviderType.TheMovieDbId);
+                    item = await PlexContentRepository.GetByType(obj.TheMovieDbId, ProviderType.TheMovieDbId, type);
                     if (item != null)
                     {
                         useTheMovieDb = true;
@@ -58,7 +61,7 @@ public async Task<RuleResult> Execute(SearchViewModel obj)
                 {
                     if (obj.TheTvDbId.HasValue())
                     {
-                        item = await PlexContentRepository.Get(obj.TheTvDbId, ProviderType.TvDbId);
+                        item = await PlexContentRepository.GetByType(obj.TheTvDbId, ProviderType.TvDbId, type);
                         if (item != null)
                         {
                             useTvDb = true;
@@ -100,6 +103,12 @@ public async Task<RuleResult> Execute(SearchViewModel obj)
             return Success();
         }
 
-
+        private PlexMediaTypeEntity ConvertType(RequestType type) =>
+            type switch
+            {
+                RequestType.Movie => PlexMediaTypeEntity.Movie,
+                RequestType.TvShow => PlexMediaTypeEntity.Show,
+                _ => PlexMediaTypeEntity.Movie,
+            };
     }
 }
diff --git a/src/Ombi.Helpers/PlexHelper.cs b/src/Ombi.Helpers/PlexHelper.cs
@@ -107,7 +107,7 @@ public static ProviderId GetProviderIdFromPlexGuid(string guid)
         public static string GetPlexMediaUrl(string machineId, int mediaId)
         {
             var url =
-                $"https://app.plex.tv/web/app#!/server/{machineId}/details?key=library%2Fmetadata%2F{mediaId}";
+                $"https://app.plex.tv/web/app#!/server/{machineId}/details?key=%2flibrary%2Fmetadata%2F{mediaId}";
             return url;
         }
 

diff --git a/src/Ombi.Store/Repository/IPlexContentRepository.cs b/src/Ombi.Store/Repository/IPlexContentRepository.cs
@@ -12,6 +12,7 @@ public interface IPlexContentRepository : IExternalRepository<PlexServerContent>
     {
         Task<bool> ContentExists(string providerId);
         Task<PlexServerContent> Get(string providerId, ProviderType type);
+        Task<PlexServerContent> GetByType(string providerId, ProviderType type, PlexMediaTypeEntity plexType);
         Task<PlexServerContent> GetByKey(int key);
         Task Update(PlexServerContent existingContent);
         IQueryable<PlexEpisode> GetAllEpisodes();

diff --git a/src/Ombi.Store/Repository/PlexContentRepository.cs b/src/Ombi.Store/Repository/PlexContentRepository.cs
@@ -79,6 +79,23 @@ public async Task<PlexServerContent> Get(string providerId, ProviderType type)
             return null;
         }
 
+        public async Task<PlexServerContent> GetByType(string providerId, ProviderType type, PlexMediaTypeEntity plexType)
+        {
+            switch (type)
+            {
+                case ProviderType.ImdbId:
+                    return await Db.PlexServerContent.FirstOrDefaultAsync(x => x.ImdbId == providerId && x.Type == plexType);
+                case ProviderType.TheMovieDbId:
+                    return await Db.PlexServerContent.FirstOrDefaultAsync(x => x.TheMovieDbId == providerId && x.Type == plexType);
+                case ProviderType.TvDbId:
+                    return await Db.PlexServerContent.FirstOrDefaultAsync(x => x.TvDbId == providerId && x.Type == plexType);
+                default:
+                    break;
+            }
+
+            return null;
+        }
+
         public async Task<PlexServerContent> GetByKey(int key)
         {
             return await Db.PlexServerContent.Include(x => x.Seasons).FirstOrDefaultAsync(x => x.Key == key);

diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
@@ -49,7 +49,7 @@
                                 {{'Search.ViewOnEmby' | translate}}
                                 <i class="far fa-play-circle fa-2x"></i>
                             </a>
-                            <a id="viewOnJellyfinButton" *ngIf="movie.jellyfinUrl" href="{{movie.jellyfinUrl}}" mat-raised-button  target="_blank" class="btn-spacing viewon-btn jellyfinUrl">
+                            <a id="viewOnJellyfinButton" *ngIf="movie.jellyfinUrl" href="{{movie.jellyfinUrl}}" mat-raised-button  target="_blank" class="btn-spacing viewon-btn jellyfin">
                                 {{'Search.ViewOnJellyfin' | translate}}
                                 <i class="far fa-play-circle fa-2x"></i>
                             </a>