From 024f4375b6fc476033dbd13f03e663076d44398b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 12 Nov 2011 01:00:04 +0100
Subject: [PATCH] keep encrypted and versioned flag in fscache
---
db_structure.xml | 16 +++++++++++++++
lib/filecache.php | 50 +++++++++++++++++++++++++++++++++--------------
2 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/db_structure.xml b/db_structure.xml
index c7fa423e14e..39dea564b0f 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -126,6 +126,22 @@
<length>32</length>
</field>
+ <field>
+ <name>encrypted</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>versioned</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
<index>
<name>path_index</name>
<unique>true</unique>
diff --git a/lib/filecache.php b/lib/filecache.php
index db3d6ca1d5b..928fc02e669 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -38,10 +38,12 @@ class OC_FileCache{
* - mtime
* - ctime
* - mimetype
+ * - encrypted
+ * - versioned
*/
public static function get($path){
$path=OC_Filesystem::getRoot().$path;
- $query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size FROM *PREFIX*fscache WHERE path=?');
+ $query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE path=?');
$result=$query->execute(array($path))->fetchRow();
if(is_array($result)){
return $result;
@@ -60,19 +62,24 @@ class OC_FileCache{
*/
public static function put($path,$data){
$path=OC_Filesystem::getRoot().$path;
- if($id=self::getFileId($path)!=-1){
- self::update($id,$data);
- return;
- }
if($path=='/'){
$parent=-1;
}else{
$parent=self::getFileId(dirname($path));
}
+ $id=self::getFileId($path);
+ if($id!=-1){
+ self::update($id,$data);
+ return;
+ }
+ if(!isset($data['encrypted'])){
+ $data['encrypted']=false;
+ }
+ if(!isset($data['versioned'])){
+ $data['versioned']=false;
+ }
$mimePart=dirname($data['mimetype']);
$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart) VALUES(?,?,?,?,?,?,?,?)');
-// echo $path;
-// print_r($data);
$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart));
}
@@ -83,9 +90,21 @@ class OC_FileCache{
* @param array $data
*/
private static function update($id,$data){
- $mimePart=dirname($data['mimetype']);
- $query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=? ,mtime=? ,ctime=? ,mimetype=? , mimepart=? WHERE id=?');
- $query->execute(array($data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$id));
+ $arguments=array();
+ $queryParts=array();
+ foreach(array('size','mtime','ctime','mimetype','encrypted','versioned') as $attribute){
+ if(isset($data[$attribute])){
+ $arguments[]=$data[$attribute];
+ $queryParts[]=$attribute.'=?';
+ }
+ }
+ if(isset($data['mimetype'])){
+ $arguments[]=dirname($data['mimetype']);
+ $queryParts[]='mimepart=?';
+ }
+ $arguments[]=$id;
+ $query=OC_DB::prepare('UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?');
+ $query->execute($arguments);
}
/**
@@ -137,11 +156,13 @@ class OC_FileCache{
* - mtime
* - ctime
* - mimetype
+ * - encrypted
+ * - versioned
*/
public static function getFolderContent($path){
$path=OC_Filesystem::getRoot().$path;
$parent=self::getFileId($path);
- $query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size FROM *PREFIX*fscache WHERE parent=?');
+ $query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE parent=?');
$result=$query->execute(array($parent))->fetchAll();
if(is_array($result)){
return $result;
@@ -201,8 +222,9 @@ class OC_FileCache{
if($mimetype=='httpd/unix-directory'){
$size=0;
}else{
- if(($id=self::getFileId($fullPath))!=-1){
- $oldInfo=self::get($fullPath);
+ $id=self::getFileId($fullPath);
+ if($id!=-1){
+ $oldInfo=self::get($path);
$oldSize=$oldInfo['size'];
}else{
$oldSize=0;
@@ -221,7 +243,6 @@ class OC_FileCache{
public static function fileSystemWatcherDelete($params){
$path=$params['path'];
$fullPath=OC_Filesystem::getRoot().$path;
- error_log("delete $path");
if(self::getFileId($fullPath)==-1){
return;
}
@@ -258,7 +279,6 @@ class OC_FileCache{
private static function increaseSize($path,$sizeDiff){
while(($id=self::getFileId($path))!=-1){
$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=size+? WHERE id=?');
- error_log('diff '.$path.' '.$sizeDiff);
$query->execute(array($sizeDiff,$id));
$path=dirname($path);
}
--
GitLab