/ - Diff - Pithos MS Client - Greek Research and Technology Network's projects

             [global::System.Configuration.ApplicationScopedSettingAttribute()]
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.Configuration.DefaultSettingValueAttribute("http://pithos.dev.grnet.gr/pithos.html")]
             [global::System.Configuration.DefaultSettingValueAttribute("http://pithos.dev.grnet.gr")]
             public string PithosSite {
                 get {
                     return ((string)(this["PithosSite"]));

           <Value Profile="(Default)">False</Value>
         </Setting>
         <Setting Name="PithosSite" Type="System.String" Scope="Application">
           <Value Profile="(Default)">http://pithos.dev.grnet.gr/pithos.html</Value>
           <Value Profile="(Default)">http://pithos.dev.grnet.gr</Value>
         </Setting>
         <Setting Name="Accounts" Type="Pithos.Interfaces.AccountsCollection" Scope="User">
           <Value Profile="(Default)">

b/trunk/Pithos.Client.WPF/TaskbarViewModel.cs
169	169	}
170	170	if (!String.IsNullOrWhiteSpace(Monitor.UserName) &&
171	171	!String.IsNullOrWhiteSpace(Monitor.ApiKey))
172		Monitor.Start();
	172	try
	173	{
	174	Monitor.Start();
	175	}
	176	catch (Exception exc)
	177	{
	178	MessageBox.Show("An exception occured. Can't start monitoring");
	179	}
173	180	}
174	181	}
175	182	}

           <setting name="UseManualProxy" serializeAs="String">
             <value>False</value>
           </setting>
           <setting name="Accounts" serializeAs="Xml">
             <value>
               <ArrayOfAccountSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsd="http://www.w3.org/2001/XMLSchema">
                 <AccountSettings>
                 </AccountSettings>
               </ArrayOfAccountSettings>
             </value>
           </setting>
         </Pithos.Client.WPF.Properties.Settings>
       </userSettings>
       <connectionStrings>
-...
       <applicationSettings>
         <Pithos.Client.WPF.Properties.Settings>
           <setting name="PithosSite" serializeAs="String">
             <value>http://pithos.dev.grnet.gr/pithos.html</value>
             <value>http://pithos.dev.grnet.gr</value>
           </setting>
           <setting name="PithosAuthenticationUrl" serializeAs="String">
             <value>https://pithos.dev.grnet.gr</value>

             [System.ComponentModel.Composition.Import]
             public IPithosSettings Settings { get; set; }
             private JobQueue _statusUpdateQueue;
             private JobQueue _statusUpdateQueue=new JobQueue();
             public StatusKeeper()
