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

Added content tag NoMore - limit movies in collection

Browse source
This commit is contained in:
zeldaroot 2020-12-07 03:24:06 +02:00
parent 0ac8a264cf
commit 9638307d86
5 changed files with 56 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/CP_cron.js
View file

@ -1908,6 +1908,27 @@ function saveData(collection, movies, callback) {
);
})
.join(',');
var noMore = 0;
if (content.content_tags.indexOf('NoMore') + 1) {
content.content_tags.split(',').forEach(function(tag) {
if (tag.indexOf('NoMore') + 1) {
noMore = parseInt(tag.replace(/[^0-9]/g, '') || '200');
}
});
}
if (noMore && content.content_movies.split(',').length > noMore) {
content.content_movies = content.content_movies
.split(',')
.slice(0, noMore);
}
if (!noMore && content.content_movies.split(',').length > 200) {
content.content_tags =
content.content_tags.indexOf('NoSorting') + 1
? content.content_tags
: content.content_tags
? content.content_tags + ',NoSorting'
: 'NoSorting';
}
CP_save.save(content, 'content', function(err, result) {
console.log(
'[CP_save.save]',

6
lib/CP_page.js
View file

@ -747,6 +747,12 @@ function pageContent(result, url, num, sorting, options, callback) {
.replace(/\s*<a[^>]*>NoComments?<\/a>\s*,\s*/i, '')
.replace(/\s*<a[^>]*>NoComments?<\/a>\s*/i, '');
}
if (/NoMore/i.test(content.tags)) {
content.tags = content.tags
.replace(/\s*,\s*<a[^>]*>NoMore[0-9]*<\/a>\s*/i, '')
.replace(/\s*<a[^>]*>NoMore[0-9]*<\/a>\s*,\s*/i, '')
.replace(/\s*<a[^>]*>NoMore[0-9]*<\/a>\s*/i, '');
}
result.content = content;
result.page = page;

6
routes/paths/content.js
View file

@ -259,6 +259,12 @@ function oneContent(url, page, sorting, options, callback) {
contents[0].movies &&
contents[0].movies.length
) {
if (contents[0].tags.indexOf('NoSorting') + 1) {
sorting = '';
}
if (contents[0].tags.indexOf('NoPagination') + 1) {
page = 1;
}
var query_id = [];
if (sorting) {
contents[0].movies.forEach(function(item) {

22
themes/default/views/admin/includes/footer.ejs
View file

@ -662,6 +662,28 @@
// self.innerHTML = '<span class="fa fa-exclamation-triangle text-danger"></span>&nbsp;&nbsp;<%= __('Желательно не больше 100 фильмов') %>';
}
var noMore = 0;
if (data.content && data.content.content_tags && data.content.content_tags.indexOf('NoMore') + 1) {
data.content.content_tags.split(',').forEach(function(tag) {
if (tag.indexOf('NoMore') + 1) {
noMore = parseInt(tag.replace(/[^0-9]/g, '') || '200');
}
});
}
if (noMore && data.content && data.content.content_movies && data.content.content_movies.split(',').length > noMore) {
data.content.content_movies = data.content.content_movies.split(',').slice(0, noMore);
}
if (!noMore && data.content && data.content.content_movies && data.content.content_movies.split(',').length > 200) {
data.content.content_tags =
data.content.content_tags.indexOf('NoSorting') + 1
? data.content.content_tags
: data.content.content_tags
? data.content.content_tags + ',NoSorting'
: 'NoSorting';
}
if (data.movie && data.movie.id && data.movie.kp_id && data.movie.id !== data.movie.kp_id) {
data.movie.id = data.movie.kp_id;
}

2
themes/default/views/admin/modules/content.ejs
View file

@ -207,7 +207,7 @@
var content_tags = document
.querySelector('input[name="content.content_tags"]'),
tagify = new Tagify(content_tags, {
whitelist: ["<%- __('Коллекции') %>", "<%- __('Новости') %>", "<%- __('Страницы') %>", "<%- __('Обновления') %>", "<%- __('Фильмы') %>", "<%- __('Сериалы') %>", "<%- __('Мультфильмы') %>", "<%- __('ТВ') %>", "<%- __('Аниме') %>", 'NoComment', 'NoRandom', 'NoSorting', 'NoPagination']
whitelist: ["<%- __('Коллекции') %>", "<%- __('Новости') %>", "<%- __('Страницы') %>", "<%- __('Обновления') %>", "<%- __('Фильмы') %>", "<%- __('Сериалы') %>", "<%- __('Мультфильмы') %>", "<%- __('ТВ') %>", "<%- __('Аниме') %>", 'NoComment', 'NoRandom', 'NoSorting', 'NoPagination', 'NoMore']
});
tagify.DOM.input.classList.add('form-control');
});