diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 5adb57b554dfedb1eb1e1c5203c1a02d769f09b6..6f492440ea1e540df9ac963004ac0a7497404b53 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -4,33 +4,29 @@
* ownCloud - gallery application
*
* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-*
+* @copyright 2012 Bartek Przybylski <bartek@alefzero.eu>
+*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
-*
+*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
+*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
+*
*/
+require_once('base.php');
+
class OC_Gallery_Album {
public static function create($owner, $name, $path){
- $id = self::getParentPath($path);
$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name, album_path, parent_path) VALUES (?, ?, ?, ?)');
- $stmt->execute(array($owner, $name, $path, $id));
- }
-
- public static function rename($oldname, $newname, $owner) {
- $stmt = OC_DB::prepare('UPDATE *PREFIX*gallery_albums SET album_name=? WHERE uid_owner=? AND album_name=?');
- $stmt->execute(array($newname, $owner, $oldname));
+ $stmt->execute(array($owner, $name, $path, self::getParentPath($path)));
}
public static function cleanup() {
@@ -42,37 +38,31 @@ class OC_Gallery_Album {
}
public static function getParentPath($path) {
- if (strlen($path)==1) return '';
- $path = substr($path, 0, strrpos($path, '/'));
- if ($path == '') $path = '/';
- return $path;
+ return dirname($path);
}
- public static function remove($owner, $name=null) {
- $sql = 'DELETE FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
+ public static function remove($owner, $name=null, $path=null, $parent=null) {
+ $sql = 'DELETE FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ?';
$args = array($owner);
if (!is_null($name)){
- $sql .= ' AND album_name = ?';
+ $sql .= ' AND album_name LIKE ?';
$args[] = $name;
- }
+ }
+ if (!is_null($path)){
+ $sql .= ' AND album_path LIKE ?';
+ $args[] = $path;
+ }
+ if (!is_null($parent)){
+ $sql .= ' AND parent_path LIKE ?';
+ $args[] = $parent;
+ }
$stmt = OC_DB::prepare($sql);
return $stmt->execute($args);
}
- public static function removeByPath($path, $owner) {
- $album = self::find($owner, null, $path);
- $album = $album->fetchRow();
- self::remove($owner, $album['album_name']);
- OC_Gallery_Photo::removeByAlbumId($album['album_id']);
- // find and remove any gallery which might be stored lower in dir hierarchy
- $path = $path.'/%';
- $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE album_path LIKE ? AND uid_owner = ?');
- $result = $stmt->execute(array($path, $owner));
- while (($album = $result->fetchRow())) {
- OC_Gallery_Photo::removeByAlbumId($album['album_id']);
- self::remove($owner, $album['album_name']);
- }
- }
+ public static function removeByName($owner, $name) { self::remove($ownmer, $name); }
+ public static function removeByPath($owner, $path) { self::remove($owner, null, $path); }
+ public static function removeByParentPath($owner, $parent) { self::remove($owner, null, null, $parent); }
public static function find($owner, $name=null, $path=null, $parent=null){
$sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index dbe1abff10e95141c39ad98839097f0835af1669..00ab7cf718178380977a59bd10dc17e4e4ff4e8c 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -4,7 +4,7 @@
* ownCloud - gallery application
*
* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* @copyright 2012 Bartek Przybylski <bartek@alefzero.eu>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -21,11 +21,14 @@
*
*/
-require_once('base.php');
-require_once('images_utils.php');
+require_once('../../../lib/base.php');
class OC_Gallery_Scanner {
+ public static function getScanningRoot() {
+ return OC_Filesystem::getRoot().OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '/');
+ }
+
public static function scan($root) {
$albums = array();
self::scanDir($root, $albums);
@@ -33,10 +36,7 @@ class OC_Gallery_Scanner {
}
public static function cleanUp() {
- $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_albums');
- $stmt->execute(array());
- $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos');
- $stmt->execute(array());
+ OC_Gallery_Album::cleanup();
}
public static function createName($name) {
@@ -97,10 +97,10 @@ class OC_Gallery_Scanner {
}
public static function find_paths($path) {
- $images=OC_FileCache::searchByMime('image');
+ $images=OC_FileCache::searchByMime('image','', self::getScanningRoot());
$paths=array();
foreach($images as $image){
- $path=dirname($image);
+ $path=substr(dirname($image), strlen(self::getScanningRoot()));;
if(array_search($path,$paths)===false){
$paths[]=$path;
}
@@ -108,4 +108,5 @@ class OC_Gallery_Scanner {
return $paths;
}
}
+
?>
diff --git a/lib/filecache.php b/lib/filecache.php
index be2a00a19a0a94e82f913e2e835f1a264be46d0f..7cea878042d9cd9b74ffd316fed7fedb0b48ca17 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -534,10 +534,10 @@ class OC_FileCache{
* seccond mimetype part can be ommited
* e.g. searchByMime('audio')
*/
- public static function searchByMime($part1,$part2='',$root=''){
+ public static function searchByMime($part1,$part2=null,$root=null){
if(!$root){
$root=OC_Filesystem::getRoot();
- }elseif($root='/'){
+ }elseif($root=='/'){
$root='';
}
$rootLen=strlen($root);