leetNightshade
/
grav-plugin-comments
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Refine backend

This commit is contained in:
Flavio Copes 2015-10-08 17:30:18 +02:00
parent 61677d06d4
commit 1c1f6f6d16
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/templates/comments.html.twig
View File

@ -59,8 +59,14 @@
'</tr>'); '</tr>');
}) })
$('.totalRetrieved').html(response.totalRetrieved); var totalRetrieved = response.totalRetrieved * (parseInt(response.page) + 1);
$('.totalRetrieved').html(totalRetrieved);
$('.totalAvailable').html(response.totalAvailable); $('.totalAvailable').html(response.totalAvailable);
if (totalRetrieved == response.totalAvailable) {
$('.js__load-more').hide();
}
}) })
.error(function() { .error(function() {
alert('Unexpected error'); alert('Unexpected error');
@ -69,7 +75,7 @@
}); });
</script> </script>
<h1>Latest comments</h1> <h1>Comments from the last 7 days</h1>
<div class="admin-block default-box-shadow"> <div class="admin-block default-box-shadow">
<table> <table>

25
comments.php
View File

@ -144,15 +144,24 @@ class CommentsPlugin extends Plugin
$itrItr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::SELF_FIRST); $itrItr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::SELF_FIRST);
$filesItr = new \RegexIterator($itrItr, '/^.+\.yaml$/i'); $filesItr = new \RegexIterator($itrItr, '/^.+\.yaml$/i');
// Collect files if modified in the last 7 days
foreach ($filesItr as $filepath => $file) { foreach ($filesItr as $filepath => $file) {
$modifiedDate = $file->getMTime();
$sevenDaysAgo = time() - (7 * 24 * 60 * 60);
if ($modifiedDate < $sevenDaysAgo) {
continue;
}
$files[] = (object)array( $files[] = (object)array(
"modifiedDate" => $file->getMTime(), "modifiedDate" => $modifiedDate,
"fileName" => $file->getFilename(), "fileName" => $file->getFilename(),
"filePath" => $filepath, "filePath" => $filepath,
"data" => Yaml::parse(file_get_contents($filepath)) "data" => Yaml::parse(file_get_contents($filepath))
); );
} }
// Traverse folders and recurse
foreach ($itr as $file) { foreach ($itr as $file) {
if ($file->isDir()) { if ($file->isDir()) {
$this->getFilesOrderedByModifiedDate($file->getPath() . '/' . $file->getFilename()); $this->getFilesOrderedByModifiedDate($file->getPath() . '/' . $file->getFilename());
@ -168,7 +177,7 @@ class CommentsPlugin extends Plugin
} }
private function getLastComments($page = 0) { private function getLastComments($page = 0) {
$number = 10; $number = 30;
$files = []; $files = [];
$files = $this->getFilesOrderedByModifiedDate(); $files = $this->getFilesOrderedByModifiedDate();
@ -178,12 +187,20 @@ class CommentsPlugin extends Plugin
foreach($files as $file) { foreach($files as $file) {
$data = Yaml::parse(file_get_contents($file->filePath)); $data = Yaml::parse(file_get_contents($file->filePath));
for ($i = 0; $i < count($data['comments']); $i++) { for ($i = 0; $i < count($data['comments']); $i++) {
$commentDate = \DateTime::createFromFormat('D, d M Y H:i:s', $data['comments'][$i]['date'])->getTimestamp();
$sevenDaysAgo = time() - (7 * 24 * 60 * 60);
if ($commentDate < $sevenDaysAgo) {
continue;
}
$data['comments'][$i]['pageTitle'] = $data['title']; $data['comments'][$i]['pageTitle'] = $data['title'];
$data['comments'][$i]['filePath'] = $file->filePath; $data['comments'][$i]['filePath'] = $file->filePath;
} }
if (count($data['comments'])) {
$comments = array_merge($comments, $data['comments']); $comments = array_merge($comments, $data['comments']);
} }
}
// Order comments by date // Order comments by date
usort($comments, function($a, $b) { usort($comments, function($a, $b) {
@ -194,7 +211,7 @@ class CommentsPlugin extends Plugin
$comments = array_slice($comments, $page * $number, $number); $comments = array_slice($comments, $page * $number, $number);
$totalRetrieved = ($page + 1) * $number; $totalRetrieved = count($comments);
$hasMore = false; $hasMore = false;
if ($totalAvailable > $totalRetrieved) { if ($totalAvailable > $totalRetrieved) {