Modify cache mechanism to re-enable pagination (Fix #3)

Author: Michael Babker

administrator/components/com_patchtester/controller.php

@@ -37,18 +37,43 @@ public function purge()
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
 
 		jimport('joomla.filesystem.file');
+		jimport('joomla.filesystem.folder');
 
-		if (file_exists(JPATH_CACHE . '/patchtester.json') && !JFile::delete(JPATH_CACHE . '/patchtester.json'))
+		$failures  = 0;
+		$successes = 0;
+
+		$cacheFiles = JFolder::files(JPATH_CACHE);
+
+		foreach ($cacheFiles as $file)
+		{
+			if (strpos($file, 'patchtester-page-') === 0)
+			{
+				if (!JFile::delete(JPATH_CACHE . '/' . $file))
+				{
+					$failures++;
+				}
+				else
+				{
+					$successes++;
+				}
+			}
+		}
+
+		if ($failures > 0)
 		{
-			$msg     = JText::_('COM_PATCHTESTER_PURGE_FAIL');
-			$msgType = 'error';
+			JFactory::getApplication()->enqueueMessage(JText::plural('COM_PATCHTESTER_PURGE_FAIL', $failures), 'error');
 		}
-		else
+
+		if ($successes > 0)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::plural('COM_PATCHTESTER_PURGE_SUCCESS', $successes), 'message');
+		}
+
+		if ($failures == 0 && $successes == 0)
 		{
-			$msg     = JText::_('COM_PATCHTESTER_PURGE_SUCCESS');
-			$msgType = 'message';
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_PATCHTESTER_PURGE_NA'), 'message');
 		}
 
-		$this->setRedirect('index.php?option=com_patchtester&view=pulls', $msg, $msgType);
+		$this->setRedirect('index.php?option=com_patchtester&view=pulls');
 	}
 }

administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini

@@ -34,8 +34,11 @@ COM_PATCHTESTER_NOT_APPLIED="Not Applied"
 COM_PATCHTESTER_OPEN_IN_GITHUB="Open in GitHub"
 COM_PATCHTESTER_OPEN_IN_JOOMLACODE="Open in JoomlaCode"
 COM_PATCHTESTER_PURGE_CACHE="Purge Cache"
-COM_PATCHTESTER_PURGE_FAIL="Could not purge the cache"
-COM_PATCHTESTER_PURGE_SUCCESS="Cache purged successfully"
+COM_PATCHTESTER_PURGE_FAIL="Purge operation not completed successfully, %s files not removed."
+COM_PATCHTESTER_PURGE_FAIL_1="Purge operation not completed successfully, %s file not removed."
+COM_PATCHTESTER_PURGE_NA="No cache files to remove."
+COM_PATCHTESTER_PURGE_SUCCESS="Purge operation completed successfully, %s files removed."
+COM_PATCHTESTER_PURGE_SUCCESS_1="Purge operation completed successfully, %s file removed."
 COM_PATCHTESTER_REPO_IS_GONE="The patch could not be applied because the repository is missing"
 COM_PATCHTESTER_REVERT_OK="Patch successfully reverted"
 COM_PATCHTESTER_REVERT_PATCH="Revert Patch"

administrator/components/com_patchtester/models/pulls.php

@@ -167,7 +167,7 @@ public function getItems()
 
 		try
 		{
-			$cacheFile = JPATH_CACHE . '/patchtester.json';
+			$cacheFile = JPATH_CACHE . '/patchtester-page-' . $this->getPagination()->pagesCurrent . '.json';
 			$params    = $this->getState('params');
 
 			// Check if caching is enabled
@@ -271,7 +271,7 @@ protected function requestFromGithub()
 			if ($params->get('cache') == 1)
 			{
 				$data = json_encode($pulls);
-				file_put_contents(JPATH_CACHE . '/patchtester.json', $data);
+				file_put_contents(JPATH_CACHE . '/patchtester-page-' . $this->getPagination()->pagesCurrent . '.json', $data);
 			}
 		}
 		else