From 3f04dd2462a7ad7cc567f6f3ec722c61d535a20a Mon Sep 17 00:00:00 2001 From: zeldaroot Date: Mon, 21 Oct 2019 15:21:55 +0300 Subject: [PATCH] Added exclude system theme --- cinemapress.sh | 4 ++-- lib/CP_cron.js | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cinemapress.sh b/cinemapress.sh index 706f53f..6081851 100644 --- a/cinemapress.sh +++ b/cinemapress.sh @@ -1362,7 +1362,8 @@ docker_restore() { rclone copy CINEMAPRESS:${CP_DOMAIN}/latest/themes.tar /var/${CP_DOMAIN}/ cd /home/${CP_DOMAIN} && \ tar -xf /var/${CP_DOMAIN}/config.tar && \ - tar -xf /var/${CP_DOMAIN}/themes.tar + tar --exclude=themes/default/views/desktop \ + -xf /var/${CP_DOMAIN}/themes.tar docker_start } docker_backup() { @@ -1398,7 +1399,6 @@ docker_backup() { -uf /var/${CP_DOMAIN}/themes.tar \ themes/default/public/desktop \ themes/default/public/mobile \ - themes/default/views/desktop \ themes/default/views/mobile \ themes/${THEME_NAME} \ files diff --git a/lib/CP_cron.js b/lib/CP_cron.js index 5167d2a..4e4a332 100644 --- a/lib/CP_cron.js +++ b/lib/CP_cron.js @@ -101,7 +101,7 @@ if (hour && modules.content.status && modules.content.data.scraper) { { url: p.url, method: 'GET', - timeout: 1000, + timeout: 5000, headers: { 'User-Agent': agents[Math.floor(Math.random() * agents.length)] } @@ -141,7 +141,7 @@ if (hour && modules.content.status && modules.content.data.scraper) { { url: url, method: 'GET', - timeout: 1000, + timeout: 5000, headers: { 'User-Agent': agents[Math.floor(Math.random() * agents.length)] @@ -276,7 +276,7 @@ if ( '[token]', modules.player.data.moonwalk.token.trim() ); - request({ url: url, method: 'GET', timeout: 1000 }, function( + request({ url: url, method: 'GET', timeout: 5000 }, function( error, response, movies @@ -348,7 +348,7 @@ if ( '[token]', modules.player.data.moonwalk.token.trim() ); - request({ url: url, method: 'GET', timeout: 1000 }, function( + request({ url: url, method: 'GET', timeout: 5000 }, function( error, response, movies @@ -420,7 +420,7 @@ if ( '[token]', modules.player.data.iframe.token.trim() ); - request({ url: url, method: 'GET', timeout: 1000 }, function( + request({ url: url, method: 'GET', timeout: 5000 }, function( error, response, movies @@ -489,7 +489,7 @@ if ( '[token]', modules.player.data.iframe.token.trim() ); - request({ url: url, method: 'GET', timeout: 1000 }, function( + request({ url: url, method: 'GET', timeout: 5000 }, function( error, response, movies @@ -1059,7 +1059,7 @@ if ( { url: 'http://' + 't' + '.' + 'cinemapress' + '.' + 'io/' + config.domain, method: 'POST', - timeout: 1000 + timeout: 5000 }, function(error, response, translators) { if (error) { @@ -1090,7 +1090,7 @@ if ( url + '/api/translators.json?api_token=' + modules.player.data.moonwalk.token.trim(), - timeout: 1000 + timeout: 5000 }, function(error, response, translators) { if (error) {