mirrors/community.applications
1
0
Fork 0
mirror of https://github.com/Squidly271/community.applications.git synced 2025-06-03 14:52:13 +08:00
Code Issues Projects Releases Wiki Activity

check for plugin install already in progress before starting a new one

Browse Source
This commit is contained in:
Squidly271 2023-04-07 18:07:25 -04:00
parent bd5b655b60
commit e27e7fc105
4 changed files with 87 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2023.04.07-x86_64-1.txz
View File

Binary file not shown.

115
source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page
View File

@ -679,7 +679,6 @@ $(function(){
openBox('/plugins/<?=$plugin?>/scripts/checkForUpdates.sh',tr('Check For Updates'),600,1100,true,"postCheckForUpdates");
});
$(".multi_installButton").click(function() {
if ( $(".multi_installButton").hasClass("actionCenter") ) {
updateMulti();
@ -1159,7 +1158,6 @@ function awesompleteSearch() {
}
}
function openNewWindow(newURL,target='_self') {
saveState();
var popUp = window.open(newURL,target);
@ -1193,27 +1191,43 @@ function closeSidebar(cookie=false,visible=false) {
}
function installPlugin(pluginURL,update=false,comment="",requires="") {
if ( update && requires ) {
post({action:"checkRequirements",requires:requires},function(data) {
if (! data.met) {
swal({
title: "<?tr("Requirements not met")?>",
text: "<?tr("The requirements for this upgrade have not been met on your system")?>",
allowOutsideClick: false,
showConfirmButton: true,
showCancelButton: false,
confirmButtonText: "<?tr("OK")?>",
type: "error"
},function(isConfirm) {
enableSearch();
post({action:"checkPluginInProgress"},function(data) {
if (data.inProgress) {
swal({
title: "<?tr("Installation already in progress")?>",
text: "<?tr("Another plugin installation or update is already in progress, and this one cannot start. Wait until the current installation or update is completed and try again")?>",
allowOutsideClick: false,
showConfirmButton: true,
showCancelButton: false,
confirmButtonText: "<?tr("OK")?>",
type: "error"
},function(isConfirm) {
enableSearch();
});
} else {
if ( update && requires ) {
post({action:"checkRequirements",requires:requires},function(data) {
if (! data.met) {
swal({
title: "<?tr("Requirements not met")?>",
text: "<?tr("The requirements for this upgrade have not been met on your system")?>",
allowOutsideClick: false,
showConfirmButton: true,
showCancelButton: false,
confirmButtonText: "<?tr("OK")?>",
type: "error"
},function(isConfirm) {
enableSearch();
});
} else {
actuallyInstallPlugin(pluginURL,update,comment);
}
});
} else {
actuallyInstallPlugin(pluginURL,update,comment);
}
});
} else {
actuallyInstallPlugin(pluginURL,update,comment);
}
}
});
}
function actuallyInstallPlugin(pluginURL,update=false,comment="") {
type = update ? "update" : "install";
@ -1275,7 +1289,6 @@ function actuallyInstallPlugin(pluginURL,update=false,comment="") {
}
<?if ($nchanCom):?>
ca_openPlugin('plugin '+type+' '+pluginURL,title,'',postFunction);
<?else:?>
openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1='+type+'&arg2='+pluginURL,title,600,900,true,postFunction);
<?endif;?>
@ -1311,7 +1324,6 @@ function hideLanguagePending(language) {
});
}
function OpenSidebarAndRefreshDisplay() {
post({action:"onStartupScreen"},function(result) {
if (result.status) {
@ -1473,30 +1485,45 @@ function removeApp(application, humanName) {
function uninstallApp(application,humanName) {
closeSidebar();
// disableSearch();
swal({
title: "<?tr("Uninstall Application?")?>",
text: sprintf(tr("Are you sure you want to uninstall %s?"),"<span class='ca_italic ca_bold caHighlight'>"+humanName+"</span>"),
type: "warning",
showCancelButton: true,
showConfirmButton: true,
cancelButtonText: "<?tr("Cancel")?>",
confirmButtonText: "<?tr("Yes uninstall it")?>",
closeOnConfirm: true,
showLoaderOnConfirm: false,
allowOutsideClick: true,
html: true
}, function(isConfirm) {
if (isConfirm) {
application = application.basename();
hidePluginPending(application);
<?if ($nchanCom):?>
ca_openPlugin('plugin remove '+application,"<?tr('Uninstall Plugin')?>",'','postUninstallPlugin');
<?else:?>
openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1=remove&arg2='+application,"<?tr('Uninstall Plugin')?>",600,900,true,"postUninstallPlugin");
<?endif;?>
post({action:"checkPluginInProgress"},function(data) {
if (data.inProgress) {
swal({
title: "<?tr("Installation already in progress")?>",
text: "<?tr("Another plugin installation or update is already in progress, and this one cannot start. Wait until the current installation or update is completed and try again")?>",
allowOutsideClick: false,
showConfirmButton: true,
showCancelButton: false,
confirmButtonText: "<?tr("OK")?>",
type: "error"
},function(isConfirm) {
enableSearch();
});
} else {
enableSearch();
swal({
title: "<?tr("Uninstall Application?")?>",
text: sprintf(tr("Are you sure you want to uninstall %s?"),"<span class='ca_italic ca_bold caHighlight'>"+humanName+"</span>"),
type: "warning",
showCancelButton: true,
showConfirmButton: true,
cancelButtonText: "<?tr("Cancel")?>",
confirmButtonText: "<?tr("Yes uninstall it")?>",
closeOnConfirm: true,
showLoaderOnConfirm: false,
allowOutsideClick: true,
html: true
}, function(isConfirm) {
if (isConfirm) {
application = application.basename();
hidePluginPending(application);
<?if ($nchanCom):?>
ca_openPlugin('plugin remove '+application,"<?tr('Uninstall Plugin')?>",'','postUninstallPlugin');
<?else:?>
openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1=remove&arg2='+application,"<?tr('Uninstall Plugin')?>",600,900,true,"postUninstallPlugin");
<?endif;?>
} else {
enableSearch();
}
});
}
});
}

4
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -1,8 +1,8 @@
2649a8917a0518c2531310ae1fab21d8 ./Apps.page
f46a879703bf0c5bc2df1d9e644d4779 ./Apps.page
106b521c1feebda4d7b3f558cc016cda ./CA_notices.page
eb1f0ee4148747c0473e73e4e973994f ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
abd3f1c7896cd807acd78bad94115bcb ./include/exec.php
f08af697fd10fc424f29437b655d735f ./include/exec.php
6a2cd1927d391aff2345233a514d7a87 ./include/helpers.php
8e053d6cd83fbe2202c13b692beabb4f ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js

16
source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
View File

@ -195,8 +195,8 @@ switch ($_POST['action']) {
case 'downloadStatistics':
downloadStatistics();
break;
case 'batman':
touch("/boot/config/plugins/community.applications/IamBatman");
case 'checkPluginInProgress':
checkPluginInProgress();
break;
###############################################
# Return an error if the action doesn't exist #
@ -2523,6 +2523,18 @@ function downloadStatistics() {
download_json($caPaths['statisticsURL'],$caPaths['statistics']);
}
###########################################################################
# Checks to see if a plugin installation or update is already in progress #
###########################################################################
function checkPluginInProgress() {
global $caPaths;
$pluginsPending = glob("{$caPaths['pluginPending']}/*");
postReturn(['inProgress'=>empty($pluginsPending)? "" : "true"]);
}
#######################################
# Logs Javascript errors being caught #
#######################################