LoweBowe
/
CinemaPress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added preselect episode

This commit is contained in:
zeldaroot 2021-05-27 00:46:02 +03:00
parent ca7fb50a75
commit 245045d3a3
7 changed files with 68 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config/locales/en/default/modules.js
View File

@ -238,7 +238,9 @@ module.exports = {
"data-cinemaplayer-tabs-top=\"15px\"",
"data-cinemaplayer-tabs-left=\"15px\"",
"data-cinemaplayer-tabs-right=\"\"",
"data-cinemaplayer-loader-display=\"none\""
"data-cinemaplayer-loader-display=\"none\"",
"data-cinemaplayer-select-season=\"[season]\"",
"data-cinemaplayer-select-episode=\"[episode]\""
],
"iframe": 0
},
@ -256,14 +258,16 @@ module.exports = {
"data-cinemaplayer-query-api-type=\"[type]\"",
"data-cinemaplayer-query-api-title=\"[title]\"",
"data-cinemaplayer-query-api-year=\"[year]\"",
"data-cinemaplayer-query-api-season=\"[season]\"",
"data-cinemaplayer-query-api-episode=\"[episode]\"",
"data-cinemaplayer-query-api-ip=\"[ip]\"",
"data-cinemaplayer-query-api-hash=\"[hash]\""
],
"api": [
"/api?token=TEST&id=[id] ~ \"Player\" ~ result.embed",
"/api?token=TEST&id=[id] ~ \"Player\" ~ result.embed <> _VALUE_?season=[season]&episode=[episode]",
"/api?token=TEST&id=[id] ~ \"Trailer\" ~ result.trailer",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=en&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Trailer (TMDb)\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20trailer ~ \"Trailer (YouTube)\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg"
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=en&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Trailer (TMDb)\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20trailer ~ \"Trailer (YouTube)\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg"
],
"first": 1
},
@ -280,12 +284,14 @@ module.exports = {
"data-cinemaplayer-query-api-type=\"[type]\"",
"data-cinemaplayer-query-api-title=\"[title]\"",
"data-cinemaplayer-query-api-year=\"[year]\"",
"data-cinemaplayer-query-api-season=\"[season]\"",
"data-cinemaplayer-query-api-episode=\"[episode]\"",
"data-cinemaplayer-query-api-ip=\"[ip]\"",
"data-cinemaplayer-query-api-hash=\"[hash]\""
],
"api": [
"/api?token=TEST&id=[id] ~ \"\" ~ result.embed",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=en&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ videos.results.0.name ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg"
"/api?token=TEST&id=[id] ~ \"\" ~ result.embed <> _VALUE_?season=[season]&episode=[episode]",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=en&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ videos.results.0.name ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg"
],
"first": 0
},
@ -307,8 +313,8 @@ module.exports = {
],
"api": [
"/api?token=TEST&id=[id] ~ \"Трейлер\" ~ result.trailer",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=en&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Trailer TMDb\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20trailer ~ \"Trailer YouTube\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg"
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=en&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Trailer TMDb\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20trailer ~ \"Trailer YouTube\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg"
],
"first": 1
},

22
config/locales/ru/default/modules.js
View File

