Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-01-31 03:39:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugins): Improve 'already installed' check to handle incomplete directories

Browse Source 
- Only consider plugin installed if meta.xml exists
- Auto-cleanup incomplete plugin directories during install
- Prevents 'Plugin already installed' error when directory exists but is incomplete

Fixes: Plugin already installed: discordAuth (when directory exists but incomplete)
This commit is contained in:
master3395
2026-01-26 03:03:52 +01:00
parent 1fb039caf4
commit 41b548e8f5
1 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pluginHolder/views.py
View File

@@ -462,13 +462,29 @@ def install_plugin(request, plugin_name):
'error': f'Plugin source not found: {plugin_name}'
}, status=404)
# Check if already installed
# Check if already installed (must have meta.xml to be considered installed)
pluginInstalled = '/usr/local/CyberCP/' + plugin_name
if os.path.exists(pluginInstalled):
return JsonResponse({
'success': False,
'error': f'Plugin already installed: {plugin_name}'
}, status=400)
# Check if it's a valid installation (has meta.xml) or just leftover files
metaXmlPath = os.path.join(pluginInstalled, 'meta.xml')
if os.path.exists(metaXmlPath):
return JsonResponse({
'success': False,
'error': f'Plugin already installed: {plugin_name}'
}, status=400)
else:
# Directory exists but no meta.xml - likely incomplete/uninstalled
# Try to clean it up first
try:
import shutil
shutil.rmtree(pluginInstalled)
logging.writeToFile(f'Cleaned up incomplete plugin directory: {plugin_name}')
except Exception as e:
logging.writeToFile(f'Warning: Could not clean up incomplete directory: {str(e)}')
return JsonResponse({
'success': False,
'error': f'Incomplete plugin directory found. Please uninstall first or manually remove: {pluginInstalled}'
}, status=400)
# Create zip file for installation (pluginInstaller expects a zip)
import tempfile
@@ -1189,13 +1205,29 @@ def install_from_store(request, plugin_name):
mailUtilities.checkHome()
try:
# Check if already installed
# Check if already installed (must have meta.xml to be considered installed)
pluginInstalled = '/usr/local/CyberCP/' + plugin_name
if os.path.exists(pluginInstalled):
return JsonResponse({
'success': False,
'error': f'Plugin already installed: {plugin_name}'
}, status=400)
# Check if it's a valid installation (has meta.xml) or just leftover files
metaXmlPath = os.path.join(pluginInstalled, 'meta.xml')
if os.path.exists(metaXmlPath):
return JsonResponse({
'success': False,
'error': f'Plugin already installed: {plugin_name}'
}, status=400)
else:
# Directory exists but no meta.xml - likely incomplete/uninstalled
# Try to clean it up first
try:
import shutil
shutil.rmtree(pluginInstalled)
logging.writeToFile(f'Cleaned up incomplete plugin directory: {plugin_name}')
except Exception as e:
logging.writeToFile(f'Warning: Could not clean up incomplete directory: {str(e)}')
return JsonResponse({
'success': False,
'error': f'Incomplete plugin directory found. Please uninstall first or manually remove: {pluginInstalled}'
}, status=400)
# Download plugin from GitHub
import tempfile