Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono-addins.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs4
-rw-r--r--Mono.Addins/Mono.Addins/Addin.cs14
-rwxr-xr-xMono.Addins/Mono.Addins/AddinEngine.cs61
-rw-r--r--Mono.Addins/Mono.Addins/AddinManager.cs8
-rw-r--r--Test/UnitTests/TestScanDataFileGeneration.cs27
-rw-r--r--Test/test-files/ScanDataFilesTest/Addins/SimpleAddin2.addin.xml2
-rw-r--r--Test/test-files/ScanDataFilesTest/App/SimpleApp.addin.xml4
7 files changed, 104 insertions, 16 deletions
diff --git a/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs b/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs
index bb015d7..ce5f6ae 100644
--- a/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs
+++ b/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs
@@ -192,6 +192,10 @@ namespace Mono.Addins.Database
return reflector;
}
+ /// <summary>
+ /// Deletes a file
+ /// </summary>
+ /// <param name="filePath">File path.</param>
public virtual void DeleteFile (string filePath)
{
File.Delete (filePath);
diff --git a/Mono.Addins/Mono.Addins/Addin.cs b/Mono.Addins/Mono.Addins/Addin.cs
index 8f7cc17..47f9917 100644
--- a/Mono.Addins/Mono.Addins/Addin.cs
+++ b/Mono.Addins/Mono.Addins/Addin.cs
@@ -270,9 +270,17 @@ namespace Mono.Addins
internal void ResetCachedData ()
{
- // The domain may have changed
- if (sourceFile != null)
- domain = database.GetFolderDomain (null, Path.GetDirectoryName (sourceFile));
+ // The domain may have changed (?!)
+
+ // This check has been commented out because GetFolderDomain will fail if sourceFile changed
+ // or if there is no folder info for the add-in (it may happen when using pre-generated add-in
+ // scan data files).
+ // A domain change at run-time is an unlikely scenario and not properly supported anyway in
+ // other parts of the code. In general, changes in an already loaded add-in are not supported.
+
+// if (sourceFile != null)
+// domain = database.GetFolderDomain (null, Path.GetDirectoryName (sourceFile));
+
desc = null;
addin = null;
}
diff --git a/Mono.Addins/Mono.Addins/AddinEngine.cs b/Mono.Addins/Mono.Addins/AddinEngine.cs
index d027aec..25bd3be 100755
--- a/Mono.Addins/Mono.Addins/AddinEngine.cs
+++ b/Mono.Addins/Mono.Addins/AddinEngine.cs
@@ -105,7 +105,7 @@ namespace Mono.Addins
Assembly asm = Assembly.GetEntryAssembly ();
if (asm == null) asm = Assembly.GetCallingAssembly ();
- Initialize (asm, configDir, null, null);
+ Initialize (asm, null, configDir, null, null);
}
/// <summary>
@@ -137,7 +137,7 @@ namespace Mono.Addins
Assembly asm = Assembly.GetEntryAssembly ();
if (asm == null) asm = Assembly.GetCallingAssembly ();
- Initialize (asm, configDir, addinsDir, null);
+ Initialize (asm, null, configDir, addinsDir, null);
}
/// <summary>
@@ -174,19 +174,64 @@ namespace Mono.Addins
Assembly asm = Assembly.GetEntryAssembly ();
if (asm == null) asm = Assembly.GetCallingAssembly ();
- Initialize (asm, configDir, addinsDir, databaseDir);
+ Initialize (asm, null, configDir, addinsDir, databaseDir);
}
- internal void Initialize (Assembly startupAsm, string configDir, string addinsDir, string databaseDir)
+ /// <summary>
+ /// Initializes the add-in engine.
+ /// </summary>
+ /// <param name='configDir'>
+ /// Location of the add-in registry.
+ /// </param>
+ /// <param name='addinsDir'>
+ /// Add-ins directory. If the path is relative, it is considered to be relative
+ /// to the configDir directory.
+ /// </param>
+ /// <param name='databaseDir'>
+ /// Location of the add-in database. If the path is relative, it is considered to be relative
+ /// to the configDir directory.
+ /// </param>
+ /// <param name='startupDirectory'>
+ /// Statup directory. This is the directory where add-in scans will start.
+ /// </param>
+ /// <remarks>
+ /// The add-in engine needs to be initialized before doing any add-in operation.
+ /// Configuration information about the add-in registry will be stored in the
+ /// provided location. The add-in engine will look for add-ins in the provided
+ /// 'addinsDir' directory. Cached information about add-ins will be stored in
+ /// the 'databaseDir' directory.
+ ///
+ /// When specifying a path, it is possible to use a special folder name as root.
+ /// For example: [Personal]/.config/MyApp. In this case, [Personal] will be replaced
+ /// by the location of the Environment.SpecialFolder.Personal folder. Any value
+ /// of the Environment.SpecialFolder enumeration can be used (always between square
+ /// brackets)
+ /// </remarks>
+ public void Initialize (string configDir, string addinsDir, string databaseDir, string startupDirectory)
+ {
+ if (initialized)
+ return;
+
+ Assembly asm = Assembly.GetEntryAssembly ();
+ if (asm == null) asm = Assembly.GetCallingAssembly ();
+ Initialize (null, startupDirectory, configDir, addinsDir, databaseDir);
+ }
+
+ internal void Initialize (Assembly startupAsm, string customStartupDirectory, string configDir, string addinsDir, string databaseDir)
{
lock (LocalLock) {
if (initialized)
return;
Initialize (this);
-
- string asmFile = new Uri (startupAsm.CodeBase).LocalPath;
- startupDirectory = System.IO.Path.GetDirectoryName (asmFile);
+
+ string asmFile = null;
+
+ if (startupAsm != null) {
+ asmFile = new Uri (startupAsm.CodeBase).LocalPath;
+ startupDirectory = System.IO.Path.GetDirectoryName (asmFile);
+ } else
+ startupDirectory = customStartupDirectory;
string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
if (customDir != null && customDir.Length > 0)
@@ -197,7 +242,7 @@ namespace Mono.Addins
else
registry = new AddinRegistry (this, configDir, startupDirectory, addinsDir, databaseDir);
- if (registry.CreateHostAddinsFile (asmFile) || registry.UnknownDomain)
+ if ((asmFile != null && registry.CreateHostAddinsFile (asmFile)) || registry.UnknownDomain)
registry.Update (new ConsoleProgressStatus (false));
initialized = true;
diff --git a/Mono.Addins/Mono.Addins/AddinManager.cs b/Mono.Addins/Mono.Addins/AddinManager.cs
index 11f3f81..6365f5a 100644
--- a/Mono.Addins/Mono.Addins/AddinManager.cs
+++ b/Mono.Addins/Mono.Addins/AddinManager.cs
@@ -59,7 +59,7 @@ namespace Mono.Addins
// Code not shared with the other Initialize since I need to get the calling assembly
Assembly asm = Assembly.GetEntryAssembly ();
if (asm == null) asm = Assembly.GetCallingAssembly ();
- AddinEngine.Initialize (asm, null, null, null);
+ AddinEngine.Initialize (asm, null, null, null, null);
}
/// <summary>
@@ -84,7 +84,7 @@ namespace Mono.Addins
{
Assembly asm = Assembly.GetEntryAssembly ();
if (asm == null) asm = Assembly.GetCallingAssembly ();
- AddinEngine.Initialize (asm, configDir, null, null);
+ AddinEngine.Initialize (asm, null, configDir, null, null);
}
/// <summary>
@@ -113,7 +113,7 @@ namespace Mono.Addins
{
Assembly asm = Assembly.GetEntryAssembly ();
if (asm == null) asm = Assembly.GetCallingAssembly ();
- AddinEngine.Initialize (asm, configDir, addinsDir, null);
+ AddinEngine.Initialize (asm, null, configDir, addinsDir, null);
}
/// <summary>
@@ -147,7 +147,7 @@ namespace Mono.Addins
{
Assembly asm = Assembly.GetEntryAssembly ();
if (asm == null) asm = Assembly.GetCallingAssembly ();
- AddinEngine.Initialize (asm, configDir, addinsDir, databaseDir);
+ AddinEngine.Initialize (asm, null, configDir, addinsDir, databaseDir);
}
/// <summary>
diff --git a/Test/UnitTests/TestScanDataFileGeneration.cs b/Test/UnitTests/TestScanDataFileGeneration.cs
index 3802b5d..e50d72b 100644
--- a/Test/UnitTests/TestScanDataFileGeneration.cs
+++ b/Test/UnitTests/TestScanDataFileGeneration.cs
@@ -30,6 +30,7 @@ using Mono.Addins;
using Mono.Addins.Database;
using NUnit.Framework;
using System.Linq;
+using Mono.Addins.Description;
namespace UnitTests
{
@@ -206,6 +207,32 @@ namespace UnitTests
addin = registry.GetAddin ("SimpleApp.Ext5,0.1.0");
Assert.IsNotNull (addin);
}
+
+ [Test]
+ public void Rescan ()
+ {
+ var dir = Util.GetSampleDirectory ("ScanDataFilesTest");
+
+ // Generate the scan data files before initializing the engine
+ var registry = GetRegistry (dir);
+ registry.GenerateAddinScanDataFiles (new ConsoleProgressStatus (true), recursive: true);
+ registry.Dispose ();
+
+ AddinEngine engine = new AddinEngine ();
+ engine.Initialize (Path.Combine (dir, "Config"), Path.Combine (dir, "UserAddins"), null, Path.Combine (dir, "App"));
+ registry = engine.Registry;
+
+ registry.Update (new ConsoleProgressStatus (false));
+
+ engine.LoadAddin (null, "SimpleApp.Core,0.1.0");
+ engine.LoadAddin (null, "SimpleApp.Ext2,0.1.0");
+
+ File.Delete (Path.Combine (dir, "UserAddins", "SimpleAddin4.addin.xml"));
+
+ registry.Update (new ConsoleProgressStatus (false));
+
+ engine.Shutdown ();
+ }
}
class FileList: MarshalByRefObject
diff --git a/Test/test-files/ScanDataFilesTest/Addins/SimpleAddin2.addin.xml b/Test/test-files/ScanDataFilesTest/Addins/SimpleAddin2.addin.xml
index 613eb6a..8f28723 100644
--- a/Test/test-files/ScanDataFilesTest/Addins/SimpleAddin2.addin.xml
+++ b/Test/test-files/ScanDataFilesTest/Addins/SimpleAddin2.addin.xml
@@ -10,6 +10,8 @@
<Dependencies>
<Addin id="Core" version="0.1.0" />
</Dependencies>
+
+ <ExtensionPoint path = "/Ext2/SampleExtension" />
<Extension path = "/SimpleApp/SampleExtension">
<Class type="test2"/>
diff --git a/Test/test-files/ScanDataFilesTest/App/SimpleApp.addin.xml b/Test/test-files/ScanDataFilesTest/App/SimpleApp.addin.xml
index cbbf52d..9b70f30 100644
--- a/Test/test-files/ScanDataFilesTest/App/SimpleApp.addin.xml
+++ b/Test/test-files/ScanDataFilesTest/App/SimpleApp.addin.xml
@@ -4,5 +4,7 @@
isroot = "true"
version = "0.1.0">
- <ExtensionPoint path = "/SimpleApp/SampleExtension" />
+ <ExtensionPoint path = "/SimpleApp/SampleExtension">
+ <ExtensionNode name="Class" />
+ </ExtensionPoint>
</Addin>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 00:03:35 +0300