lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 12:03:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#18832: Overwrite files when unzipping a media folder

Browse Source 
Work Item: 18832

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-09-19 17:20:58 -07:00
parent acdd97a35d
commit e33eb89e80
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
View File

@@ -310,8 +310,20 @@ namespace Orchard.Media.Services {
// skip disallowed files // skip disallowed files
if (FileAllowed(entry.FileName, false)) { if (FileAllowed(entry.FileName, false)) {
string fullFileName = _storageProvider.Combine(targetFolder, entry.FileName); string fullFileName = _storageProvider.Combine(targetFolder, entry.FileName);
using (var stream = entry.OpenReader()) { using (var stream = entry.OpenReader()) {
_storageProvider.TrySaveStream(fullFileName, stream); // the call will return false if the file already exists
if (!_storageProvider.TrySaveStream(fullFileName, stream)) {
// try to delete the file and save again
try {
_storageProvider.DeleteFile(fullFileName);
_storageProvider.TrySaveStream(fullFileName, stream);
}
catch (ArgumentException) {
// ignore the exception as the file doesn't exist
}
}
} }
} }
} }