Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

LinkDB: update datastore method names

Browse source 
Relates to https://github.com/shaarli/Shaarli/issues/95

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
This commit is contained in:
VirtualTam 2016-10-20 21:19:51 +02:00
parent 628b97cbdf
commit f21abf3292
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
application/LinkDB.php
View file

@ -100,8 +100,8 @@ class LinkDB implements Iterator, Countable, ArrayAccess
$this->hidePublicLinks = $hidePublicLinks;
$this->redirector = $redirector;
$this->redirectorEncode = $redirectorEncode === true;
$this->checkDB();
$this->readDB();
$this->check();
$this->read();
}
/**
@ -210,7 +210,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
*
* If no DB file is found, creates a dummy DB.
*/
private function checkDB()
private function check()
{
if (file_exists($this->datastore)) {
return;
@ -243,13 +243,13 @@ You use the community supported version of the original Shaarli project, by Seba
$this->links[$link['linkdate']] = $link;
// Write database to disk
$this->writeDB();
$this->write();
}
/**
* Reads database from disk to memory
*/
private function readDB()
private function read()
{
// Public links are hidden and user not logged in => nothing to show
@ -315,7 +315,7 @@ You use the community supported version of the original Shaarli project, by Seba
*
* @throws IOException the datastore is not writable
*/
private function writeDB()
private function write()
{
if (is_file($this->datastore) && !is_writeable($this->datastore)) {
// The datastore exists but is not writeable
@ -337,14 +337,14 @@ You use the community supported version of the original Shaarli project, by Seba
*
* @param string $pageCacheDir page cache directory
*/
public function savedb($pageCacheDir)
public function save($pageCacheDir)
{
if (!$this->loggedIn) {
// TODO: raise an Exception instead
die('You are not authorized to change the database.');
}
$this->writeDB();
$this->write();
invalidateCaches($pageCacheDir);
}

2
application/NetscapeBookmarkUtils.php
View file

@ -183,7 +183,7 @@ class NetscapeBookmarkUtils
$importCount++;
}
$linkDb->savedb($pagecache);
$linkDb->save($pagecache);
return self::importStatus(
$filename,
$filesize,

2
application/Updater.php
View file

@ -143,7 +143,7 @@ class Updater
$link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true)));
$this->linkDB[$link['linkdate']] = $link;
}
$this->linkDB->savedb($this->conf->get('resource.page_cache'));
$this->linkDB->save($this->conf->get('resource.page_cache'));
return true;
}

8
index.php
View file

@ -1211,7 +1211,7 @@ function renderPage($conf, $pluginManager)
$value['tags']=trim(implode(' ',$tags));
$LINKSDB[$key]=$value;
}
$LINKSDB->savedb($conf->get('resource.page_cache'));
$LINKSDB->save($conf->get('resource.page_cache'));
echo '<script>alert("Tag was removed from '.count($linksToAlter).' links.");document.location=\'?\';</script>';
exit;
}
@ -1228,7 +1228,7 @@ function renderPage($conf, $pluginManager)
$value['tags']=trim(implode(' ',$tags));
$LINKSDB[$key]=$value;
}
$LINKSDB->savedb($conf->get('resource.page_cache')); // Save to disk.
$LINKSDB->save($conf->get('resource.page_cache')); // Save to disk.
echo '<script>alert("Tag was renamed in '.count($linksToAlter).' links.");document.location=\'?searchtags='.urlencode($_POST['totag']).'\';</script>';
exit;
}
@ -1283,7 +1283,7 @@ function renderPage($conf, $pluginManager)
$pluginManager->executeHooks('save_link', $link);
$LINKSDB[$linkdate] = $link;
$LINKSDB->savedb($conf->get('resource.page_cache'));
$LINKSDB->save($conf->get('resource.page_cache'));
pubsubhub($conf);
// If we are called from the bookmarklet, we must close the popup:
@ -1325,7 +1325,7 @@ function renderPage($conf, $pluginManager)
$pluginManager->executeHooks('delete_link', $LINKSDB[$linkdate]);
unset($LINKSDB[$linkdate]);
$LINKSDB->savedb('resource.page_cache'); // save to disk
$LINKSDB->save('resource.page_cache'); // save to disk
// If we are called from the bookmarklet, we must close the popup:
if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; }

8
tests/LinkDBTest.php
View file

@ -117,7 +117,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
unlink(self::$testDatastore);
$this->assertFileNotExists(self::$testDatastore);
$checkDB = self::getMethod('checkDB');
$checkDB = self::getMethod('check');
$checkDB->invokeArgs($linkDB, array());
$this->assertFileExists(self::$testDatastore);
@ -134,7 +134,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
$datastoreSize = filesize(self::$testDatastore);
$this->assertGreaterThan(0, $datastoreSize);
$checkDB = self::getMethod('checkDB');
$checkDB = self::getMethod('check');
$checkDB->invokeArgs($linkDB, array());
// ensure the datastore is left unmodified
@ -180,7 +180,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
/**
* Save the links to the DB
*/
public function testSaveDB()
public function testSave()
{
$testDB = new LinkDB(self::$testDatastore, true, false);
$dbSize = sizeof($testDB);
@ -194,7 +194,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
'tags'=>'unit test'
);
$testDB[$link['linkdate']] = $link;
$testDB->savedb('tests');
$testDB->save('tests');
$testDB = new LinkDB(self::$testDatastore, true, false);
$this->assertEquals($dbSize + 1, sizeof($testDB));