+            {

     using System.Collections.Specialized;
     using System.Diagnostics;
     using System.Diagnostics.Contracts;
     using System.IO;
     using System.Net;
     using System.Runtime.Serialization;
     using System.Threading.Tasks;
     namespace Pithos.Network
+    {
-...
             protected override WebResponse GetWebResponse(WebRequest request)
+            {
                 try
+                {
                 var response = (HttpWebResponse)base.GetWebResponse(request);
                 StatusCode = response.StatusCode;
                 StatusDescription = response.StatusDescription;
                 return response;
+                }
                 catch (WebException exc)
+                {
                     if (exc.Response.ContentLength > 0)
+                    {
                         string content;
                         content = GetContent(exc.Response);
                         Trace.TraceError(content);
+                    }
                     throw;
+                }
+            }
             private static string GetContent(WebResponse webResponse)
+            {
                 string content;
                 using (var stream = webResponse.GetResponseStream())
                 using (var reader = new StreamReader(stream))
+                {
                     content = reader.ReadToEnd();
+                }
                 return content;
+            }
             public string DownloadStringWithRetry(string address,int retries=0)
-...
                 var actualRetries = (retries == 0) ? Retries : retries;
                 var func = Retry(() =>
                 var task = Retry(() =>
+                {
                     var uriString = String.Join("/", BaseAddress, actualAddress);
                     var content = base.DownloadString(uriString);
-...
                 }, actualRetries);
                 var result = func();
                 var result = task.Result;
                 return result;
+            }
-...
                 var actualAddress = GetActualAddress(address);
                 var actualRetries = (retries == 0) ? Retries : retries;
                 var func = Retry(() =>
                 var task = Retry(() =>
+                {
                     var uriString = String.Join("/",BaseAddress ,actualAddress);
                     var uri = new Uri(uriString);
-...
                     return 0;
                 }, actualRetries);
                 func();
                 task.Wait();
+            }
             private string GetActualAddress(string address)
-...
                     throw new ArgumentNullException("address");
                 var actualRetries = (retries == 0) ? Retries : retries;
                 var func = Retry(() =>
                 var task = Retry(() =>
+                {
                     var content = base.DownloadString(address);
-...
                 }, actualRetries);
                 var result = func();
                 var result = task.Result;
                 return result;
+            }
-...
                     throw new WebException(String.Format("{0} with code {1} - {2}", message, StatusCode, StatusDescription));
+            }
             private Func<T> Retry<T>(Func< T> original, int retryCount)
             /*private Func<T> Retry<T>(Func< T> original, int retryCount)
+            {
                 return () =>
+                {
-...
+                        }
+                    }
                 };
             }*/
             private Task<T> Retry<T>(Func< T> original, int retryCount)
+            {
                 return Task.Factory.StartNew(() => original()).ContinueWith(_original =>
+                    {
                         if(_original.IsFaulted )
+                        {
                             var e = _original.Exception.InnerException;
                             if (e is WebException)
+                            {
                                 var we = (e as WebException);
                                 var statusCode = ((HttpWebResponse) we.Response).StatusCode;
                                 this.StatusCode = statusCode;
                                 if (we.Status==WebExceptionStatus.Timeout ||
                                     (we.Status==WebExceptionStatus.ProtocolError && statusCode==HttpStatusCode.ServiceUnavailable))
+                                {
                                     TimedOut = true;
                                     if (retryCount == 0)
+                                    {
                                         Trace.TraceError("[ERROR] Timed out too many times. {0}\n", e);
                                         throw new RetryException("Timed out too many times.", e);
+                                    }
                                     Trace.TraceError(
                                         "[RETRY] Timed out after {0} ms. Will retry {1} more times\n{2}", Timeout,
                                         retryCount, e);
                                     return Retry(original, retryCount - 1);
+                                }
                                 if (statusCode==HttpStatusCode.NotFound)
                                     return new Task<T>(() => default(T));
+                            }
                             throw e;
+                        }
                         else
                             return Task<T>.Factory.StartNew(() => _original.Result);
                     }).Unwrap();
+            }

             private IntPtr _gotoBitmap=IntPtr.Zero;
             private IntPtr _versionBitmap = IntPtr.Zero;
             private IntPtr _propertiesBitmap = IntPtr.Zero;
             public FileContextMenu()
+            {
                 _gotoBitmap = GetBitmapPtr(Resources.MenuGoToPithos);
                 _versionBitmap = GetBitmapPtr(Resources.MenuHistory);
                 _propertiesBitmap = GetBitmapPtr(Resources.MenuProperties);
-...
                                                    DisplayFlags=DisplayFlags.All,
                                                    MenuBitmap = _gotoBitmap
                                                }},
                     /*{"showProperties",new MenuItem{
                                                MenuText = "&Pithos File Properties",
                                                 Verb = "showProperties",
                                                  VerbCanonicalName = "PITHOSProperties",
                                                   VerbHelpText = "Pithos File Properties",
                                                    MenuDisplayId = 2,
                                                    MenuCommand=OnShowProperties,
                                                    DisplayFlags=DisplayFlags.File,
                                                    MenuBitmap = _propertiesBitmap
                                                }},*/
                     {"prevVersions",new MenuItem{
                                                MenuText = "&Show Previous Versions",
                                                 Verb = "prevVersions",
                                                  VerbCanonicalName = "PITHOSPrevVersions",
                                                   VerbHelpText = "Go to Pithos and display previous versions",
                                                    MenuDisplayId = 2,
                                                    MenuDisplayId = 3,
                                                    MenuCommand=OnVerbDisplayFileName,
                                                    DisplayFlags=DisplayFlags.File,
                                                    MenuBitmap=_versionBitmap
-...
                     NativeMethods.DeleteObject(_versionBitmap);
                     _versionBitmap = IntPtr.Zero;
+                }
                 if (_propertiesBitmap != IntPtr.Zero)
+                {
                     NativeMethods.DeleteObject(_propertiesBitmap);
                     _propertiesBitmap = IntPtr.Zero;
+                }
+            }
             private static IntPtr GetBitmapPtr(Bitmap gotoBitmap)
-...
                 return hbitmap;
+            }
             void OnShowProperties(IntPtr hWnd)
+            {
+            }
             void OnVerbDisplayFileName(IntPtr hWnd)
+            {
-...
             void OnGotoPithos(IntPtr hWnd)
+            {
                 Context.Settings.Reload();
                 Process.Start(Context.Settings.PithosSite);
                 var settings = Context.Settings;
                 var activeAccount = settings.Accounts.FirstOrDefault(acc => acc.IsActive);
                 var address = String.Format("{0}/ui/?token={1}&user={2}",
                                             settings.PithosSite,
                                             activeAccount.ApiKey,
                                             Uri.EscapeUriString(activeAccount.AccountName));
                 settings.Reload();
                 Process.Start(address);
+            }

           <LastGenOutput>Reference.cs</LastGenOutput>
         </None>
       </ItemGroup>
       <ItemGroup>
         <None Include="Resources\MenuProperties.bmp" />
       </ItemGroup>
       <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
       <PropertyGroup>
         <PreBuildEvent>if  exist "$(TargetPath).locked" del "$(TargetPath).locked"

b/trunk/Pithos.ShellExtensions/PithosHost.cs
24	24	{
25	25	public static void EnsureHost()
26	26	{
	27	return;
27	28	if (Process.GetProcessesByName("Pithos.Client.WPF").Length == 0 &&
28	29	Process.GetProcessesByName("Pithos.Client.WPF.vshost").Length == 0)
29	30	{

b/trunk/Pithos.ShellExtensions/Properties/Resources.Designer.cs
73	73	return ((System.Drawing.Bitmap)(obj));
74	74	}
75	75	}
	76
	77	internal static System.Drawing.Bitmap MenuProperties {
	78	get {
	79	object obj = ResourceManager.GetObject("MenuProperties", resourceCulture);
	80	return ((System.Drawing.Bitmap)(obj));
	81	}
	82	}
76	83	}
77	84	}

b/trunk/Pithos.ShellExtensions/Properties/Resources.resx
124	124	<data name="MenuHistory" type="System.Resources.ResXFileRef, System.Windows.Forms">
125	125	<value>..\Resources\MenuHistory.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126	126	</data>
	127	<data name="MenuProperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
	128	<value>..\Resources\MenuProperties.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
	129	</data>
127	130	</root>

Synnefo » Pithos MS Client

Revision 7d915c34