Added hint for tvdb: imdb: search prefixes. Also fixed the series title overflow issue.
This commit is contained in:
parent
8f192e635f
commit
981ffb09fc
|
@ -31,6 +31,18 @@ namespace NzbDrone.Core.MetadataSource
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (title.StartsWith("imdb:") || title.StartsWith("imdbid:"))
|
||||||
|
{
|
||||||
|
var slug = title.Split(':')[1].TrimStart('t');
|
||||||
|
|
||||||
|
if (slug.IsNullOrWhiteSpace() || !slug.All(char.IsDigit) || slug.Length < 7)
|
||||||
|
{
|
||||||
|
return new List<Series>();
|
||||||
|
}
|
||||||
|
|
||||||
|
title = "tt" + slug;
|
||||||
|
}
|
||||||
|
|
||||||
if (title.StartsWith("tvdb:") || title.StartsWith("tvdbid:") || title.StartsWith("slug:"))
|
if (title.StartsWith("tvdb:") || title.StartsWith("tvdbid:") || title.StartsWith("slug:"))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
|
@ -5,10 +5,11 @@ define(
|
||||||
'marionette',
|
'marionette',
|
||||||
'AddSeries/AddSeriesCollection',
|
'AddSeries/AddSeriesCollection',
|
||||||
'AddSeries/SearchResultCollectionView',
|
'AddSeries/SearchResultCollectionView',
|
||||||
|
'AddSeries/EmptyView',
|
||||||
'AddSeries/NotFoundView',
|
'AddSeries/NotFoundView',
|
||||||
'Shared/LoadingView',
|
'Shared/LoadingView',
|
||||||
'underscore'
|
'underscore'
|
||||||
], function (vent, Marionette, AddSeriesCollection, SearchResultCollectionView, NotFoundView, LoadingView, _) {
|
], function (vent, Marionette, AddSeriesCollection, SearchResultCollectionView, EmptyView, NotFoundView, LoadingView, _) {
|
||||||
return Marionette.Layout.extend({
|
return Marionette.Layout.extend({
|
||||||
template: 'AddSeries/AddSeriesViewTemplate',
|
template: 'AddSeries/AddSeriesViewTemplate',
|
||||||
|
|
||||||
|
@ -64,13 +65,14 @@ define(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
self.searchResult.close();
|
|
||||||
self._abortExistingSearch();
|
self._abortExistingSearch();
|
||||||
self.throttledSearch({
|
self.throttledSearch({
|
||||||
term: self.ui.seriesSearch.val()
|
term: self.ui.seriesSearch.val()
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this._clearResults();
|
||||||
|
|
||||||
if (this.isExisting) {
|
if (this.isExisting) {
|
||||||
this.ui.searchBar.hide();
|
this.ui.searchBar.hide();
|
||||||
}
|
}
|
||||||
|
@ -104,7 +106,7 @@ define(
|
||||||
|
|
||||||
else if (!this.isExisting) {
|
else if (!this.isExisting) {
|
||||||
this.collection.reset();
|
this.collection.reset();
|
||||||
this.searchResult.close();
|
this._clearResults();
|
||||||
this.ui.seriesSearch.val('');
|
this.ui.seriesSearch.val('');
|
||||||
this.ui.seriesSearch.focus();
|
this.ui.seriesSearch.focus();
|
||||||
}
|
}
|
||||||
|
@ -119,6 +121,15 @@ define(
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_clearResults: function () {
|
||||||
|
if (!this.isExisting) {
|
||||||
|
this.searchResult.show(new EmptyView());
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.searchResult.close();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
_showResults: function () {
|
_showResults: function () {
|
||||||
if (!this.isClosed) {
|
if (!this.isClosed) {
|
||||||
|
|
||||||
|
@ -139,6 +150,9 @@ define(
|
||||||
console.log('aborting previous pending search request.');
|
console.log('aborting previous pending search request.');
|
||||||
this.currentSearchPromise.abort();
|
this.currentSearchPromise.abort();
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
this._clearResults();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
define(
|
||||||
|
[
|
||||||
|
'marionette'
|
||||||
|
], function (Marionette) {
|
||||||
|
|
||||||
|
return Marionette.CompositeView.extend({
|
||||||
|
template: 'AddSeries/EmptyViewTemplate'
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,3 @@
|
||||||
|
<div class="text-center hint col-md-12">
|
||||||
|
<span>You can also search by tvdbid and imdbid using the tvdb: and imdb: prefixes.</span>
|
||||||
|
</div>
|
|
@ -100,6 +100,11 @@
|
||||||
margin : 30px 0px;
|
margin : 30px 0px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hint {
|
||||||
|
color : #999999;
|
||||||
|
font-style : italic;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
li.add-new {
|
li.add-new {
|
||||||
|
|
|
@ -5,7 +5,7 @@ define(
|
||||||
], function (TemplatedCell) {
|
], function (TemplatedCell) {
|
||||||
return TemplatedCell.extend({
|
return TemplatedCell.extend({
|
||||||
|
|
||||||
className: 'series-title',
|
className: 'series-title-cell',
|
||||||
template : 'Cells/SeriesTitleTemplate'
|
template : 'Cells/SeriesTitleTemplate'
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
@import "../Content/mixins";
|
@import "../Content/mixins";
|
||||||
@import "../Content/variables";
|
@import "../Content/variables";
|
||||||
|
|
||||||
.series-title {
|
.series-title-cell {
|
||||||
.text-overflow();
|
.text-overflow();
|
||||||
|
|
||||||
@media @sm {
|
@media @sm {
|
||||||
|
|
|
@ -5,7 +5,7 @@ define(
|
||||||
], function (TemplatedCell) {
|
], function (TemplatedCell) {
|
||||||
return TemplatedCell.extend({
|
return TemplatedCell.extend({
|
||||||
|
|
||||||
className: 'series-title',
|
className: 'series-title-cell',
|
||||||
template : 'System/Backup/BackupFilenameCellTemplate'
|
template : 'System/Backup/BackupFilenameCellTemplate'
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue