From ab48ea97a6cb00aa16e41b471dba0bdfeac3d52f Mon Sep 17 00:00:00 2001 From: OldHawk Date: Mon, 22 May 2017 18:16:35 +0800 Subject: [PATCH] fix(core): update movie info save process --- config/env/development.js | 2 +- .../controllers/home.client.controller.js | 35 ++++- .../core/client/views/home.client.view.html | 114 ++++++---------- .../controllers/errors.server.controller.js | 2 + .../admin/admin-list.client.controller.js | 3 +- .../torrent-info.client.controller.js | 84 ++++-------- .../controllers/uploads.client.controller.js | 102 ++++++-------- .../views/admin/admin-list.client.view.html | 15 ++- .../client/views/movie-list.client.view.html | 24 ++-- .../views/uploads-torrents.client.view.html | 2 +- .../views/view-torrent.client.view.html | 127 +++++++----------- .../subtitles.server.controller.js | 2 +- .../controllers/torrents.server.controller.js | 36 ++--- .../server/models/torrent.server.model.js | 120 +---------------- 14 files changed, 226 insertions(+), 442 deletions(-) diff --git a/config/env/development.js b/config/env/development.js index da024eb8..d90a62cf 100644 --- a/config/env/development.js +++ b/config/env/development.js @@ -4,7 +4,7 @@ var defaultEnvConfig = require('./default'); module.exports = { db: { - uri: process.env.MONGOHQ_URL || process.env.MONGODB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-dev', + uri: process.env.MONGOHQ_URL || process.env.MONGODB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-dev-v2', options: { user: '', pass: '' diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index 49007462..dcb811f5 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -29,7 +29,9 @@ * initTopOneInfo */ vm.initTopOneInfo = function () { - $('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + vm.movieTopOne.torrent_backdrop_img + ')'); + if (vm.movieTopOne.resource_detail_info.backdrop_path) { + $('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + vm.movieTopOne.resource_detail_info.backdrop_path + ')'); + } }; /** @@ -48,11 +50,13 @@ torrent_type: 'movie', limit: 9 }, function (items) { - vm.movieTopOne = items.rows[0]; - items.rows.splice(0, 1); - vm.movieTopList = items.rows; + if (items.rows.length > 0) { + vm.movieTopOne = items.rows[0]; + items.rows.splice(0, 1); + vm.movieTopList = items.rows; - vm.initTopOneInfo(); + vm.initTopOneInfo(); + } }, function (err) { Notification.error({ message: ' ' + $translate.instant('TOP_MOVIE_INFO_ERROR') @@ -65,7 +69,9 @@ newest: true, limit: 14 }, function (items) { - vm.movieNewList = items.rows; + if (items.rows.length > 0) { + vm.movieNewList = items.rows; + } }, function (err) { Notification.error({ message: ' ' + $translate.instant('TOP_MOVIE_INFO_ERROR') @@ -82,6 +88,23 @@ window.open(url, '_blank'); }; + /** + * getDirector + * @returns {string} + */ + vm.getDirector = function () { + var n = '-'; + + if (vm.movieTopOne.resource_detail_info) { + angular.forEach(vm.movieTopOne.resource_detail_info.credits.crew, function (item) { + if (item.job === 'Director') { + n = item.name; + } + }); + } + return n; + }; + /** * downloadTorrent * @param id diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index 71ec4b5e..5d67ea96 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -4,7 +4,8 @@
-
@@ -15,106 +16,71 @@
{{ 'TMDB_FIELDS.ORIGINAL_TITLE' | translate}}：
-
{{vm.movieTopOne.torrent_original_title}}
+
{{vm.movieTopOne.resource_detail_info.original_title}}
{{ 'TMDB_FIELDS.TITLE' | translate}}：
-
{{vm.movieTopOne.torrent_title}}
+
{{vm.movieTopOne.resource_detail_info.title}}
{{ 'TMDB_FIELDS.DIRECTOR' | translate}}：
-
{{vm.movieTopOne.torrent_director}}
+
{{vm.getDirector();}}
{{ 'TMDB_FIELDS.GENRES' | translate}}：
- {{item}} + {{item.name}}
{{ 'TMDB_FIELDS.PRODUCTION_COUNTRIES' | translate}}：
- {{item}} - - + {{item.name}} + -
{{ 'TMDB_FIELDS.RELEASE_DATE' | translate}}：
-
{{vm.movieTopOne.torrent_release}}
+
{{vm.movieTopOne.resource_detail_info.release_date}}
-
+
{{ 'TMDB_FIELDS.RUNTIME' | translate}}：
-
{{vm.movieTopOne.torrent_runtime | runtime}}
-
-
-
{{ 'TMDB_FIELDS.BUDGET' | translate}}：
-
{{vm.movieTopOne.torrent_budget | dollar:2}}
+
{{vm.movieTopOne.resource_detail_info.runtime | runtime}}
-
+
+
{{ 'TMDB_FIELDS.BUDGET' | translate}}：
+
{{vm.movieTopOne.resource_detail_info.budget | dollar:2}}
+
+ +
{{ 'TMDB_FIELDS.REVENUE' | translate}}：
-
{{vm.movieTopOne.torrent_revenue | dollar:2}}
+
{{vm.movieTopOne.resource_detail_info.revenue | dollar:2}}
{{ 'TMDB_FIELDS.VOTE_AVERAGE' | translate}}：
-
IMDB {{vm.movieTopOne.torrent_imdb_votes}} / {{vm.movieTopOne.torrent_imdb_votes_users}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}} +
+ + + IMDB + {{vm.movieTopOne.resource_detail_info.vote_average}} / {{vm.movieTopOne.resource_detail_info.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}} +
{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：
-
{{vm.movieTopOne.torrent_overview | limitTo:300}}......
+
{{vm.movieTopOne.resource_detail_info.overview | limitTo:300}} + ...... +
-
- + - {{vm.movieTopOne.torrent_cast[0].name}} + {{cast.name}} -

{{vm.movieTopOne.torrent_cast[0].character}}

-
-
- - {{vm.movieTopOne.torrent_cast[1].name}} - -

{{vm.movieTopOne.torrent_cast[1].character}}

-
-
- - {{vm.movieTopOne.torrent_cast[2].name}} - -

{{vm.movieTopOne.torrent_cast[2].character}}

-
- -
- -
- - {{vm.movieTopOne.torrent_cast[3].name}} - -

{{vm.movieTopOne.torrent_cast[3].character}}

-
-
- - {{vm.movieTopOne.torrent_cast[4].name}} - -

{{vm.movieTopOne.torrent_cast[4].character}}

-
-
- - {{vm.movieTopOne.torrent_cast[5].name}} - -

{{vm.movieTopOne.torrent_cast[5].character}}

+

{{cast.character}}

@@ -132,7 +98,7 @@
- {{item.torrent_title}}