Skip to content

Changed reading and writing of custom snippets #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 19, 2018
Merged

Changed reading and writing of custom snippets #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98f5904
Changed reading and writing of custom snippets
deninchoo Jul 19, 2018
0cd7c0b
Changed reading and writing of custom snippets
deninchoo Jul 19, 2018
adb0b80
Merge branch 'feature/custom-vcl-snippets' of github.com:Inchoo/fastl…
deninchoo Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions Controller/Adminhtml/FastlyCdn/Vcl/CreateCustomSnippet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Filesystem\Directory\WriteFactory;
use Magento\Framework\Controller\Result\JsonFactory;
use Magento\Framework\Filesystem;

/**
* Class CreateCustomSnippet
Expand Down Expand Up @@ -38,20 +39,37 @@ class CreateCustomSnippet extends Action
* @var JsonFactory
*/
private $resultJson;
/**
* @var Filesystem
*/
private $filesystem;

/**
* CreateCustomSnippet constructor.
*
* @param Context $context
* @param RawFactory $resultRawFactory
* @param FileFactory $fileFactory
* @param DirectoryList $directoryList
* @param WriteFactory $writeFactory
* @param JsonFactory $resultJsonFactory
* @param Filesystem $filesystem
*/
public function __construct(
Context $context,
RawFactory $resultRawFactory,
FileFactory $fileFactory,
DirectoryList $directoryList,
WriteFactory $writeFactory,
JsonFactory $resultJsonFactory
JsonFactory $resultJsonFactory,
Filesystem $filesystem
) {
$this->resultRawFactory = $resultRawFactory;
$this->fileFactory = $fileFactory;
$this->directoryList = $directoryList;
$this->writeFactory = $writeFactory;
$this->resultJson = $resultJsonFactory;
$this->filesystem = $filesystem;

parent::__construct($context);
}
Expand All @@ -68,12 +86,11 @@ public function execute()
$priority = $this->getRequest()->getParam('priority');
$vcl = $this->getRequest()->getParam('vcl');

$fileDirectory = DirectoryList::VAR_DIR;
$snippetName = $this->validateCustomSnippet($name, $type, $priority);
$fileName = $type . '_' . $priority . '_' . $snippetName . '.vcl';

$write = $this->writeFactory->create($fileDirectory . '/vcl_snippets_custom/');
$write->writeFile($fileName, $vcl);
$write = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
$write->writeFile('/vcl_snippets_custom/' . $fileName, $vcl);