@ -238,7 +238,9 @@ module.exports = {
"data-cinemaplayer-tabs-top=\"15px\"",
"data-cinemaplayer-tabs-left=\"15px\"",
"data-cinemaplayer-tabs-right=\"\"",
"data-cinemaplayer-loader-display=\"none\""
"data-cinemaplayer-loader-display=\"none\"",
"data-cinemaplayer-select-season=\"[season]\"",
"data-cinemaplayer-select-episode=\"[episode]\""
],
"iframe": 0
},
@ -256,14 +258,16 @@ module.exports = {
"data-cinemaplayer-query-api-type=\"[type]\"",
"data-cinemaplayer-query-api-title=\"[title]\"",
"data-cinemaplayer-query-api-year=\"[year]\"",
"data-cinemaplayer-query-api-season=\"[season]\"",
"data-cinemaplayer-query-api-episode=\"[episode]\"",
"data-cinemaplayer-query-api-ip=\"[ip]\"",
"data-cinemaplayer-query-api-hash=\"[hash]\""
],
"api": [
"/api?token=TEST&id=[id] ~ \"Плеер\" ~ result.embed",
"/api?token=TEST&id=[id] ~ \"Плеер\" ~ result.embed <> _VALUE_?season=[season]&episode=[episode]",
"/api?token=TEST&id=[id] ~ \"Трейлер\" ~ result.trailer",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=ru&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Трейлер (TMDb)\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20%D1%82%D1%80%D0%B5%D0%B9%D0%BB%D0%B5%D1%80 ~ \"Трейлер (YouTube)\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg"
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=ru&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Трейлер (TMDb)\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20%D1%82%D1%80%D0%B5%D0%B9%D0%BB%D0%B5%D1%80 ~ \"Трейлер (YouTube)\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg"
],
"first": 1
},
@ -280,12 +284,14 @@ module.exports = {
"data-cinemaplayer-query-api-type=\"[type]\"",
"data-cinemaplayer-query-api-title=\"[title]\"",
"data-cinemaplayer-query-api-year=\"[year]\"",
"data-cinemaplayer-query-api-season=\"[season]\"",
"data-cinemaplayer-query-api-episode=\"[episode]\"",
"data-cinemaplayer-query-api-ip=\"[ip]\"",
"data-cinemaplayer-query-api-hash=\"[hash]\""
],
"api": [
"/api?token=TEST&id=[id] ~ \"\" ~ result.embed",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=ru&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ videos.results.0.name ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg"
"/api?token=TEST&id=[id] ~ \"\" ~ result.embed <> _VALUE_?season=[season]&episode=[episode]",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=ru&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ videos.results.0.name ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg"
],
"first": 0
},
@ -307,8 +313,8 @@ module.exports = {
],
"api": [
"/api?token=TEST&id=[id] ~ \"Трейлер\" ~ result.trailer",
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=ru&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Трейлер TMDb\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20%D1%82%D1%80%D0%B5%D0%B9%D0%BB%D0%B5%D1%80 ~ \"Трейлер YouTube\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/maxresdefault.jpg"
"https://api.themoviedb.org/3/[type]/[tmdb_id]?language=ru&append_to_response=videos&api_key=269890f657dddf4635473cf4cf456576 ~ \"Трейлер TMDb\" ~ videos.results.0.key <> https://www.youtube.com/embed/_VALUE_ ~ videos.results.0.key <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg",
"https://www.googleapis.com/youtube/v3/search?part=id%2Csnippet&maxResults=1&key=AIzaSyDcr11tMC1PDGyLAyWP7K2XYD9FeWARPnA&q=[title]%20[year]%20%D1%82%D1%80%D0%B5%D0%B9%D0%BB%D0%B5%D1%80 ~ \"Трейлер YouTube\" ~ items.0.id.videoId <> https://www.youtube.com/embed/_VALUE_ ~ items.0.id.videoId <> https://img.youtube.com/vi/_VALUE_/sddefault.jpg"
],
"first": 1
},

12
lib/CP_userinfo.js
View File

@ -81,10 +81,14 @@ module.exports = function(lookup) {
) {
console.log('[Indexing is forbidden]', req.originalUrl);
return next({
status: 404,
message: 'Indexing is forbidden'
});
if (req.originalUrl.toLowerCase() === '/robots.txt') {
return res.send('User-agent: *\nDisallow: /');
} else {
return next({
status: 404,
message: 'Indexing is forbidden'
});
}
}
var info = null;

8
modules/CP_player.js
View File

