Removed System.Web dependency by creating our own cache. This fixes the problem that Greenshot doesn't work if a .NET Client Profile is installed.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1810 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4

Greenshot/Helpers/ImageOutput.cs

@@ -40,7 +40,7 @@ namespace Greenshot.Helpers {
 		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ImageOutput));
 		private static CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>();
 		private static readonly int PROPERTY_TAG_SOFTWARE_USED = 0x0131;
-		private static CacheHelper<string> tmpFileCache = new CacheHelper<string>("tmpfile", 60*60*10, new CacheObjectExpired(RemoveExpiredTmpFile));
+		private static Cache<string, string> tmpFileCache = new Cache<string, string>(10*60*60, new Cache<string, string>.CacheObjectExpired(RemoveExpiredTmpFile));
 		
 		/// <summary>
 		/// Creates a PropertyItem (Metadata) to store with the image.
@@ -314,11 +314,12 @@ namespace Greenshot.Helpers {
 		/// Cleanup all created tmpfiles
 		/// </summary>	
 		public static void RemoveTmpFiles() {
-			foreach(string tmpFile in tmpFileCache.GetElements()) {
+			foreach(string tmpFile in tmpFileCache.Elements) {
 				if (File.Exists(tmpFile)) {
 					LOG.DebugFormat("Removing old temp file {0}", tmpFile);
 					File.Delete(tmpFile);
 				}
+				tmpFileCache.Remove(tmpFile);
 			}
 		}
 		

GreenshotConfluencePlugin/Confluence.cs

@@ -102,7 +102,7 @@ namespace Confluence {
 		private ConfluenceSoapServiceService confluence;
 		private int timeout;
 		private string url;
-		private CacheHelper<RemotePage> pageCache = new CacheHelper<RemotePage>("confluencepage", 60*config.Timeout);
+		private Cache<string, RemotePage> pageCache = new Cache<string, RemotePage>(60 * config.Timeout);
 
 		public ConfluenceConnector(string url, int timeout) {
 			this.url = url;
@@ -210,8 +210,8 @@ namespace Confluence {
 		public Page getPage(string spaceKey, string pageTitle) {
 			RemotePage page = null;
 			string cacheKey = spaceKey + pageTitle;
-			if (pageCache.Exists(cacheKey)) {
+			if (pageCache.Contains(cacheKey)) {
-				page = pageCache.Get(cacheKey);
+				page = pageCache[cacheKey];
 			}
 			if (page == null) {
 				checkCredentials();
@@ -225,8 +225,8 @@ namespace Confluence {
 			RemotePage page = null;
 			string cacheKey = "" + pageId;
 			
-			if (pageCache.Exists(cacheKey)) {
+			if (pageCache.Contains(cacheKey)) {
-				page = pageCache.Get(cacheKey);
+				page = pageCache[cacheKey];
 			}
 			if (page == null) {
 				checkCredentials();

GreenshotJiraPlugin/Jira.cs

@@ -108,8 +108,8 @@ namespace Jira {
 		private JiraSoapServiceService jira;
 		private int timeout;
 		private string url;
-		private CacheHelper<JiraIssue> jiraCache = new CacheHelper<JiraIssue>("jiraissue", 60*config.Timeout);
+		private Cache<string, JiraIssue> jiraCache = new Cache<string, JiraIssue>(60 * config.Timeout);
-		private CacheHelper<RemoteUser> userCache = new CacheHelper<RemoteUser>("jirauser", 60*config.Timeout);
+		private Cache<string, RemoteUser> userCache = new Cache<string, RemoteUser>(60 * config.Timeout);
 
 		public JiraConnector() : this(false) {
 		}
@@ -246,8 +246,8 @@ namespace Jira {
 
 		public JiraIssue getIssue(string key) {
 			JiraIssue jiraIssue = null;
-			if (jiraCache.Exists(key)) {
+			if (jiraCache.Contains(key)) {
-				jiraIssue = jiraCache.Get(key);
+				jiraIssue = jiraCache[key];
 			}
 			if (jiraIssue == null) {
 				checkCredentials();
@@ -331,8 +331,8 @@ namespace Jira {
 		private string getUserFullName(string user) {
 			string fullname = null;
 			if (user != null) {
-				if (userCache.Exists(user)) {
+				if (userCache.Contains(user)) {
-					fullname = userCache.Get(user).fullname;
+					fullname = userCache[user].fullname;
 				} else {
 					checkCredentials();
 					RemoteUser remoteUser = jira.getUser(credentials, user);

GreenshotPlugin/Core/Cache.cs

@@ -0,0 +1,196 @@
+/*
+ * Greenshot - a free and open source screenshot tool
+ * Copyright (C) 2007-2012  Thomas Braun, Jens Klingen, Robin Krom
+ * 
+ * For more information see: http://getgreenshot.org/
+ * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 1 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+using System;
+using System.Collections.Generic;
+using System.Timers;
+
+namespace GreenshotPlugin.Core {
+	/// <summary>
+	/// Cache class 
+	/// </summary>
+	/// <typeparam name="TK">Type of key</typeparam>
+	/// <typeparam name="TV">Type of value</typeparam>
+	public class Cache<TK, TV> {
+		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger("Cache");
+		private IDictionary<TK, TV> internalCache = new Dictionary<TK, TV>();
+		private object lockObject = new object();
+		private int secondsToExpire = 10;
+		private CacheObjectExpired expiredCallback = null;
+		public delegate void CacheObjectExpired(TK key, TV cacheValue);
+
+		/// <summary>
+		/// Initialize the cache
+		/// </summary>
+		public Cache() {
+		}
+		/// <summary>
+		/// Initialize the cache
+		/// </summary>
+		/// <param name="expiredCallback"></param>
+		public Cache(CacheObjectExpired expiredCallback) : this() {
+			this.expiredCallback = expiredCallback;
+		}
+
+		/// <summary>
+		/// Initialize the cache with a expire setting
+		/// </summary>
+		/// <param name="secondsToExpire"></param>
+		public Cache(int secondsToExpire) : this() {
+			this.secondsToExpire = secondsToExpire;
+		}
+
+		/// <summary>
+		/// Initialize the cache with a expire setting
+		/// </summary>
+		/// <param name="secondsToExpire"></param>
+		/// <param name="expiredCallback"></param>
+		public Cache(int secondsToExpire, CacheObjectExpired expiredCallback) : this(expiredCallback) {
+			this.secondsToExpire = secondsToExpire;
+		}
+
+		/// <summary>
+		/// Enumerable for the values in the cache
+		/// </summary>
+		public IEnumerable<TV> Elements {
+			get {
+				List<TV> elements = new List<TV>();
+
+				foreach (TV element in internalCache.Values) {
+					elements.Add(element);
+				}
+				foreach (TV element in elements) {
+					yield return element;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Get the value by key from the cache
+		/// </summary>
+		/// <param name="key"></param>
+		/// <returns></returns>
+		public TV this[TK key] {
+			get {
+				TV result = default(TV);
+				lock (lockObject) {
+					if (internalCache.ContainsKey(key)) {
+						result = internalCache[key];
+					}
+				}
+				return result;
+			}
+		}
+
+		/// <summary>
+		/// Contains
+		/// </summary>
+		/// <param name="key"></param>
+		/// <returns>true if the cache contains the key</returns>
+		public bool Contains(TK key) {
+			return internalCache.ContainsKey(key);
+		}
+
+		/// <summary>
+		/// Add a value to the cache
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="value"></param>
+		public void Add(TK key, TV value) {
+			lock (lockObject) {
+				var cachedItem = new CachedItem(key, value, secondsToExpire);
+				cachedItem.Expired += delegate(TK cacheKey, TV cacheValue) {
+					if (internalCache.ContainsKey(cacheKey)) {
+						LOG.DebugFormat("Expiring object with Key: {0}", cacheKey);
+						if (expiredCallback != null) {
+							expiredCallback(cacheKey, cacheValue);
+						}
+						Remove(cacheKey);
+					} else {
+						LOG.DebugFormat("Expired old object with Key: {0}", cacheKey);
+					}
+				};
+
+				if (internalCache.ContainsKey(key)) {
+					internalCache[key] = value;
+					LOG.DebugFormat("Updated item with Key: {0}", key);
+				} else {
+					internalCache.Add(key, cachedItem);
+					LOG.DebugFormat("Added item with Key: {0}", key);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Remove item from cache
+		/// </summary>
+		/// <param name="key"></param>
+		public void Remove(TK key) {
+			lock (lockObject) {
+				if (!internalCache.ContainsKey(key)) {
+					throw new ApplicationException(String.Format("An object with key ‘{0}’ does not exists in cache", key));
+				}
+				internalCache.Remove(key);
+				LOG.DebugFormat("Removed item with Key: {0}", key);
+			}
+		}
+
+		/// <summary>
+		/// A cache item
+		/// </summary>
+		private class CachedItem {
+			public event CacheObjectExpired Expired;
+			private int secondsToExpire;
+			private readonly Timer _timerEvent;
+
+			public CachedItem(TK key, TV item, int secondsToExpire) {
+				if (key == null) {
+					throw new ArgumentNullException("key is not valid");
+				}
+				Key = key;
+				Item = item;
+				this.secondsToExpire = secondsToExpire;
+				if (secondsToExpire > 0) {
+					_timerEvent = new Timer(secondsToExpire * 1000) { AutoReset = false };
+					_timerEvent.Elapsed += timerEvent_Elapsed;
+					_timerEvent.Start();
+				}
+			}
+
+			private void ExpireNow() {
+				_timerEvent.Stop();
+				if (secondsToExpire > 0 && Expired != null) {
+					Expired(Key, Item);
+				}
+			}
+
+			private void timerEvent_Elapsed(object sender, ElapsedEventArgs e) {
+				ExpireNow();
+			}
+
+			public TK Key { get; private set; }
+			public TV Item { get; private set; }
+
+			public static implicit operator TV(CachedItem a) {
+				return a.Item;
+			}
+		}
+	}
+}

GreenshotPlugin/Core/CacheHelper.cs

@@ -1,145 +0,0 @@
-/*
- * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2012  Thomas Braun, Jens Klingen, Robin Krom
- * 
- * For more information see: http://getgreenshot.org/
- * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 1 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.Caching;
-
-namespace GreenshotPlugin.Core {
-	public delegate void CacheObjectExpired(string key, object cacheValue);
-
-	/// <summary>
-	/// Description of CacheHelper.
-	/// </summary>
-	public class CacheHelper<T> {
-		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger("CacheHelper");
-		private Cache cache = HttpRuntime.Cache;
-		private string prefix;
-		private double defaultExpiration = 10*60;	// 10 Minutes
-		private CacheItemRemovedCallback defaultCallback = null;
-		private CacheObjectExpired expiredCallback = null;
-		
-		public CacheHelper(string prefix) {
-			defaultCallback = new CacheItemRemovedCallback(OnRemoved);
-			this.prefix = prefix + ".";
-		}
-
-		public CacheHelper(string prefix, double defaultExpiration) : this(prefix) {
-			this.defaultExpiration = defaultExpiration;
-		}
-
-		public CacheHelper(string prefix, double defaultExpiration, CacheObjectExpired expiredCallback) : this(prefix, defaultExpiration) {
-			this.expiredCallback = expiredCallback;
-		}
-		
-		private void OnRemoved(string key, object cacheValue, CacheItemRemovedReason reason) {
-			LOG.DebugFormat("The item with key '{0}' is being removed from the cache with reason: {1}", key, reason);
-			switch (reason) {
-				case CacheItemRemovedReason.Expired:
-					if (expiredCallback != null) {
-						expiredCallback.Invoke(key, cacheValue);
-					}
-					break;
-				case CacheItemRemovedReason.Underused:
-					break;
-			}
-		}
-
-		/// <summary>
-		/// Insert value into the cache using default expiration & default callback
-		/// </summary>
-		/// <param name="o">Item to be cached</param>
-		/// <param name="key">Name of item</param>
-		public void Add(string key, T o) {
-			if (defaultCallback != null) {
-				cache.Insert(prefix + key, o, null, DateTime.Now.AddSeconds(defaultExpiration), Cache.NoSlidingExpiration, CacheItemPriority.Default, defaultCallback);
-			} else {
-				cache.Insert(prefix + key, o, null, DateTime.Now.AddSeconds(defaultExpiration), Cache.NoSlidingExpiration);
-				
-			}
-		}
-		
-		/// <summary>
-		/// Get all the methods for this cache
-		/// </summary>
-		/// <returns>IEnumerator of the type</returns>
-		public IEnumerable<T> GetElements() {
-			IDictionaryEnumerator cacheEnum = cache.GetEnumerator();
-			while (cacheEnum.MoveNext()) {
-				string key = cacheEnum.Key as string;
-				if (!string.IsNullOrEmpty(key) && key.StartsWith(prefix)) {
-					yield return (T)cacheEnum.Value;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Insert value into the cache using the supplied expiration time in seconds
-		/// </summary>
-		/// <param name="o">Item to be cached</param>
-		/// <param name="key">Name of item</param>
-		/// <param name="seconds">expiration time in "double" seconds</param>
-		public void Add(string key, T o, double seconds) {
-			cache.Insert(prefix + key, o, null, DateTime.Now.AddSeconds(seconds), Cache.NoSlidingExpiration);
-		}
-
-		/// <summary>
-		/// Insert value into the cache using
-		/// appropriate name/value pairs
-		/// </summary>
-		/// <param name="o">Item to be cached</param>
-		/// <param name="key">Name of item</param>
-		public void Add(string key, T o, CacheItemRemovedCallback callback) {
-			cache.Insert(prefix + key, o, null, DateTime.Now.AddSeconds(defaultExpiration), Cache.NoSlidingExpiration, CacheItemPriority.Default, callback);
-		}
-
-		/// <summary>
-		/// Remove item from cache
-		/// </summary>
-		/// <param name="key">Name of cached item</param>
-		public void Remove(string key) {
-			cache.Remove(prefix + key);
-		}
-
-		/// <summary>
-		/// Check for item in cache
-		/// </summary>
-		/// <param name="key">Name of cached item</param>
-		/// <returns></returns>
-		public bool Exists(string key) {
-			return cache[prefix + key] != null;
-		}
-
-		/// <summary>
-		/// Retrieve cached item
-		/// </summary>
-		/// <param name="key">Name of cached item</param>
-		/// <returns>Cached item as type</returns>
-		public T Get(string key) {
-			try {
-				return (T) cache[prefix + key];
-			} catch {
-				return default(T);
-			}
-		}
-	}
-}

GreenshotPlugin/GreenshotPlugin.csproj

@@ -50,7 +50,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -218,7 +217,7 @@
     <Compile Include="Core\AbstractProcessor.cs" />
     <Compile Include="Core\AccessibleHelper.cs" />
     <Compile Include="Core\BitmapBuffer.cs" />
-    <Compile Include="Core\CacheHelper.cs" />
+    <Compile Include="Core\Cache.cs" />
     <Compile Include="Core\CoreConfiguration.cs" />
     <Compile Include="Core\CredentialsHelper.cs" />
     <Compile Include="Core\EncryptionHelper.cs" />