From 0fd0b31a609cf75d5660c105ae54b700175762f5 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sat, 31 Dec 2016 14:42:32 -0500 Subject: [PATCH 1/6] Fix template references and 'movie' strings --- .../Existing/AddExistingSeriesCollectionViewTemplate.hbs | 2 +- src/UI/AddMovies/NotFoundViewTemplate.hbs | 2 +- src/UI/AddMovies/RootFolders/RootFolderCollectionView.js | 2 +- src/UI/AddMovies/RootFolders/RootFolderItemView.js | 2 +- src/UI/AddMovies/RootFolders/RootFolderLayout.js | 2 +- src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs | 4 ++-- src/UI/Movies/Details/EpisodeNumberCell.js | 2 +- src/UI/Movies/Details/InfoView.js | 2 +- src/UI/Movies/Details/SeasonLayout.js | 2 +- src/UI/Movies/Index/EmptyTemplate.hbs | 6 +++--- src/UI/Movies/Index/EmptyView.js | 2 +- src/UI/Movies/Index/FooterView.js | 2 +- .../Movies/Index/Overview/SeriesOverviewCollectionView.js | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs b/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs index d613a52d4..0928c0f38 100644 --- a/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs +++ b/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs @@ -1,5 +1,5 @@
- Loading search results from TheTVDB for your series, this may take a few minutes. + Loading search results from TheTVDB for your movies, this may take a few minutes.
\ No newline at end of file diff --git a/src/UI/AddMovies/NotFoundViewTemplate.hbs b/src/UI/AddMovies/NotFoundViewTemplate.hbs index e2d99bb63..7cc6eb25a 100644 --- a/src/UI/AddMovies/NotFoundViewTemplate.hbs +++ b/src/UI/AddMovies/NotFoundViewTemplate.hbs @@ -2,6 +2,6 @@

Sorry. We couldn't find any movies matching '{{term}}'