@ -180,10 +180,10 @@ function codePlayer(type, movie, options) {
)
.replace(/\[wa_id]/gi, movie.custom.wa_id ? movie.custom.wa_id : '')
.replace(/\[type]/gi, movie.type ? 'tv' : 'movie')
.replace(/\[season]/gi, serial.season)
.replace(/\[episode]/gi, serial.episode)
.replace(/\[title]/gi, movie.title)
.replace(/\[year]/gi, movie.year)
.replace(/\[season]/gi, serial.season || '')
.replace(/\[episode]/gi, serial.episode || '')
.replace(/\[title]/gi, (movie.title || '').replace(/"/g, "'"))
.replace(/\[year]/gi, movie.year || '')
.replace(
/\[ip]/gi,
(options && options.userinfo && options.userinfo.ip) || ''

24
routes/cinemaplayer.js
View File

@ -121,12 +121,12 @@ router.get('/:tab', function(req, res) {
('' + req.query.year).replace(/[^0-9]/g, '')
? ('' + req.query.year).replace(/[^0-9]/g, '')
: '';
var season =
var query_season =
typeof req.query.season !== 'undefined' &&
('' + req.query.season).replace(/[^0-9]/g, '')
? ('' + req.query.season).replace(/[^0-9]/g, '')
: '';
var episode =
var query_episode =
typeof req.query.episode !== 'undefined' &&
('' + req.query.episode).replace(/[^0-9]/g, '')
? ('' + req.query.episode).replace(/[^0-9]/g, '')
@ -278,18 +278,13 @@ router.get('/:tab', function(req, res) {
}
}
if (p.url.indexOf('[season]') + 1) {
if (season) {
p.url = p.url.replace(/\[season]/gi, season ? season : '');
} else {
return callback();
}
p.url = p.url.replace(/\[season]/gi, query_season ? query_season : '');
}
if (p.url.indexOf('[episode]') + 1) {
if (episode) {
p.url = p.url.replace(/\[episode]/gi, episode ? episode : '');
} else {
return callback();
}
p.url = p.url.replace(
/\[episode]/gi,
query_episode ? query_episode : ''
);
}
if (p.url.indexOf('[ip]') + 1) {
if (ip) {
@ -348,7 +343,10 @@ router.get('/:tab', function(req, res) {
: op.get(json, p.episode)
: '';
if (iframe && p.format_iframe) {
iframe = p.format_iframe.replace(/_VALUE_/gi, iframe);
iframe = p.format_iframe
.replace(/_VALUE_/gi, iframe)
.replace(/\[season]/gi, query_season || '')
.replace(/\[episode]/gi, query_episode || '');
}
if (image && p.format_image) {
image = p.format_image.replace(/_VALUE_/gi, image);

13
routes/embed.js
View File

@ -147,7 +147,18 @@ router.get('/:id/:hash?', function(req, res) {
(modules.player.data.embed.dataset &&
modules.player.data.embed.dataset.length
? modules.player.data.embed.dataset.join(' ')
: '') +
: ''
)
.replace(
/\[season]/gi,
(req.query.season && req.query.season.replace(/[^0-9]/i, '')) ||
''
)
.replace(
/\[episode]/gi,
(req.query.episode && req.query.episode.replace(/[^0-9]/i, '')) ||
''
) +
'></div><script src="https://CinemaPlayer.github.io/cinemaplayer.js?v=' +
process.env['CP_VER'] +
'"></script></body></html>'

10
themes/default/views/admin/modules/player.ejs
View File

@ -1364,8 +1364,8 @@
<div class="row">
<div class="col-xs-12 col-md-12">
<a href="https://github.com/CinemaPress/CinemaPlayer" class="btn btn-link btn-block" target="_blank">
<code class="visible-xs"><i class="fa fa-info-circle text-muted" style="font-size:12px"></i>&nbsp;&nbsp;CinemaPlayer</code>
<code class="hidden-xs"><i class="fa fa-info-circle text-muted" style="font-size:12px"></i>&nbsp;&nbsp;https://github.com/CinemaPress/CinemaPlayer</code>
<code class="visible-xs"><i class="fa fa-info-circle text-muted" style="font-size:10px"></i>&nbsp;&nbsp;CinemaPlayer</code>
<code class="hidden-xs"><i class="fa fa-info-circle text-muted" style="font-size:10px"></i>&nbsp;&nbsp;https://github.com/CinemaPress/CinemaPlayer</code>
</a>
</div>
</div>
@ -1424,7 +1424,7 @@
? false
: (!customValue.value.replace(/[0-9]/g, ''))
? parseInt(customValue.value)
: /^\[.*]$/.test(customValue.value)
: /^\[.*]$/.test(customValue.value) && customValue.value.replace(/[a-z0-9\]\[_]/g, '')
? JSON.parse(customValue.value.replace(/'/g, '"'))
: customValue.value
)
@ -1586,7 +1586,7 @@
? false
: (!customValue.value.replace(/[0-9]/g, ''))
? parseInt(customValue.value)
: /^\[.*]$/.test(customValue.value)
: /^\[.*]$/.test(customValue.value) && customValue.value.replace(/[a-z0-9\]\[_]/g, '')
? JSON.parse(customValue.value.replace(/'/g, '"'))
: customValue.value
)
@ -1899,7 +1899,7 @@
? false
: (!customValue.value.replace(/[0-9]/g, ''))
? parseInt(customValue.value)
: /^\[.*]$/.test(customValue.value)
: /^\[.*]$/.test(customValue.value) && customValue.value.replace(/[a-z0-9\]\[_]/g, '')
? JSON.parse(customValue.value.replace(/'/g, '"'))
: customValue.value
)