mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progressbar for New->From Url

This commit is contained in:
Robin Appelman 2012-07-22 03:56:51 +02:00
parent 59ab8b14c7
commit a49c07cf88
2 changed files with 65 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/files/ajax/newfile.php
View File

@ -1,16 +1,23 @@
<?php
// Init owncloud
global $eventSource;
if(!OC_User::isLoggedIn()){
exit;
}
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
session_write_close();
// Get the params
$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
$filename = isset( $_POST['filename'] ) ? stripslashes($_POST['filename']) : '';
$content = isset( $_POST['content'] ) ? $_POST['content'] : '';
$source = isset( $_POST['source'] ) ? stripslashes($_POST['source']) : '';
$dir = isset( $_REQUEST['dir'] ) ? stripslashes($_REQUEST['dir']) : '';
$filename = isset( $_REQUEST['filename'] ) ? stripslashes($_REQUEST['filename']) : '';
$content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
$source = isset( $_REQUEST['source'] ) ? stripslashes($_REQUEST['source']) : '';
if($source){
$eventSource=new OC_EventSource();
}
if($filename == '') {
OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
@ -21,22 +28,49 @@ if(strpos($filename,'/')!==false){
exit();
}
function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max){
static $filesize = 0;
static $lastsize = 0;
global $eventSource;
switch($notification_code) {
case STREAM_NOTIFY_FILE_SIZE_IS:
$filesize = $bytes_max;
break;
case STREAM_NOTIFY_PROGRESS:
if ($bytes_transferred > 0) {
if (!isset($filesize)) {
} else {
$progress = (int)(($bytes_transferred/$filesize)*100);
if($progress>$lastsize){//limit the number or messages send
$eventSource->send('progress',$progress);
}
$lastsize=$progress;
}
}
break;
}
}
if($source){
if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
exit();
}
$sourceStream=fopen($source,'rb');
$ctx = stream_context_create(null, array('notification' =>'progress'));
$sourceStream=fopen($source,'rb', false, $ctx);
$target=$dir.'/'.$filename;
$result=OC_Filesystem::file_put_contents($target,$sourceStream);
if($result){
$mime=OC_Filesystem::getMimetype($target);
OCP\JSON::success(array("data" => array('mime'=>$mime)));
exit();
$eventSource->send('success',$mime);
}else{
OCP\JSON::error(array("data" => array( "message" => "Error while downloading ".$source. ' to '.$target )));
exit();
$eventSource->send('error',"Error while downloading ".$source. ' to '.$target);
}
$eventSource->close();
exit();
}else{
if($content){
if(OC_Filesystem::file_put_contents($dir.'/'.$filename,$content)){

36
apps/files/js/files.js
View File

@ -497,23 +497,27 @@ $(document).ready(function() {
localName=(localName.match(/:\/\/(.[^/]+)/)[1]).replace('www.','');
}
localName = getUniqueName(localName);
$.post(
OC.filePath('files','ajax','newfile.php'),
{dir:$('#dir').val(),source:name,filename:localName},
function(result){
if(result.status == 'success'){
var date=new Date();
FileList.addFile(localName,0,date);
var tr=$('tr').filterAttr('data-file',localName);
tr.data('mime',result.data.mime);
getMimeIcon(result.data.mime,function(path){
tr.find('td.filename').attr('style','background-image:url('+path+')');
});
}else{
$('#uploadprogressbar').progressbar({value:0});
$('#uploadprogressbar').fadeIn();
}
}
);
var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
eventSource.listen('progress',function(progress){
$('#uploadprogressbar').progressbar('value',progress);
});
eventSource.listen('success',function(mime){
$('#uploadprogressbar').fadeOut();
var date=new Date();
FileList.addFile(localName,0,date);
var tr=$('tr').filterAttr('data-file',localName);
tr.data('mime',mime);
getMimeIcon(mime,function(path){
tr.find('td.filename').attr('style','background-image:url('+path+')');
});
});
eventSource.listen('error',function(error){
$('#uploadprogressbar').fadeOut();
alert(error);
});
break;
}
var li=$(this).parent();