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

MDL-16596 file listing methods now return arrays index with pathnamehash (useful when looking for existing files); create from stored file now supports directories too - very useful when moving files between areas

Browse Source
This commit is contained in:
skodak
2008-09-21 10:35:39 +00:00
parent 6ed19c7464
commit cd5be217db
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/file/file_storage.php
+20 -8
View File
@@ -136,7 +136,7 @@ class file_storage {
* @param int $itemid (all files if not specified)
* @param string $sort
* @param bool $includedirs
* @return array of stored_files
* @return array of stored_files indexed by pathanmehash
*/
public function get_area_files($contextid, $filearea, $itemid=false, $sort="itemid, filepath, filename", $includedirs=true) {
global $DB;
@@ -152,7 +152,7 @@ class file_storage {
if (!$includedirs and $file_record->filename === '.') {
continue;
}
$result[] = new stored_file($this, $file_record);
$result[$file_record->pathnamehash] = new stored_file($this, $file_record);
}
return $result;
}
@@ -166,7 +166,7 @@ class file_storage {
* @param bool $recursive include all subdirectories
* @param bool $includedirs include files and directories
* @param string $sort
* @return array of stored_files
* @return array of stored_files indexed by pathanmehash
*/
public function get_directory_files($contextid, $filearea, $itemid, $filepath, $recursive=false, $includedirs=true, $sort="filepath, filename") {
global $DB;
@@ -194,9 +194,9 @@ class file_storage {
$file_records = $DB->get_records_sql($sql, $params);
foreach ($file_records as $file_record) {
if ($file_record->filename == '.') {
$dirs[] = new stored_file($this, $file_record);
$dirs[$file_record->pathnamehash] = new stored_file($this, $file_record);
} else {
$files[] = new stored_file($this, $file_record);
$files[$file_record->pathnamehash] = new stored_file($this, $file_record);
}
}
$result = array_merge($dirs, $files);
@@ -221,7 +221,7 @@ class file_storage {
if (substr_count($file_record->filepath, '/') !== $reqlevel) {
continue;
}
$result[] = new stored_file($this, $file_record);
$result[$file_record->pathnamehash] = new stored_file($this, $file_record);
}
}
@@ -233,7 +233,7 @@ class file_storage {
$file_records = $DB->get_records_sql($sql, $params);
foreach ($file_records as $file_record) {
$result[] = new stored_file($this, $file_record);
$result[$file_record->pathnamehash] = new stored_file($this, $file_record);
}
}
@@ -414,6 +414,18 @@ class file_storage {
$newrecord->pathnamehash = $this->get_pathname_hash($newrecord->contextid, $newrecord->filearea, $newrecord->itemid, $newrecord->filepath, $newrecord->filename);
if ($newrecord->filename === '.') {
// special case - only this function supports directories ;-)
$directory = $this->create_directory($newrecord->contextid, $newrecord->filearea, $newrecord->itemid, $newrecord->filepath, $newrecord->userid);
// update the existing directory with the new data
$newrecord->id = $directory->get_id();
if (!$DB->update_record('files', $newrecord)) {
throw new stored_file_creation_exception($newrecord->contextid, $newrecord->filearea, $newrecord->itemid,
$newrecord->filepath, $newrecord->filename);
}
return new stored_file($this, $newrecord);
}
try {
$newrecord->id = $DB->insert_record('files', $newrecord);
} catch (database_exception $e) {
@@ -422,7 +434,7 @@ class file_storage {
if (!$newrecord->id) {
throw new stored_file_creation_exception($newrecord->contextid, $newrecord->filearea, $newrecord->itemid,
$newrecord->filepath, $newrecord->filename);
$newrecord->filepath, $newrecord->filename);
}
$this->create_directory($newrecord->contextid, $newrecord->filearea, $newrecord->itemid, $newrecord->filepath, $newrecord->userid);