merge

CHANGELOG.md

@@ -2,6 +2,43 @@
 
 ## (unreleased)
 
+### **New Features**
+
+- Updated the emby api since we no longer need the extra parameters to send to emby to log in a local user #2546. [Jamie]
+
+- Added the ability to get the ombi user via a Plex Token #2591. [Jamie]
+
+### **Fixes**
+
+- Made the subscribe/unsubscribe button more obvious on the UI #2309. [Jamie]
+
+- Fixed #2603. [Jamie]
+
+- Fixed the issue with the user overrides #2646. [Jamie]
+
+- Fixed the issue where we could sometimes allow the request of a whole series when the user shouldn't be able to. [Jamie]
+
+- Fixed the issue where we were marking episodes as available with the Emby connection when they have not yet aired #2417 #2623. [TidusJar]
+
+- Fixed the issue where we were marking the whole season as wanted in Sonarr rather than the individual episode #2629. [TidusJar]
+
+- Fixed #2623. [Jamie]
+
+- Fixed #2633. [TidusJar]
+
+- Fixed #2639. [Jamie]
+
+- Show the TV show as available when we have all the episodes but future episodes have not aired. #2585. [Jamie]
+
+
+## v3.0.3945 (2018-10-25)
+
+### **New Features**
+
+- Update Readme for Lidarr. [Qstick]
+
+- Update CHANGELOG.md. [Jamie]
+
 ### **Fixes**
 
 - New translations en.json (French) [Jamie]

src/Ombi.Api.Emby/EmbyApi.cs

@@ -53,8 +53,6 @@ namespace Ombi.Api.Emby
             {
                 username,
                 pw = password,
-                password = password.GetSha1Hash().ToLower(),
-                passwordMd5 = password.CalcuateMd5Hash()
             };
 
             request.AddJsonBody(body);

src/Ombi.Core/Engine/TvRequestEngine.cs

@@ -116,6 +116,7 @@ namespace Ombi.Core.Engine
                     }
 
                 // Remove the ID since this is a new child