return $result->setData([
'status' => true
Expand Down
81 changes: 50 additions & 31 deletions Controller/Adminhtml/FastlyCdn/Vcl/DeleteCustomSnippet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,73 +2,92 @@

namespace Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Vcl;

use Magento\Backend\App\Action;
use Magento\Backend\App\Action\Context;
use Magento\Framework\App\Request\Http;
use Magento\Framework\App\Action\Action;
use Magento\Framework\App\Action\Context;
use Magento\Framework\Controller\Result\RawFactory;
use Magento\Framework\App\Response\Http\FileFactory;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filesystem\Directory\WriteFactory;
use Magento\Framework\Controller\Result\JsonFactory;
use Magento\Framework\Filesystem\Driver\File;
use Fastly\Cdn\Model\Config;
use Fastly\Cdn\Model\Config\Backend\CustomSnippetUpload;
use Magento\Framework\Filesystem;

/**
* Class CreateCustomSnippet
*
* @package Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Vcl
*/
class DeleteCustomSnippet extends Action
{
/**
* @var Http
* @var RawFactory
*/
private $request;

private $resultRawFactory;
/**
* @var FileFactory
*/
private $fileFactory;
/**
* @var DirectoryList
*/
private $directoryList;
/**
* @var WriteFactory
*/
private $writeFactory;
/**
* @var JsonFactory
*/
private $resultJson;

/**
* @var Config
* @var Filesystem
*/
private $config;

private $customSnippetUpload;

private $file;
private $filesystem;

/**
* DeleteCustomSnippet constructor.
*
* @param Context $context
* @param Http $request
* @param RawFactory $resultRawFactory
* @param FileFactory $fileFactory
* @param DirectoryList $directoryList
* @param WriteFactory $writeFactory
* @param JsonFactory $resultJsonFactory
* @param Config $config
* @param CustomSnippetUpload $customSnippetUpload
* @param File $file
* @param Filesystem $filesystem
*/
public function __construct(
Context $context,
Http $request,
RawFactory $resultRawFactory,
FileFactory $fileFactory,
DirectoryList $directoryList,
WriteFactory $writeFactory,
JsonFactory $resultJsonFactory,
Config $config,
CustomSnippetUpload $customSnippetUpload,
File $file
Filesystem $filesystem
) {
$this->request = $request;
$this->resultRawFactory = $resultRawFactory;
$this->fileFactory = $fileFactory;
$this->directoryList = $directoryList;
$this->writeFactory = $writeFactory;
$this->resultJson = $resultJsonFactory;
$this->config = $config;
$this->customSnippetUpload = $customSnippetUpload;
$this->file = $file;
$this->filesystem = $filesystem;

parent::__construct($context);
}

/**
* @return $this|\Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
$result = $this->resultJson->create();

try {
$snippet = $this->getRequest()->getParam('snippet_id');
$customSnippetPath = $this->customSnippetUpload->getUploadDirPath('vcl_snippets_custom');

if ($this->file->isExists($customSnippetPath . '/' . $snippet)) {
$this->file->deleteFile($customSnippetPath . '/' . $snippet);
$write = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
if ($write->isExist('/vcl_snippets_custom/' . $snippet)) {
$write->delete('/vcl_snippets_custom/' . $snippet);
}

return $result->setData([
'status' => true
]);
Expand Down
80 changes: 48 additions & 32 deletions Controller/Adminhtml/FastlyCdn/Vcl/GetCustomSnippets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,85 +2,101 @@

namespace Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Vcl;

use Magento\Backend\App\Action;
use Magento\Backend\App\Action\Context;
use Magento\Framework\App\Request\Http;
use Magento\Framework\App\ResponseInterface;
use Magento\Framework\App\Action\Action;
use Magento\Framework\App\Action\Context;
use Magento\Framework\Controller\Result\RawFactory;
use Magento\Framework\App\Response\Http\FileFactory;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filesystem\Directory\WriteFactory;
use Magento\Framework\Controller\Result\JsonFactory;
use Magento\Framework\Controller\ResultInterface;
use Fastly\Cdn\Model\Config\Backend\CustomSnippetUpload;
use \Magento\Framework\Filesystem\Directory\ReadFactory;
use Magento\Framework\Filesystem;

/**
* Class GetCustomSnippets
* Class CreateCustomSnippet
*
* @package Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Vcl
*/
class GetCustomSnippets extends Action
{
/**
* @var Http
* @var RawFactory
*/
private $request;

private $resultRawFactory;
/**
* @var FileFactory
*/
private $fileFactory;
/**
* @var DirectoryList
*/
private $directoryList;
/**
* @var WriteFactory
*/
private $writeFactory;
/**
* @var JsonFactory
*/
private $resultJson;

/**
* @var CustomSnippetUpload
* @var Filesystem
*/
private $customSnippetUpload;

private $readFactory;
private $filesystem;

/**
* GetCustomSnippets constructor.
*
* @param Context $context
* @param Http $request
* @param RawFactory $resultRawFactory
* @param FileFactory $fileFactory
* @param DirectoryList $directoryList
* @param WriteFactory $writeFactory
* @param JsonFactory $resultJsonFactory
* @param CustomSnippetUpload $customSnippetUpload
* @param ReadFactory $readFactory
* @param Filesystem $filesystem
*/
public function __construct(
Context $context,
Http $request,
RawFactory $resultRawFactory,
FileFactory $fileFactory,
DirectoryList $directoryList,
WriteFactory $writeFactory,
JsonFactory $resultJsonFactory,
CustomSnippetUpload $customSnippetUpload,
ReadFactory $readFactory
Filesystem $filesystem
) {
$this->request = $request;
$this->resultRawFactory = $resultRawFactory;
$this->fileFactory = $fileFactory;
$this->directoryList = $directoryList;
$this->writeFactory = $writeFactory;
$this->resultJson = $resultJsonFactory;
$this->customSnippetUpload = $customSnippetUpload;
$this->readFactory = $readFactory;
$this->filesystem = $filesystem;

parent::__construct($context);
}

/**
* Get all backends for active version
*
* @return $this|ResponseInterface|ResultInterface
* @return $this|\Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
$result = $this->resultJson->create();
try {
$customSnippetPath = $this->customSnippetUpload->getUploadDirPath('vcl_snippets_custom');
$directoryRead = $this->readFactory->create($customSnippetPath);
$customSnippets = $directoryRead->read();
$read = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
$customSnippets = $read->read('vcl_snippets_custom');

if (!$customSnippets) {
return $result->setData([
'status' => false,
'msg' => 'No snippets found.'
]);
}
$snippets = [];
foreach ($customSnippets as $snippet) {
$snippets[] = explode('/', $snippet)[1];
}

return $result->setData([
'status' => true,
'snippets' => $customSnippets
'snippets' => $snippets
]);
} catch (\Exception $e) {
return $result->setData([
Expand Down
16 changes: 13 additions & 3 deletions Controller/Adminhtml/FastlyCdn/Vcl/Upload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
use Magento\Framework\Stdlib\DateTime\DateTime;
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Filesystem;
use Magento\Framework\App\Filesystem\DirectoryList;

class Upload extends Action
{
Expand Down Expand Up @@ -57,7 +59,11 @@ class Upload extends Action
private $timezone;

/**
*
* @var Filesystem
*/
private $filesystem;

/**
* Upload constructor.
*
* @param Context $context
Expand All @@ -69,6 +75,7 @@ class Upload extends Action
* @param CustomSnippetUpload $customSnippetUpload
* @param DateTime $time
* @param TimezoneInterface $timezone
* @param Filesystem $filesystem
*/
public function __construct(
Context $context,
Expand All @@ -79,7 +86,8 @@ public function __construct(
Vcl $vcl,
CustomSnippetUpload $customSnippetUpload,
DateTime $time,
TimezoneInterface $timezone
TimezoneInterface $timezone,
Filesystem $filesystem
) {
$this->request = $request;
$this->resultJson = $resultJsonFactory;
Expand All @@ -89,6 +97,7 @@ public function __construct(
$this->customSnippetUpload = $customSnippetUpload;
$this->time = $time;
$this->timezone = $timezone;
$this->filesystem = $filesystem;
parent::__construct($context);
}

Expand All @@ -108,7 +117,8 @@ public function execute()
$currActiveVersion = $this->vcl->getCurrentVersion($service->versions);
$clone = $this->api->cloneVersion($currActiveVersion);
$snippets = $this->config->getVclSnippets();
$customSnippetPath = $this->customSnippetUpload->getUploadDirPath('vcl_snippets_custom');
$read = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
$customSnippetPath = $read->getAbsolutePath('vcl_snippets_custom');
$customSnippets = $this->config->getCustomSnippets($customSnippetPath);

foreach ($snippets as $key => $value) {
Expand Down