Relates to #95, #218
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
class LinkDB implements Iterator, Countable, ArrayAccess
{
// Links are stored as a PHP serialized string
class LinkDB implements Iterator, Countable, ArrayAccess
{
// Links are stored as a PHP serialized string
// Datastore PHP prefix
protected static $phpPrefix = '<?php /* ';
// Datastore PHP prefix
protected static $phpPrefix = '<?php /* ';
// List of links (associative array)
// - key: link date (e.g. "20110823_124546"),
// - value: associative array (keys: title, description...)
// List of links (associative array)
// - key: link date (e.g. "20110823_124546"),
// - value: associative array (keys: title, description...)
// List of all recorded URLs (key=url, value=linkdate)
// for fast reserve search (url-->linkdate)
// List of all recorded URLs (key=url, value=linkdate)
// for fast reserve search (url-->linkdate)
// List of linkdate keys (for the Iterator interface implementation)
// List of linkdate keys (for the Iterator interface implementation)
- // Position in the $this->keys array (for the Iterator interface)
- private $position;
+ // Position in the $this->_keys array (for the Iterator interface)
+ private $_position;
// Is the user logged in? (used to filter private links)
// Is the user logged in? (used to filter private links)
- private $hidePublicLinks;
+ private $_hidePublicLinks;
/**
* Creates a new LinkDB
/**
* Creates a new LinkDB
*/
function __construct($datastore, $isLoggedIn, $hidePublicLinks)
{
*/
function __construct($datastore, $isLoggedIn, $hidePublicLinks)
{
- $this->datastore = $datastore;
- $this->loggedIn = $isLoggedIn;
- $this->hidePublicLinks = $hidePublicLinks;
- $this->checkDB();
- $this->readdb();
+ $this->_datastore = $datastore;
+ $this->_loggedIn = $isLoggedIn;
+ $this->_hidePublicLinks = $hidePublicLinks;
+ $this->_checkDB();
+ $this->_readDB();
*/
public function count()
{
*/
public function count()
{
- return count($this->links);
+ return count($this->_links);
public function offsetSet($offset, $value)
{
// TODO: use exceptions instead of "die"
public function offsetSet($offset, $value)
{
// TODO: use exceptions instead of "die"
- if (!$this->loggedIn) {
+ if (!$this->_loggedIn) {
die('You are not authorized to add a link.');
}
if (empty($value['linkdate']) || empty($value['url'])) {
die('You are not authorized to add a link.');
}
if (empty($value['linkdate']) || empty($value['url'])) {
if (empty($offset)) {
die('You must specify a key.');
}
if (empty($offset)) {
die('You must specify a key.');
}
- $this->links[$offset] = $value;
- $this->urls[$value['url']]=$offset;
+ $this->_links[$offset] = $value;
+ $this->_urls[$value['url']]=$offset;
*/
public function offsetExists($offset)
{
*/
public function offsetExists($offset)
{
- return array_key_exists($offset, $this->links);
+ return array_key_exists($offset, $this->_links);
*/
public function offsetUnset($offset)
{
*/
public function offsetUnset($offset)
{
- if (!$this->loggedIn) {
+ if (!$this->_loggedIn) {
// TODO: raise an exception
die('You are not authorized to delete a link.');
}
// TODO: raise an exception
die('You are not authorized to delete a link.');
}
- $url = $this->links[$offset]['url'];
- unset($this->urls[$url]);
- unset($this->links[$offset]);
+ $url = $this->_links[$offset]['url'];
+ unset($this->_urls[$url]);
+ unset($this->_links[$offset]);
*/
public function offsetGet($offset)
{
*/
public function offsetGet($offset)
{
- return isset($this->links[$offset]) ? $this->links[$offset] : null;
+ return isset($this->_links[$offset]) ? $this->_links[$offset] : null;
- return $this->links[$this->keys[$this->position]];
+ return $this->_links[$this->_keys[$this->_position]];
- return $this->keys[$this->position];
+ return $this->_keys[$this->_position];
- $this->keys = array_keys($this->links);
- rsort($this->keys);
- $this->position = 0;
+ $this->_keys = array_keys($this->_links);
+ rsort($this->_keys);
+ $this->_position = 0;
- return isset($this->keys[$this->position]);
+ return isset($this->_keys[$this->_position]);
*
* If no DB file is found, creates a dummy DB.
*/
*
* If no DB file is found, creates a dummy DB.
*/
- private function checkDB()
+ private function _checkDB()
- if (file_exists($this->datastore)) {
+ if (file_exists($this->_datastore)) {
return;
}
// Create a dummy database for example
return;
}
// Create a dummy database for example
- $this->links = array();
+ $this->_links = array();
$link = array(
'title'=>' Shaarli: the personal, minimalist, super-fast, no-database delicious clone',
'url'=>'https://github.com/shaarli/Shaarli/wiki',
$link = array(
'title'=>' Shaarli: the personal, minimalist, super-fast, no-database delicious clone',
'url'=>'https://github.com/shaarli/Shaarli/wiki',
'linkdate'=> date('Ymd_His'),
'tags'=>'opensource software'
);
'linkdate'=> date('Ymd_His'),
'tags'=>'opensource software'
);
- $this->links[$link['linkdate']] = $link;
+ $this->_links[$link['linkdate']] = $link;
$link = array(
'title'=>'My secret stuff... - Pastebin.com',
$link = array(
'title'=>'My secret stuff... - Pastebin.com',
'linkdate'=> date('Ymd_His', strtotime('-1 minute')),
'tags'=>'secretstuff'
);
'linkdate'=> date('Ymd_His', strtotime('-1 minute')),
'tags'=>'secretstuff'
);
- $this->links[$link['linkdate']] = $link;
+ $this->_links[$link['linkdate']] = $link;
// Write database to disk
// TODO: raise an exception if the file is not write-able
file_put_contents(
// Write database to disk
// TODO: raise an exception if the file is not write-able
file_put_contents(
- $this->datastore,
- self::$phpPrefix.base64_encode(gzdeflate(serialize($this->links))).self::$phpSuffix
+ $this->_datastore,
+ self::$phpPrefix.base64_encode(gzdeflate(serialize($this->_links))).self::$phpSuffix
);
}
/**
* Reads database from disk to memory
*/
);
}
/**
* Reads database from disk to memory
*/
- private function readdb()
+ private function _readDB()
{
// Public links are hidden and user not logged in => nothing to show
{
// Public links are hidden and user not logged in => nothing to show
- if ($this->hidePublicLinks && !$this->loggedIn) {
- $this->links = array();
+ if ($this->_hidePublicLinks && !$this->_loggedIn) {
+ $this->_links = array();
return;
}
// Read data
// Note that gzinflate is faster than gzuncompress.
// See: http://www.php.net/manual/en/function.gzdeflate.php#96439
return;
}
// Read data
// Note that gzinflate is faster than gzuncompress.
// See: http://www.php.net/manual/en/function.gzdeflate.php#96439
- $this->links = array();
+ $this->_links = array();
- if (file_exists($this->datastore)) {
- $this->links = unserialize(gzinflate(base64_decode(
- substr(file_get_contents($this->datastore),
+ if (file_exists($this->_datastore)) {
+ $this->_links = unserialize(gzinflate(base64_decode(
+ substr(file_get_contents($this->_datastore),
strlen(self::$phpPrefix), -strlen(self::$phpSuffix)))));
}
// If user is not logged in, filter private links.
strlen(self::$phpPrefix), -strlen(self::$phpSuffix)))));
}
// If user is not logged in, filter private links.
- if (!$this->loggedIn) {
+ if (!$this->_loggedIn) {
- foreach ($this->links as $link) {
+ foreach ($this->_links as $link) {
if ($link['private'] != 0) {
$toremove[] = $link['linkdate'];
}
}
foreach ($toremove as $linkdate) {
if ($link['private'] != 0) {
$toremove[] = $link['linkdate'];
}
}
foreach ($toremove as $linkdate) {
- unset($this->links[$linkdate]);
+ unset($this->_links[$linkdate]);
}
}
// Keep the list of the mapping URLs-->linkdate up-to-date.
}
}
// Keep the list of the mapping URLs-->linkdate up-to-date.
- $this->urls = array();
- foreach ($this->links as $link) {
- $this->urls[$link['url']] = $link['linkdate'];
+ $this->_urls = array();
+ foreach ($this->_links as $link) {
+ $this->_urls[$link['url']] = $link['linkdate'];
- foreach($this->links as &$link) {
+ foreach($this->_links as &$link) {
*/
public function savedb()
{
*/
public function savedb()
{
- if (!$this->loggedIn) {
+ if (!$this->_loggedIn) {
// TODO: raise an Exception instead
die('You are not authorized to change the database.');
}
file_put_contents(
// TODO: raise an Exception instead
die('You are not authorized to change the database.');
}
file_put_contents(
- $this->datastore,
- self::$phpPrefix.base64_encode(gzdeflate(serialize($this->links))).self::$phpSuffix
+ $this->_datastore,
+ self::$phpPrefix.base64_encode(gzdeflate(serialize($this->_links))).self::$phpSuffix
*/
public function getLinkFromUrl($url)
{
*/
public function getLinkFromUrl($url)
{
- if (isset($this->urls[$url])) {
- return $this->links[$this->urls[$url]];
+ if (isset($this->_urls[$url])) {
+ return $this->_links[$this->_urls[$url]];
$search = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8');
$keys = array('title', 'description', 'url', 'tags');
$search = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8');
$keys = array('title', 'description', 'url', 'tags');
- foreach ($this->links as $link) {
+ foreach ($this->_links as $link) {
$found = false;
foreach ($keys as $key) {
$found = false;
foreach ($keys as $key) {
$searchtags = explode(' ', $t);
$filtered = array();
$searchtags = explode(' ', $t);
$filtered = array();
- foreach ($this->links as $l) {
+ foreach ($this->_links as $l) {
$linktags = explode(
' ',
($casesensitive ? $l['tags']:mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8'))
$linktags = explode(
' ',
($casesensitive ? $l['tags']:mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8'))
- foreach ($this->links as $l) {
+ foreach ($this->_links as $l) {
if (startsWith($l['linkdate'], $day)) {
$filtered[$l['linkdate']] = $l;
}
if (startsWith($l['linkdate'], $day)) {
$filtered[$l['linkdate']] = $l;
}
public function filterSmallHash($smallHash)
{
$filtered = array();
public function filterSmallHash($smallHash)
{
$filtered = array();
- foreach ($this->links as $l) {
+ foreach ($this->_links as $l) {
if ($smallHash == smallHash($l['linkdate'])) {
// Yes, this is ugly and slow
$filtered[$l['linkdate']] = $l;
if ($smallHash == smallHash($l['linkdate'])) {
// Yes, this is ugly and slow
$filtered[$l['linkdate']] = $l;
public function allTags()
{
$tags = array();
public function allTags()
{
$tags = array();
- foreach ($this->links as $link) {
+ foreach ($this->_links as $link) {
foreach (explode(' ', $link['tags']) as $tag) {
if (!empty($tag)) {
$tags[$tag] = (empty($tags[$tag]) ? 1 : $tags[$tag] + 1);
foreach (explode(' ', $link['tags']) as $tag) {
if (!empty($tag)) {
$tags[$tag] = (empty($tags[$tag]) ? 1 : $tags[$tag] + 1);
public function days()
{
$linkDays = array();
public function days()
{
$linkDays = array();
- foreach (array_keys($this->links) as $day) {
+ foreach (array_keys($this->_links) as $day) {
$linkDays[substr($day, 0, 8)] = 0;
}
$linkDays = array_keys($linkDays);
$linkDays[substr($day, 0, 8)] = 0;
}
$linkDays = array_keys($linkDays);
unlink(self::$testDatastore);
$this->assertFileNotExists(self::$testDatastore);
unlink(self::$testDatastore);
$this->assertFileNotExists(self::$testDatastore);
- $checkDB = self::getMethod('checkDB');
+ $checkDB = self::getMethod('_checkDB');
$checkDB->invokeArgs($linkDB, array());
$this->assertFileExists(self::$testDatastore);
$checkDB->invokeArgs($linkDB, array());
$this->assertFileExists(self::$testDatastore);
$datastoreSize = filesize(self::$testDatastore);
$this->assertGreaterThan(0, $datastoreSize);
$datastoreSize = filesize(self::$testDatastore);
$this->assertGreaterThan(0, $datastoreSize);
- $checkDB = self::getMethod('checkDB');
+ $checkDB = self::getMethod('_checkDB');
$checkDB->invokeArgs($linkDB, array());
// ensure the datastore is left unmodified
$checkDB->invokeArgs($linkDB, array());
// ensure the datastore is left unmodified
*/
class ReferenceLinkDB
{
*/
class ReferenceLinkDB
{
- private $links = array();
- private $publicCount = 0;
- private $privateCount = 0;
+ private $_links = array();
+ private $_publicCount = 0;
+ private $_privateCount = 0;
/**
* Populates the test DB with reference data
/**
* Populates the test DB with reference data
'linkdate' => $date,
'tags' => $tags,
);
'linkdate' => $date,
'tags' => $tags,
);
- $this->links[$date] = $link;
+ $this->_links[$date] = $link;
+ $this->_privateCount++;
{
file_put_contents(
$filename,
{
file_put_contents(
$filename,
- '<?php /* '.base64_encode(gzdeflate(serialize($this->links))).' */ ?>'
+ '<?php /* '.base64_encode(gzdeflate(serialize($this->_links))).' */ ?>'
*/
public function countLinks()
{
*/
public function countLinks()
{
- return $this->publicCount + $this->privateCount;
+ return $this->_publicCount + $this->_privateCount;
*/
public function countPublicLinks()
{
*/
public function countPublicLinks()
{
- return $this->publicCount;
+ return $this->_publicCount;
*/
public function countPrivateLinks()
{
*/
public function countPrivateLinks()
{
- return $this->privateCount;
+ return $this->_privateCount;