joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

resolve gh-115 to allow excluding of folders and files in the repository folder

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-09-13 02:37:43 +02:00
parent 4b3bc9bd03
commit 8ccb13f3e0
298 changed files with 7160 additions and 3829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
site/helpers/componentbuilder.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.2
@build 25th August, 2017
@version 2.5.4
@build 13th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php
@ -98,13 +98,13 @@ abstract class ComponentbuilderHelper
/**
* Remove folders with files
*
* @param string $dir The path to folder to remove
* @param boolean $git if there is a git folder in that must not be removed
* @param string $dir The path to folder to remove
* @param boolean $ignore The folders and files to ignore and not remove
*
* @return boolean True in all is removed
*
*/
public static function removeFolder($dir, $git = false)
public static function removeFolder($dir, $ignore = false)
{
if (JFolder::exists($dir))
{
@ -115,22 +115,53 @@ abstract class ComponentbuilderHelper
if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue;
if ($file->isDir())
{
if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
$keeper = false;
if (self::checkArray($ignore))
{
foreach ($ignore as $keep)
{
if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
{
$keeper = true;
}
}
}
if ($keeper)
{
continue;
}
JFolder::delete($file->getPathname());
}
else
{
if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
$keeper = false;
if (self::checkArray($ignore))
{
foreach ($ignore as $keep)
{
if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
{
$keeper = true;
}
}
}
if ($keeper)
{
continue;
}
JFile::delete($file->getPathname());
}
}
if (!$git && JFolder::delete($dir))
if (!self::checkArray($ignore))
{
return true;
return JFolder::delete($dir);
}
return true;
}
return false;
} /**
}
/**
* The dynamic builder of views, tables and fields
**/
public static function dynamicBuilder(&$data, $type)