ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

* minor: change misleading 'all assets found' message to instead tell how many were actually located

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-07-21 17:13:32 +00:00
parent 6784cebf57
commit a13a4c6144
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
View File

@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// <summary>
/// Method called when all the necessary assets for an archive request have been received.
/// </summary>
public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets);
public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assetsFound, ICollection<LLUUID> assetsNotFoundUuids);
/// <summary>
/// Execute the write of an archive once we have received all the necessary data
@@ -73,9 +73,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
m_savePath = savePath;
}
protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets)
protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assetsFound, ICollection<LLUUID> assetsNotFoundUuids)
{
m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count);
foreach (LLUUID uuid in assetsNotFoundUuids)
{
m_log.DebugFormat("[ARCHIVER]: Could not find asset {0}", uuid);
}
m_log.InfoFormat(
"[ARCHIVER]: Received {0} of {1} assets requested", assetsFound.Count, assetsFound.Count + assetsNotFoundUuids.Count);
TarArchiveWriter archive = new TarArchiveWriter();
@@ -108,7 +114,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
}
// Write out assets
AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
AssetsArchiver assetsArchiver = new AssetsArchiver(assetsFound);
assetsArchiver.Archive(archive);
archive.WriteTar(new GZipStream(new FileStream(m_savePath, FileMode.Create), CompressionMode.Compress));