L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-33513: Make files->source field consistent

Browse Source
This commit is contained in:
Dongsheng Cai
2012-06-10 17:47:00 +10:00
parent fcbf68fd05
commit 8a288971e2
12 changed files with 150 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filelib.php
+1 -1
View File
@@ -770,6 +770,7 @@ function file_save_draft_area_files($draftitemid, $contextid, $component, $filea
$newhashes = array();
foreach ($draftfiles as $file) {
$newhash = $fs->get_pathname_hash($contextid, $component, $filearea, $itemid, $file->get_filepath(), $file->get_filename());
file_restore_source_field_from_draft_file($file);
$newhashes[$newhash] = $file;
}
$filecount = 0;
@@ -790,7 +791,6 @@ function file_save_draft_area_files($draftitemid, $contextid, $component, $filea
continue;
}
file_restore_source_field_from_draft_file($newfile);
// Replaced file content
if ($oldfile->get_contenthash() != $newfile->get_contenthash()) {
$oldfile->replace_content_with($newfile);
repository/boxnet/lib.php
+10
View File
@@ -293,6 +293,16 @@ class repository_boxnet extends repository {
return $this->get_name() . ': ' . $reference;
}
/**
* Return the source information
*
* @param stdClass $url
* @return string|null
*/
public function get_file_source_info($url) {
return $url;
}
/**
* Repository method to serve file
*
repository/dropbox/lib.php
+10
View File
@@ -414,6 +414,16 @@ class repository_dropbox extends repository {
return $this->get_name() . ': ' . $ref->path;
}
/**
* Return the source information
*
* @param stdClass $filepath
* @return string|null
*/
public function get_file_source_info($filepath) {
return 'Dropbox:' . $filepath;
}
/**
* Repository method to serve file
*
repository/filesystem/lib.php
+10
View File
@@ -152,6 +152,16 @@ class repository_filesystem extends repository {
return array('path'=>$file, 'url'=>'');
}
/**
* Return the source information
*
* @param stdClass $filepath
* @return string|null
*/
public function get_file_source_info($filepath) {
return $filepath;
}
public function logout() {
return true;
}
repository/flickr/lib.php
+24 -15
View File
@@ -222,9 +222,13 @@ class repository_flickr extends repository {
return $this->search('', $page);
}
public function get_link($photo_id) {
global $CFG;
$result = $this->flickr->photos_getSizes($photo_id);
/**
* Return photo url by given photo id
* @param string $photoid
* @return string
*/
private function build_photo_url($photoid) {
$result = $this->flickr->photos_getSizes($photoid);
$url = '';
if(!empty($result[4])) {
$url = $result[4]['source'];
@@ -236,23 +240,18 @@ class repository_flickr extends repository {
return $url;
}
public function get_link($photoid) {
return $this->build_photo_url($photoid);
}
/**
*
* @param string $photo_id
* @param string $photoid
* @param string $file
* @return string
*/
public function get_file($photo_id, $file = '') {
global $CFG;
$result = $this->flickr->photos_getSizes($photo_id);
$url = '';
if(!empty($result[4])) {
$url = $result[4]['source'];
} elseif(!empty($result[3])) {
$url = $result[3]['source'];
} elseif(!empty($result[2])) {
$url = $result[2]['source'];
}
public function get_file($photoid, $file = '') {
$url = $this->build_photo_url($photoid);
$path = $this->prepare_file($file);
$fp = fopen($path, 'w');
$c = new curl;
@@ -315,4 +314,14 @@ class repository_flickr extends repository {
public function supported_returntypes() {
return (FILE_INTERNAL | FILE_EXTERNAL);
}
/**
* Return the source information
*
* @param stdClass $url
* @return string|null
*/
public function get_file_source_info($photoid) {
return $this->build_photo_url($photoid);
}
}
repository/flickr_public/lib.php
+25 -7
View File
@@ -396,9 +396,13 @@ class repository_flickr_public extends repository {
return $str;
}
public function get_link($photo_id) {
global $CFG;
$result = $this->flickr->photos_getSizes($photo_id);
/**
* Return photo url by given photo id
* @param string $photoid
* @return string
*/
private function build_photo_url($photoid) {
$result = $this->flickr->photos_getSizes($photoid);
$url = '';
if(!empty($result[4])) {
$url = $result[4]['source'];
@@ -410,23 +414,27 @@ class repository_flickr_public extends repository {
return $url;
}
public function get_link($photoid) {
return $this->build_photo_id($photoid);
}
/**
*
* @global object $CFG
* @param string $photo_id
* @param string $photoid
* @param string $file
* @return string
*/
public function get_file($photo_id, $file = '') {
public function get_file($photoid, $file = '') {
global $CFG;
$info = $this->flickr->photos_getInfo($photo_id);
$info = $this->flickr->photos_getInfo($photoid);
if ($info['owner']['realname']) {
$author = $info['owner']['realname'];
} else {
$author = $info['owner']['username'];
}
$copyright = get_string('author', 'repository') . ': ' . $author;
$result = $this->flickr->photos_getSizes($photo_id);
$result = $this->flickr->photos_getSizes($photoid);
// download link
$source = '';
// flickr photo page
@@ -517,4 +525,14 @@ class repository_flickr_public extends repository {
public function supported_returntypes() {
return (FILE_INTERNAL | FILE_EXTERNAL);
}
/**
* Return the source information
*
* @param stdClass $url
* @return string|null
*/
public function get_file_source_info($photoid) {
return $this->build_photo_url($photoid);
}
}
repository/lib.php
+29
View File
@@ -1133,6 +1133,16 @@ abstract class repository {
return null;
}
/**
* Return the source information
*
* @param stdClass $url
* @return string|null
*/
public function get_file_source_info($url) {
return $url;
}
/**
* Move file from download folder to file pool using FILE API
*
@@ -2190,6 +2200,25 @@ abstract class repository {
return true;
}
/**
* Build draft file's source field
*
* {@link file_restore_source_field_from_draft_file()}
* XXX: This is a hack for file manager (MDL-28666)
* For newly created draft files we have to construct
* source filed in php serialized data format.
* File manager needs to know the original file information before copying
* to draft area, so we append these information in mdl_files.source field
*
* @param string $sourcefield
* @param string
*/
public static function build_source_field($source) {
$sourcefield = new stdClass;
$sourcefield->source = $source;
return serialize($sourcefield);
}
}
/**
repository/repository_ajax.php
+8 -8
View File
@@ -255,6 +255,11 @@ switch ($action) {
$event['existingfile']->filename = $saveas_filename;
$event['existingfile']->url = moodle_url::make_draftfile_url($itemid, $saveas_path, $saveas_filename)->out();;
} else {
// {@link repository::build_source_field()}
$sourcefield = $repo->get_file_source_info($source);
$record->source = $repo::build_source_field($sourcefield);
$storedfile = $fs->create_file_from_reference($record, $repo_id, $reference);
$event = array(
'url'=>moodle_url::make_draftfile_url($storedfile->get_itemid(), $storedfile->get_filepath(), $storedfile->get_filename())->out(),
@@ -292,14 +297,9 @@ switch ($action) {
throw new file_exception('maxbytes');
}
// {@link file_restore_source_field_from_draft_file()}
$sourcefield = '';
if (!empty($downloadedfile['url'])) {
$source = new stdClass;
$source->source = $downloadedfile['url'];
$sourcefield = serialize($source);
}
$record->source = $sourcefield;
// {@link repository::build_source_field()}
$sourcefield = $repo->get_file_source_info($source);
$record->source = $repo::build_source_field($sourcefield);
$info = repository::move_to_filepool($downloadedfile['path'], $record);
if (empty($info)) {
repository/s3/lib.php
+10
View File
@@ -119,6 +119,16 @@ class repository_s3 extends repository {
return array('path'=>$path);
}
/**
* Return the source information
*
* @param stdClass $url
* @return string|null
*/
public function get_file_source_info($filepath) {
return 's3:' . $filepath;
}
/**
* S3 doesn't require login
*
repository/upload/lib.php
+3 -1
View File
@@ -143,6 +143,9 @@ class repository_upload extends repository {
self::antivir_scan_file($_FILES[$elname]['tmp_name'], $_FILES[$elname]['name'], true);
@chmod($_FILES[$elname]['tmp_name'], $permissions);
// {@link repository::build_source_field()}
$record->source = self::build_source_field($_FILES[$elname]['name']);
if (empty($saveas_filename)) {
$record->filename = clean_param($_FILES[$elname]['name'], PARAM_FILE);
} else {
@@ -186,7 +189,6 @@ class repository_upload extends repository {
}
$record->contextid = $context->id;
$record->userid = $USER->id;
$record->source = '';
if (repository::draftfile_exists($record->itemid, $record->filepath, $record->filename)) {
$existingfilename = $record->filename;
repository/url/lib.php
+10
View File
@@ -217,5 +217,15 @@ EOD;
public function supported_returntypes() {
return (FILE_INTERNAL | FILE_EXTERNAL);
}
/**
* Return the source information
*
* @param stdClass $url
* @return string|null
*/
public function get_file_source_info($url) {
return $url;
}
}
repository/wikimedia/lib.php
+10
View File
@@ -127,4 +127,14 @@ EOD;
public function supported_returntypes() {
return (FILE_INTERNAL | FILE_EXTERNAL);
}
/**
* Return the source information
*
* @param stdClass $url
* @return string|null
*/
public function get_file_source_info($url) {
return $url;
}
}