From df67c35017d8794a4b1c83fd4e41658b2e6d0e75 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 16:12:38 +0100
Subject: [PATCH] some fixes to scanning
---
db_structure.xml | 9 +++++++++
files/ajax/scan.php | 12 ++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/db_structure.xml b/db_structure.xml
index 13d5732a8d..5ef22b595c 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -81,6 +81,15 @@
<notnull>true</notnull>
<length>512</length>
</field>
+
+ <field>
+ <name>user</name>
+ <type>text</type>
+ <default>
+ </default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
<field>
<name>size</name>
diff --git a/files/ajax/scan.php b/files/ajax/scan.php
index 01236c83da..37ce7ab71f 100644
--- a/files/ajax/scan.php
+++ b/files/ajax/scan.php
@@ -2,17 +2,25 @@
require_once '../../lib/base.php';
-$eventSource=new OC_EventSource();
+set_time_limit(0);//scanning can take ages
$force=isset($_GET['force']) and $_GET['force']=='true';
$checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
+if(!$checkOnly){
+ $eventSource=new OC_EventSource();
+}
+
+
//create the file cache if necesary
if($force or !OC_FileCache::inCache('')){
if(!$checkOnly){
OC_FileCache::scan('',false,$eventSource);
+ $eventSource->send('success',true);
+ }else{
+ OC_JSON::success(array('data'=>array('done'=>true)));
+ exit;
}
- $eventSource->send('success',true);
}else{
$eventSource->send('success',false);
}
--
GitLab