+                // This was a TVDBID for the request rules to run
                 tvBuilder.ChildRequest.Id = 0;
                 if (!tvBuilder.ChildRequest.SeasonRequests.Any())
                 {

src/Ombi.Core/Helpers/TvShowRequestBuilder.cs

@@ -41,7 +41,7 @@ namespace Ombi.Core.Helpers
             ShowInfo = await TvApi.ShowLookupByTheTvDbId(id);
             Results = await MovieDbApi.SearchTv(ShowInfo.name);
             foreach (TvSearchResult result in Results) {
-                if (result.Name == ShowInfo.name)
+                if (result.Name.Equals(ShowInfo.name, StringComparison.InvariantCultureIgnoreCase))
                 {                  
                     var showIds = await MovieDbApi.GetTvExternals(result.Id);
                     ShowInfo.externals.imdb = showIds.imdb_id;
@@ -64,14 +64,15 @@ namespace Ombi.Core.Helpers
         {
             ChildRequest = new ChildRequests
             {
-                Id = model.TvDbId,
+                Id = model.TvDbId, // This is set to 0 after the request rules have run, the request rules needs it to identify the request
                 RequestType = RequestType.TvShow,
                 RequestedDate = DateTime.UtcNow,
                 Approved = false,
                 RequestedUserId = userId,
                 SeasonRequests = new List<SeasonRequests>(),
                 Title = ShowInfo.name,
-                SeriesType = ShowInfo.genres.Any( s => s.Equals("Anime", StringComparison.OrdinalIgnoreCase)) ? SeriesType.Anime : SeriesType.Standard
+                ReleaseYear = FirstAir,
+                SeriesType = ShowInfo.genres.Any( s => s.Equals("Anime", StringComparison.InvariantCultureIgnoreCase)) ? SeriesType.Anime : SeriesType.Standard
             };
 
             return this;

src/Ombi.Core/Rule/Rules/Request/ExistingPlexRequestRule.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Ombi.Core.Rule.Interfaces;
+using Ombi.Store.Entities;
+using Ombi.Store.Entities.Requests;
+using Ombi.Store.Repository;
+
+namespace Ombi.Core.Rule.Rules.Request
+{
+    public class ExistingPlexRequestRule : BaseRequestRule, IRules<BaseRequest>
+    {
+        public ExistingPlexRequestRule(IPlexContentRepository rv)
+        {
+            _plexContent = rv;
+        }
+
+        private readonly IPlexContentRepository _plexContent;
+
+        /// <summary>
+        /// We check if the request exists, if it does then we don't want to re-request it.
+        /// </summary>
+        /// <param name="obj">The object.</param>
+        /// <returns></returns>
+        public async Task<RuleResult> Execute(BaseRequest obj)
+        {
+            if (obj.RequestType == RequestType.TvShow)
+            {
+                var tvRequest = (ChildRequests) obj;
+
+                var tvContent = _plexContent.GetAll().Where(x => x.Type == PlexMediaTypeEntity.Show);
+                // We need to do a check on the TVDBId
+                var anyTvDbMatches = await tvContent.Include(x => x.Episodes).FirstOrDefaultAsync(x => x.HasTvDb && x.TvDbId.Equals(tvRequest.Id.ToString())); // the Id on the child is the tvdbid at this point
+                if (anyTvDbMatches == null)
+                {
+                    // So we do not have a TVDB Id, that really sucks.
+                    // Let's try and match on the title and year of the show
+                    var titleAndYearMatch = await tvContent.Include(x=> x.Episodes).FirstOrDefaultAsync(x =>
+                        x.Title.Equals(tvRequest.Title, StringComparison.InvariantCultureIgnoreCase)
+                        && x.ReleaseYear == tvRequest.ReleaseYear.Year.ToString());
+                    if (titleAndYearMatch != null)
+                    {
+                        // We have a match! Suprise Motherfucker
+                        return CheckExistingContent(tvRequest, titleAndYearMatch);
+                    }
+
+                    // We do not have this
+                    return Success();
+                }
+                // looks like we have a match on the TVDbID
+                return CheckExistingContent(tvRequest, anyTvDbMatches);
+            }
+            return Success();
+        }
+
+
+        private RuleResult CheckExistingContent(ChildRequests child, PlexServerContent content)
+        {
+            foreach (var season in child.SeasonRequests)
+            {
+                var currentSeasonRequest =
+                    content.Episodes.Where(x => x.SeasonNumber == season.SeasonNumber).ToList();
+                if (!currentSeasonRequest.Any())
+                {
+                    continue;
+                }
+                foreach (var e in season.Episodes)
+                {
+                    var hasEpisode = currentSeasonRequest.Any(x => x.EpisodeNumber == e.EpisodeNumber);
+                    if (hasEpisode)
+                    {
+                        return Fail($"We already have episodes requested from series {child.Title}");
+                    }
+                }
+            }
+
+            return Success();
+        }
+    }
+}

src/Ombi.Core/Senders/MovieSender.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -101,13 +102,17 @@ namespace Ombi.Core.Senders
             var profiles = await _userProfiles.GetAll().FirstOrDefaultAsync(x => x.UserId == model.RequestedUserId);
             if (profiles != null)
             {
-                if (profiles.SonarrRootPathAnime > 0)
+                if (profiles.RadarrRootPath > 0)
                 { 
-                    rootFolderPath = await RadarrRootPath(profiles.SonarrRootPathAnime, settings);
+                    var tempPath = await RadarrRootPath(profiles.RadarrRootPath, settings);
+                    if (tempPath.HasValue())
+                    {
+                        rootFolderPath = tempPath;
+                    }
                 }
-                if (profiles.SonarrQualityProfileAnime > 0)
+                if (profiles.RadarrQualityProfile > 0)
                 {
-                    qualityToUse = profiles.SonarrQualityProfileAnime;
+                    qualityToUse = profiles.RadarrQualityProfile;
                 }
             }
 
@@ -163,7 +168,7 @@ namespace Ombi.Core.Senders
         {
             var paths = await RadarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
             var selectedPath = paths.FirstOrDefault(x => x.id == overrideId);
-            return selectedPath.path;
+            return selectedPath?.path ?? String.Empty;
         }
     }
 }

src/Ombi.Store/Entities/Requests/ChildRequests.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using Ombi.Store.Repository.Requests;
 
@@ -22,6 +23,8 @@ namespace Ombi.Store.Entities.Requests
         [NotMapped]
         public bool ShowSubscribe { get; set; }
 
+        [NotMapped]
+        public DateTime ReleaseYear { get; set; } // Used in the ExistingPlexRequestRule.cs
 
         [ForeignKey(nameof(IssueId))]
         public List<Issues> Issues { get; set; }

src/Ombi/ClientApp/app/landingpage/landingpage.component.html

@@ -3,7 +3,7 @@
 
     <div class="centered col-md-12">
         <div class="row">
-            <div class="col-md-push-5 col-md-2">
+            <div class="col-md-push-3 col-md-6">
                 <div *ngIf="customizationSettings.logo">
                     <img [src]="customizationSettings.logo" style="width:100%"/>
                 </div>

src/Ombi/ClientApp/app/requests/request.component.html

@@ -9,7 +9,7 @@
         <a id="tvTabButton" aria-controls="profile" role="tab" data-toggle="tab" (click)="selectTvTab()" href="#tvTab"><i class="fa fa-television"></i> {{ 'Requests.TvTab' | translate }}</a>
 
     </li>
-    <li role="presentation">
+    <li role="presentation" *ngIf="musicEnabled">
         <a id="albumTabButton" aria-controls="profile" role="tab" data-toggle="tab" (click)="selectMusicTab()" href="#albumTab"><i class="fa fa-music"></i> {{ 'Requests.MusicTab' | translate }}</a>
 
     </li>

src/Ombi/ClientApp/app/requests/request.component.ts

@@ -15,6 +15,7 @@ export class RequestComponent implements OnInit  {
 
     public issueCategories: IIssueCategory[];
     public issuesEnabled = false;
+    public musicEnabled: boolean;
 
     constructor(private issuesService: IssuesService,
                 private settingsService: SettingsService) {
@@ -23,6 +24,7 @@ export class RequestComponent implements OnInit  {
 
     public ngOnInit(): void {
         this.issuesService.getCategories().subscribe(x => this.issueCategories = x);
+        this.settingsService.lidarrEnabled().subscribe(x => this.musicEnabled = x);
         this.settingsService.getIssueSettings().subscribe(x => this.issuesEnabled = x.enabled);
     }
 

src/Ombi/ClientApp/app/search/moviesearch.component.html

@@ -2,7 +2,8 @@
 <div role="tabpanel" class="tab-pane active" id="MoviesTab">
 
     <div class="input-group">
-        <input id="search" type="text" class="form-control form-control-custom form-control-search form-control-withbuttons" (keyup)="search($event)">
+        <input id="search" type="text" class="form-control form-control-custom form-control-search form-control-withbuttons"
+            (keyup)="search($event)">
         <div class="input-group-addon right-radius">
             <div class="btn-group">
                 <a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
@@ -25,12 +26,13 @@
     <!-- Movie content -->
     <div id="movieList">
         <div *ngIf="searchApplied && movieResults?.length <= 0" class='no-search-results'>
-            <i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text' [translate]="'Search.NoResults'"></div>
+            <i class='fa fa-film no-search-results-icon'></i>
+            <div class='no-search-results-text' [translate]="'Search.NoResults'"></div>
         </div>
 
         <div *ngFor="let result of movieResults">
 
-            <div class="row" >
+            <div class="row">
 
                 <div class="myBg backdrop" [style.background-image]="result.background"></div>
                 <div class="tint" style="background-image: linear-gradient(to bottom, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%);"></div>
@@ -44,53 +46,70 @@
                             <h4>{{result.title}} ({{result.releaseDate | amLocal | amDateFormat: 'YYYY'}})</h4>
                         </a>
                         <span class="tags">
-                        <span *ngIf="result.releaseDate" class="label label-info" id="releaseDateLabel" target="_blank">{{ 'Search.TheatricalRelease' | translate: {date: result.releaseDate | amLocal | amDateFormat: 'LL'} }}</span>
-                        <span *ngIf="result.digitalReleaseDate" class="label label-info" id="releaseDateLabel" target="_blank">{{ 'Search.DigitalDate' | translate: {date: result.digitalReleaseDate | amLocal | amDateFormat: 'LL'} }}</span>
-
-                        <a *ngIf="result.homepage" href="{{result.homepage}}" id="homePageLabel" target="_blank"><span class="label label-info" [translate]="'Search.Movies.HomePage'"></span></a>
-
-                        <a *ngIf="result.trailer" href="{{result.trailer}}" id="trailerLabel" target="_blank"><span class="label label-info" [translate]="'Search.Movies.Trailer'"></span></a>
+                            <span *ngIf="result.releaseDate" class="label label-info" id="releaseDateLabel" target="_blank">{{
+                                'Search.TheatricalRelease' | translate: {date: result.releaseDate | amLocal |
+                                amDateFormat: 'LL'} }}</span>
+                            <span *ngIf="result.digitalReleaseDate" class="label label-info" id="releaseDateLabel"
+                                target="_blank">{{ 'Search.DigitalDate' | translate: {date: result.digitalReleaseDate |
+                                amLocal | amDateFormat: 'LL'} }}</span>
+
+                            <a *ngIf="result.homepage" href="{{result.homepage}}" id="homePageLabel" target="_blank"><span
+                                    class="label label-info" [translate]="'Search.Movies.HomePage'"></span></a>
+
+                            <a *ngIf="result.trailer" href="{{result.trailer}}" id="trailerLabel" target="_blank"><span
+                                    class="label label-info" [translate]="'Search.Movies.Trailer'"></span></a>
                             <span *ngIf="result.quality" id="qualityLabel" class="label label-success">{{result.quality}}p</span>
 
-                        <ng-template [ngIf]="result.available"><span class="label label-success" id="availableLabel" [translate]="'Common.Available'"></span></ng-template>
-                        <ng-template [ngIf]="result.approved && !result.available"><span class="label label-info" id="processingRequestLabel" [translate]="'Common.ProcessingRequest'"></span></ng-template>
-                        <ng-template [ngIf]="result.requested && !result.approved && !result.available"><span class="label label-warning" id="pendingApprovalLabel" [translate]="'Common.PendingApproval'"></span></ng-template>
-                        <ng-template [ngIf]="!result.requested && !result.available && !result.approved"><span class="label label-danger" id="notRequestedLabel" [translate]="'Common.NotRequested'"></span></ng-template>
+                            <ng-template [ngIf]="result.available"><span class="label label-success" id="availableLabel"
+                                    [translate]="'Common.Available'"></span></ng-template>
+                            <ng-template [ngIf]="result.approved && !result.available"><span class="label label-info"
+                                    id="processingRequestLabel" [translate]="'Common.ProcessingRequest'"></span></ng-template>
+                            <ng-template [ngIf]="result.requested && !result.approved && !result.available"><span class="label label-warning"
+                                    id="pendingApprovalLabel" [translate]="'Common.PendingApproval'"></span></ng-template>
+                            <ng-template [ngIf]="!result.requested && !result.available && !result.approved"><span
+                                    class="label label-danger" id="notRequestedLabel" [translate]="'Common.NotRequested'"></span></ng-template>
 
 
                         </span>
 
-                        <br/>
+                        <br />
                     </div>
                     <p style="font-size: 0.9rem !important">{{result.overview}}</p>
                 </div>
 
 
                 <div class="col-sm-2 small-padding">
-                    <div class="row" *ngIf="result.requested">
-                        <div class="col-md-2 col-md-push-10">
-    
-                            <a *ngIf="result.showSubscribe && !result.subscribed" style="color:white" (click)="subscribe(result)" pTooltip="Subscribe for notifications"> <i class="fa fa-rss"></i></a>
-                            <a *ngIf="result.showSubscribe && result.subscribed" style="color:red" (click)="unSubscribe(result)" pTooltip="Unsubscribe notification"> <i class="fa fa-rss"></i></a>
-                        </div>
-                    </div>
                     <div *ngIf="result.available">
-                        <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> {{ 'Common.Available' | translate }}</button>
+                        <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i>
+                            {{ 'Common.Available' | translate }}</button>
                     </div>
                     <div *ngIf="!result.available">
                         <div *ngIf="result.requested || result.approved; then requestedBtn else notRequestedBtn"></div>
                         <ng-template #requestedBtn>
-                        <button style="text-align: right" class="btn btn-primary-outline disabled" [disabled]><i class="fa fa-check"></i> {{ 'Common.Requested' | translate }}</button>
+                            <button style="text-align: right" class="btn btn-primary-outline disabled" [disabled]><i
+                                    class="fa fa-check"></i> {{ 'Common.Requested' | translate }}</button>
                         </ng-template>
                         <ng-template #notRequestedBtn>
-                        <button id="{{result.id}}" style="text-align: right" class="btn btn-primary-outline" (click)="request(result)">
-                            <i *ngIf="result.requestProcessing" class="fa fa-circle-o-notch fa-spin fa-fw"></i> <i *ngIf="!result.requestProcessing && !result.processed" class="fa fa-plus"></i>
-                            <i *ngIf="result.processed && !result.requestProcessing" class="fa fa-check"></i> {{ 'Common.Request' | translate }}</button>
+                            <button id="{{result.id}}" style="text-align: right" class="btn btn-primary-outline"
+                                (click)="request(result)">
+                                <i *ngIf="result.requestProcessing" class="fa fa-circle-o-notch fa-spin fa-fw"></i> <i
+                                    *ngIf="!result.requestProcessing && !result.processed" class="fa fa-plus"></i>
+                                <i *ngIf="result.processed && !result.requestProcessing" class="fa fa-check"></i> {{
+                                'Common.Request' | translate }}</button>
                         </ng-template>
                     </div>
-                        <button style="text-align: right" class="btn btn-sm btn-info-outline" (click)="similarMovies(result.id)"> <i class="fa fa-eye"></i> {{ 'Search.Similar' | translate }}</button>
+                    <div *ngIf="result.requested">
+                        <a *ngIf="result.showSubscribe && !result.subscribed" style="text-align: right" class="btn btn btn-success-outline"
+                            (click)="subscribe(result)" pTooltip="Subscribe for notifications when this movie becomes available">
+                            <i class="fa fa-rss"></i> Subscribe</a>
+                        <a *ngIf="result.showSubscribe && result.subscribed" style="text-align: right;" class="btn btn btn-warning-outline"
+                            (click)="unSubscribe(result)" pTooltip="Unsubscribe notifications when this movie becomes available">
+                            <i class="fa fa-rss"></i> Unsubscribe</a>
+                    </div>
+                    <button style="text-align: right" class="btn btn-sm btn-info-outline" (click)="similarMovies(result.id)">
+                        <i class="fa fa-eye"></i> {{ 'Search.Similar' | translate }}</button>
 
-                    <br/>
+                    <br />
                     <div *ngIf="result.available">
                         <a *ngIf="result.plexUrl" style="text-align: right" class="btn btn-sm btn-success-outline" href="{{result.plexUrl}}" target="_blank"><i class="fa fa-eye"></i> {{'Search.ViewOnPlex' | translate}}</a>
                         <a *ngIf="result.embyUrl" style="text-align: right" id="embybtn" class="btn btn-sm btn-success-outline" href="{{result.embyUrl}}" target="_blank"><i class="fa fa-eye"></i> {{'Search.ViewOnEmby' | translate}}</a>
@@ -108,8 +127,8 @@
                 </div>
 
             </div>
-            <br/>
-            <br/>
+            <br />
+            <br />
         </div>
 
     </div>
@@ -117,4 +136,4 @@
 
 
 <issue-report [movie]="true" [visible]="issuesBarVisible" (visibleChange)="issuesBarVisible = $event;" [title]="issueRequestTitle"
-[issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report>
+    [issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report>

src/Ombi/ClientApp/app/search/moviesearch.component.ts

@@ -172,7 +172,7 @@ export class MovieSearchComponent implements OnInit {
         r.subscribed = true;
         this.requestService.subscribeToMovie(r.requestId)
             .subscribe(x => {
-                this.notificationService.success("Subscribed To Movie!");
+                this.notificationService.success(`Subscribed To Movie ${r.title}!`);
             });
     }
 

src/Ombi/Controllers/IdentityController.cs

@@ -863,6 +863,7 @@ namespace Ombi.Controllers
         {
             var ombiUser = new OmbiUser
             {
+                Alias = user.Alias,
                 Email = user.EmailAddress,
                 UserName = user.UserName
             };