Added ability to exclude inventory items or folders when saving IAR files.

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs

@@ -146,6 +146,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         protected void SaveInvItem(InventoryItemBase inventoryItem, string path, Dictionary<string, object> options, IUserAccountService userAccountService)
         {
+            if (options.ContainsKey("exclude"))
+            {
+                if (((List<String>)options["exclude"]).Contains(inventoryItem.Name) ||
+                    ((List<String>)options["exclude"]).Contains(inventoryItem.ID.ToString()))
+                {
+                    if (options.ContainsKey("verbose"))
+                    {
+                        m_log.InfoFormat(
+                            "[INVENTORY ARCHIVER]: Skipping inventory item {0} {1} at {2}",
+                            inventoryItem.Name, inventoryItem.ID, path);
+                    }
+                    return;
+                }
+            }
+
             if (options.ContainsKey("verbose"))
                 m_log.InfoFormat(
                     "[INVENTORY ARCHIVER]: Saving item {0} {1} with asset {2}",
@@ -178,6 +193,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             InventoryFolderBase inventoryFolder, string path, bool saveThisFolderItself,
             Dictionary<string, object> options, IUserAccountService userAccountService)
         {
+            if (options.ContainsKey("excludefolders"))
+            {
+                if (((List<String>)options["excludefolders"]).Contains(inventoryFolder.Name) ||
+                    ((List<String>)options["excludefolders"]).Contains(inventoryFolder.ID.ToString()))
+                {
+                    if (options.ContainsKey("verbose"))
+                    {
+                        m_log.InfoFormat(
+                            "[INVENTORY ARCHIVER]: Skipping folder {0} at {1}",
+                            inventoryFolder.Name, path);
+                    }
+                    return;
+                }
+            }
+
             if (options.ContainsKey("verbose"))
                 m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving folder {0}", inventoryFolder.Name);
 

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs

@@ -122,13 +122,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                 scene.AddCommand(
                     this, "save iar",
-                    "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-v|--verbose]",
+                    "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-e|--exclude=<name/uuid>] [-f|--excludefolder=<foldername/uuid>] [-v|--verbose]",
                     "Save user inventory archive (IAR).",
                     "<first> is the user's first name." + Environment.NewLine
                     + "<last> is the user's last name." + Environment.NewLine
                     + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine
                     + "-h|--home=<url> adds the url of the profile service to the saved user information." + Environment.NewLine
                     + "-c|--creators preserves information about foreign creators." + Environment.NewLine
+                    + "-e|--exclude=<name/uuid> don't save the inventory item in archive" + Environment.NewLine
+                    + "-f|--excludefolder=<folder/uuid> don't save contents of the folder in archive" + Environment.NewLine
                     + "-v|--verbose extra debug messages." + Environment.NewLine
                     + "--noassets stops assets being saved to the IAR."
                     + "<IAR path> is the filesystem path at which to save the IAR."
@@ -400,6 +402,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; });
             ops.Add("c|creators", delegate(string v) { options["creators"] = v; });
             ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; });
+            ops.Add("e|exclude=", delegate(string v)
+                {
+                    if (!options.ContainsKey("exclude"))
+                        options["exclude"] = new List<String>();
+                    ((List<String>)options["exclude"]).Add(v);
+                });
+            ops.Add("f|excludefolder=", delegate(string v)
+                {
+                    if (!options.ContainsKey("excludefolders"))
+                        options["excludefolders"] = new List<String>();
+                    ((List<String>)options["excludefolders"]).Add(v);
+                });
 
             List<string> mainParams = ops.Parse(cmdparams);
 
@@ -408,7 +422,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (mainParams.Count < 6)
                 {
                     m_log.Error(
-                        "[INVENTORY ARCHIVER]: usage is save iar [-h|--home=<url>] [--noassets] <first name> <last name> <inventory path> <user password> [<save file path>] [-c|--creators] [-v|--verbose]");
+                        "[INVENTORY ARCHIVER]: save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-e|--exclude=<name/uuid>] [-f|--excludefolder=<foldername/uuid>] [-v|--verbose]");
                     return;
                 }