- Why can't I find my show? + [UPDATE LINK] Why can't I find my movie? diff --git a/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js b/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js index f781f21d7..f0704f342 100644 --- a/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js +++ b/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js @@ -2,7 +2,7 @@ var Marionette = require('marionette'); var RootFolderItemView = require('./RootFolderItemView'); module.exports = Marionette.CompositeView.extend({ - template : 'AddSeries/RootFolders/RootFolderCollectionViewTemplate', + template : 'AddMovies/RootFolders/RootFolderCollectionViewTemplate', itemViewContainer : '.x-root-folders', itemView : RootFolderItemView }); \ No newline at end of file diff --git a/src/UI/AddMovies/RootFolders/RootFolderItemView.js b/src/UI/AddMovies/RootFolders/RootFolderItemView.js index a0e98100b..7397f4e94 100644 --- a/src/UI/AddMovies/RootFolders/RootFolderItemView.js +++ b/src/UI/AddMovies/RootFolders/RootFolderItemView.js @@ -1,7 +1,7 @@ var Marionette = require('marionette'); module.exports = Marionette.ItemView.extend({ - template : 'AddSeries/RootFolders/RootFolderItemViewTemplate', + template : 'AddMovies/RootFolders/RootFolderItemViewTemplate', className : 'recent-folder', tagName : 'tr', diff --git a/src/UI/AddMovies/RootFolders/RootFolderLayout.js b/src/UI/AddMovies/RootFolders/RootFolderLayout.js index 6dae383d7..f48890076 100644 --- a/src/UI/AddMovies/RootFolders/RootFolderLayout.js +++ b/src/UI/AddMovies/RootFolders/RootFolderLayout.js @@ -7,7 +7,7 @@ var AsValidatedView = require('../../Mixins/AsValidatedView'); require('../../Mixins/FileBrowser'); var Layout = Marionette.Layout.extend({ - template : 'AddSeries/RootFolders/RootFolderLayoutTemplate', + template : 'AddMovies/RootFolders/RootFolderLayoutTemplate', ui : { pathInput : '.x-path' diff --git a/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs b/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs index 83cb9535d..1d6eae265 100644 --- a/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs +++ b/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs @@ -5,7 +5,7 @@
-
Enter the path that contains some or all of your TV series, you will be able to choose which series you want to import
+
Enter the path that contains some or all of your movies, you will be able to choose which movies you want to import
@@ -14,7 +14,7 @@
  - +
diff --git a/src/UI/Movies/Details/EpisodeNumberCell.js b/src/UI/Movies/Details/EpisodeNumberCell.js index 9a84e644e..4e09a7603 100644 --- a/src/UI/Movies/Details/EpisodeNumberCell.js +++ b/src/UI/Movies/Details/EpisodeNumberCell.js @@ -5,7 +5,7 @@ var SeriesCollection = require('../SeriesCollection'); module.exports = NzbDroneCell.extend({ className : 'episode-number-cell', - template : 'Series/Details/EpisodeNumberCellTemplate', + template : 'Movies/Details/EpisodeNumberCellTemplate', render : function() { this.$el.empty(); diff --git a/src/UI/Movies/Details/InfoView.js b/src/UI/Movies/Details/InfoView.js index c7fab9fc4..2ac803988 100644 --- a/src/UI/Movies/Details/InfoView.js +++ b/src/UI/Movies/Details/InfoView.js @@ -1,7 +1,7 @@ var Marionette = require('marionette'); module.exports = Marionette.ItemView.extend({ - template : 'Series/Details/InfoViewTemplate', + template : 'Movies/Details/InfoViewTemplate', initialize : function(options) { this.episodeFileCollection = options.episodeFileCollection; diff --git a/src/UI/Movies/Details/SeasonLayout.js b/src/UI/Movies/Details/SeasonLayout.js index cf10b6fa8..2638a2b70 100644 --- a/src/UI/Movies/Details/SeasonLayout.js +++ b/src/UI/Movies/Details/SeasonLayout.js @@ -15,7 +15,7 @@ var _ = require('underscore'); var Messenger = require('../../Shared/Messenger'); module.exports = Marionette.Layout.extend({ - template : 'Series/Details/SeasonLayoutTemplate', + template : 'Movies/Details/SeasonLayoutTemplate', ui : { seasonSearch : '.x-season-search', diff --git a/src/UI/Movies/Index/EmptyTemplate.hbs b/src/UI/Movies/Index/EmptyTemplate.hbs index 06fb40fe5..42cb619d2 100644 --- a/src/UI/Movies/Index/EmptyTemplate.hbs +++ b/src/UI/Movies/Index/EmptyTemplate.hbs @@ -1,13 +1,13 @@ -
+
- You must be new around here, You should add some series. + You must be new around here, You should add some movies.
- + Add Movie diff --git a/src/UI/Movies/Index/EmptyView.js b/src/UI/Movies/Index/EmptyView.js index 01dcc07a4..ef1393355 100644 --- a/src/UI/Movies/Index/EmptyView.js +++ b/src/UI/Movies/Index/EmptyView.js @@ -1,5 +1,5 @@ var Marionette = require('marionette'); module.exports = Marionette.CompositeView.extend({ - template : 'Series/Index/EmptyTemplate' + template : 'Movies/Index/EmptyTemplate' }); \ No newline at end of file diff --git a/src/UI/Movies/Index/FooterView.js b/src/UI/Movies/Index/FooterView.js index 1d31cc404..c025a3be1 100644 --- a/src/UI/Movies/Index/FooterView.js +++ b/src/UI/Movies/Index/FooterView.js @@ -1,5 +1,5 @@ var Marionette = require('marionette'); module.exports = Marionette.CompositeView.extend({ - template : 'Series/Index/FooterViewTemplate' + template : 'Movies/Index/FooterViewTemplate' }); \ No newline at end of file diff --git a/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js b/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js index 7db4b76f0..d77741892 100644 --- a/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js +++ b/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js @@ -4,5 +4,5 @@ var ListItemView = require('./SeriesOverviewItemView'); module.exports = Marionette.CompositeView.extend({ itemView : ListItemView, itemViewContainer : '#x-series-list', - template : 'Series/Index/Overview/SeriesOverviewCollectionViewTemplate' + template : 'Movies/Index/Overview/SeriesOverviewCollectionViewTemplate' }); \ No newline at end of file From 31b9ec11161c92618e8a2caa736d757beeb075c3 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 2 Jan 2017 10:27:59 +0100 Subject: [PATCH 2/6] Create .travis.yml Should enable automatically testing. --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..fa73c2e4f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: csharp +solution: src/NzbDrone.sln +script: # the following commands are just examples, use whatever your build process requires + - ./build.sh + - ./test.sh +install: + - sudo apt-get install nodejs + - sudo apt-get install npm + - sudo ln -s /usr/bin/nodejs /usr/bin/node From be6e6b910eaddf878a1c417d55ec4555852e373d Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 2 Jan 2017 10:32:23 +0100 Subject: [PATCH 3/6] Update .travis.yml symlinking node was already done in apt-get and therefore resulted in an error. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa73c2e4f..20d0a7699 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,3 @@ script: # the following commands are just examples, use whatever your build p install: - sudo apt-get install nodejs - sudo apt-get install npm - - sudo ln -s /usr/bin/nodejs /usr/bin/node From 097982334cf0258289b9141c05fa5cb176668639 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 2 Jan 2017 10:40:09 +0100 Subject: [PATCH 4/6] Update .travis.yml Fixed syntax for test.sh --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20d0a7699..93bdbb47d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ language: csharp solution: src/NzbDrone.sln script: # the following commands are just examples, use whatever your build process requires - ./build.sh - - ./test.sh + - chmod +x test.sh + - ./test.sh Linux Unit install: - sudo apt-get install nodejs - sudo apt-get install npm From d9e60eff6b6f4376c97b0d581d313fb4acdf0bb0 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 2 Jan 2017 11:25:28 +0100 Subject: [PATCH 5/6] Update .travis.yml Removed tests since they take far too long --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93bdbb47d..87ea22b9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ solution: src/NzbDrone.sln script: # the following commands are just examples, use whatever your build process requires - ./build.sh - chmod +x test.sh - - ./test.sh Linux Unit +# - ./test.sh Linux Unit Takes far too long, maybe even crashes travis :/ install: - sudo apt-get install nodejs - sudo apt-get install npm From 1f930c18e404daef09716369e3d54f03bbe31c4f Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 2 Jan 2017 11:45:11 +0100 Subject: [PATCH 6/6] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c1aa3d5a9..c615441d6 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Radarr # +# Radarr [![Build Status](https://travis-ci.org/galli-leo/Radarr.svg?branch=develop)](https://travis-ci.org/galli-leo/Radarr)# This fork of Sonarr aims to turn it into something like Couchpotato.