notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests Projects 2 Releases 6 Packages Wiki Activity Actions

Refactorisation du workflow:

Browse source 
le manager devient statique, et les procédures
relatives au fichiers utisateur sont uniformisée,
que l'utilisateur soit enregistré ou anonyme,
que ce soit pour le blogspot, le frontoffice ou le workflow.

* YavscModel.csproj:
* Commande.cs:
* WorkFlowManager.cs:
* WebFileSystemManager.cs:
* UserFileSystemManager.cs: refactorisation du code, en vue de la mise
  en place
de la commande sans enregistrement du client sur le site.

* BasketController.cs:
* WorkFlowController.cs:
* FrontOfficeController.cs:
* FrontOfficeController.cs: Le manager de flux de travaux est devient
  un objet statique.

* FileSystemController.cs: refactorisation du code, en vue de la mise
  en place
de la commande sans enregistrement du client sur le site.

* Web.csproj: ajoute les références au déployement des sites
* Totem prod
* Totem pré
Leur configuration n'est pas maintenue sous Git.
This commit is contained in:
Paul Schneider 2015-11-22 14:00:59 +01:00
commit 439759cb16
13 changed files with 233 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

10
yavscModel/ChangeLog
View file

@ -1,3 +1,13 @@
2015-11-22 Paul Schneider <paul@pschneider.fr>
* YavscModel.csproj:
* Commande.cs:
* WorkFlowManager.cs:
* WebFileSystemManager.cs:
* UserFileSystemManager.cs: refactorisation du code, en vue de
la mise en place
de la commande sans enregistrement du client sur le site.
2015-11-21 Paul Schneider <paul@pschneider.fr>
* UserNameBase.cs: Permet l'usage des espaces dans les noms

131
yavscModel/FileSystem/UserFileSystemManager.cs Normal file
View file

@ -0,0 +1,131 @@
//
// UserFileSystemManager.cs
//
// Author:
// Paul Schneider <paul@pschneider.fr>
//
// Copyright (c) 2015 GNU GPL
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.IO;
using System.Web;
using System.Web.Security;
using System.Collections.Generic;
using System.Collections.Specialized;
namespace Yavsc.Model.FileSystem
{
/// <summary>
/// User file system.
/// </summary>
internal class UserFileSystem : WebFileSystemManager {
/// <summary>
/// Initializes a new instance of the <see cref="Yavsc.Model.FileSystem.UserFileSystem"/> class.
/// </summary>
/// <param name="username">Username.</param>
/// <param name="root">Root.</param>
public UserFileSystem(string username, string root="~/users") {
base.Prefix = UserFileSystemManager.UserFileRoot(username,root);
}
}
/// <summary>
/// User file system manager.
/// </summary>
public static class UserFileSystemManager
{
/// <summary>
/// Initializes a new instance of the <see cref="Yavsc.Model.FileSystem.UserFileSystemManager"/> class.
/// </summary>
/// <param name="rootDirectory">Root directory.</param>
public static string CurrentUserFileRoot (string rootDirectory="~/users")
{
if (!HttpContext.Current.User.Identity.IsAuthenticated)
throw new Exception ("Not membership available");
return UserFileRoot (HttpContext.Current.User.Identity.Name,rootDirectory);
}
/// <summary>
/// Users the file root.
/// </summary>
/// <returns>The file root.</returns>
/// <param name="username">Username.</param>
/// <param name="rootDirectory">Root directory.</param>
public static string UserFileRoot (string username, string rootDirectory="~/users")
{
string rootpath = HttpContext.Current.Server.MapPath (rootDirectory);
return Path.Combine(rootpath, username);
}
private static WebFileSystemManager manager=null;
/// <summary>
/// Gets or sets the file manager.
/// </summary>
/// <value>The file manager.</value>
public static WebFileSystemManager FileManager {
get
{
if (manager == null)
manager = new UserFileSystem (
HttpContext.Current.User.Identity.Name);
return manager;
}
set {
manager = value;
}
}
/// <summary>
/// Gets the files.
/// </summary>
/// <returns>The files.</returns>
/// <param name="subdir">Subdir.</param>
public static IEnumerable<FileInfo> GetFiles (string subdir)
{
return GetFiles (HttpContext.Current.User.Identity.Name, subdir);
}
/// <summary>
/// Gets the files.
/// </summary>
/// <returns>The files.</returns>
/// <param name="username">Username.</param>
/// <param name="subdir">Subdir.</param>
public static IEnumerable<FileInfo> GetFiles (string username, string subdir)
{
return FileManager.GetFiles (Path.Combine(UserFileRoot(username),subdir));
}
/// <summary>
/// Put the specified destDir and files.
/// </summary>
/// <param name="destDir">Destination dir.</param>
/// <param name="files">Files.</param>
public static void Put(string destDir, NameObjectCollectionBase files)
{
FileManager.ValidateSubDir (destDir);
FileManager.Put(
Path.Combine(CurrentUserFileRoot(),destDir),
files);
}
/// <summary>
/// Detail the specified filePath and username.
/// </summary>
/// <param name="filePath">File path.</param>
/// <param name="username">Username.</param>
public static FileInfo Detail(string filePath, string username=null)
{
return FileManager.FileInfo (UserFileRoot (username));
}
}
}

80
yavscModel/FileSystem/WebFileSystemManager.cs
View file

@ -38,7 +38,7 @@ namespace Yavsc.Model.FileSystem
/// It just provides simple method for a small set of
/// files, in a small tree of sub-folders .
/// </summary>
public class WebFileSystemManager
public abstract class WebFileSystemManager
{
/// <summary>
/// Gets or sets the size of the max file.
@ -53,35 +53,8 @@ namespace Yavsc.Model.FileSystem
public long MaxUserStorage { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="Yavsc.Model.FileSystem.FileSystemManager"/> class.
/// </summary>
public WebFileSystemManager (string rootDirectory="~/users")
{
string rootpath = HttpContext.Current.Server.MapPath (rootDirectory);
var rdi = new DirectoryInfo (rootpath);
if (!rdi.Exists)
rdi.Create ();
MembershipUser user = Membership.GetUser ();
if (user == null)
throw new Exception ("Not membership available");
Prefix = Path.Combine(rootpath, user.ProviderUserKey.ToString());
}
string regexFileName = "^[A-Za-z0-9#^!+ _~\\-.]+$";
/// <summary>
/// Determines if the specified name is OK.
/// </summary>
/// <returns><c>true</c> if is this name O the specified name; otherwise, <c>false</c>.</returns>
/// <param name="name">Name.</param>
public static bool IsThisNameOK(string name)
{
foreach (char x in Path.GetInvalidPathChars()) {
if (name.Contains (x))
return false;
}
return true;
}
/// <summary>
/// Put the specified files in destDir, as sub dir of the current user's home dir.
/// </summary>
@ -99,8 +72,7 @@ namespace Yavsc.Model.FileSystem
}
}
// do the job
CheckSubDir (destDir);
ValidateSubDir (destDir,true);
DirectoryInfo di = new DirectoryInfo (
Path.Combine (Prefix, destDir));
if (!di.Exists)
@ -133,15 +105,25 @@ namespace Yavsc.Model.FileSystem
/// concerning the allowed character class.
/// </summary>
/// <param name="subdir">Subdir.</param>
private void CheckSubDir (string subdir)
/// <param name="throwex">throw ex.</param>
public bool ValidateSubDir (string subdir, bool throwex = false)
{
foreach (string dirname in subdir.Split(Path.DirectorySeparatorChar)) {
if (!Regex.Match (dirname, regexFileName).Success)
throw new InvalidDirNameException (dirname);
if (!Regex.Match (dirname, regexFileName).Success) {
if (throwex)
throw new InvalidDirNameException (dirname);
else
return false;
}
foreach (char x in dirname)
if (subdir.Contains (x))
throw new InvalidDirNameException (subdir);
if (subdir.Contains (x)) {
if (throwex)
throw new InvalidDirNameException (subdir);
else
return false;
}
}
return true;
}
/// <summary>
/// Gets the files owned by the current logged user.
@ -150,40 +132,26 @@ namespace Yavsc.Model.FileSystem
/// </summary>
/// <returns>The files.</returns>
/// <param name="subdir">Subdir.</param>
public IEnumerable<FileInfo> GetFiles (string subdir)
public virtual IEnumerable<FileInfo> GetFiles (string subdir)
{
string path = Prefix;
if (subdir != null) {
CheckSubDir (subdir); // checks for specification validity
ValidateSubDir (subdir,true); // checks for specification validity
path = Path.Combine (Prefix, subdir);
}
DirectoryInfo di = new DirectoryInfo (path);
return (di.GetFiles ());
}
public FileInfo[] GetFiles (string username, string subdir)
{
string path = Prefix;
if (subdir != null) {
CheckSubDir (subdir); // checks for specification validity
path = Path.Combine (Prefix, subdir);
}
DirectoryInfo di = new DirectoryInfo (path);
if (!di.Exists)
return new FileInfo[0];
return (di.GetFiles ());
}
/// <summary>
/// Files the info.
/// </summary>
/// <returns>The info.</returns>
/// <param name="id">Identifier.</param>
public FileInfo FileInfo(string id)
/// <param name="filePath">file Path.</param>
public FileInfo FileInfo(string filePath)
{
CheckSubDir (id);
return new FileInfo(Path.Combine (Prefix, id));
ValidateSubDir (filePath,true);
return new FileInfo(Path.Combine (Prefix, filePath));
}
}
}

10
yavscModel/FrontOffice/Commande.cs
View file

@ -46,7 +46,7 @@ namespace Yavsc.Model.FrontOffice
IEnumerable<FileInfo> Files {
get {
return GetFSM().GetFiles (Id.ToString());
return UserFileSystemManager.GetFiles (Id.ToString());
}
}
/// <summary>
@ -72,10 +72,9 @@ namespace Yavsc.Model.FrontOffice
if (key!="ref")
Parameters.Add (key, collection [key]);
}
WorkFlowManager wfm = new WorkFlowManager ();
wfm.RegisterCommand (this); // overrides this.Id
WorkFlowManager.RegisterCommand (this); // gives a value to this.Id
string strcmdid = Id.ToString ();
GetFSM().Put (strcmdid, files);
UserFileSystemManager.Put(Path.Combine("commandes",strcmdid),files);
}
/// <summary>
@ -89,9 +88,6 @@ namespace Yavsc.Model.FrontOffice
FromPost (collection, files);
}
private WebFileSystemManager GetFSM() {
return new WebFileSystemManager ("~/commands/{0}");
}
}
}

41
yavscModel/WorkFlow/WorkFlowManager.cs
View file

@ -13,7 +13,7 @@ namespace Yavsc.Model.WorkFlow
/// It takes orders store them and raise some events for modules
/// It publishes estimates and invoices
/// </summary>
public class WorkFlowManager
public static class WorkFlowManager
{
/// <summary>
/// Gets or sets the catalog.
@ -26,7 +26,7 @@ namespace Yavsc.Model.WorkFlow
/// </summary>
/// <returns>The command.</returns>
/// <param name="com">COM.</param>
public long RegisterCommand(Command com)
public static long RegisterCommand(Command com)
{
return ContentProvider.RegisterCommand (com);
}
@ -35,7 +35,7 @@ namespace Yavsc.Model.WorkFlow
/// Updates the estimate.
/// </summary>
/// <param name="estim">Estim.</param>
public void UpdateEstimate (Estimate estim)
public static void UpdateEstimate (Estimate estim)
{
ContentProvider.Update (estim);
}
@ -44,7 +44,7 @@ namespace Yavsc.Model.WorkFlow
/// </summary>
/// <returns>The estimate.</returns>
/// <param name="estid">Estid.</param>
public Estimate GetEstimate (long estid)
public static Estimate GetEstimate (long estid)
{
return ContentProvider.Get (estid);
}
@ -54,7 +54,7 @@ namespace Yavsc.Model.WorkFlow
/// </summary>
/// <returns>The estimates.</returns>
/// <param name="responsible">Responsible.</param>
public Estimate [] GetResponsibleEstimates (string responsible)
public static Estimate [] GetResponsibleEstimates (string responsible)
{
return ContentProvider.GetEstimates (null, responsible);
}
@ -64,7 +64,7 @@ namespace Yavsc.Model.WorkFlow
/// </summary>
/// <returns>The client estimates.</returns>
/// <param name="client">Client.</param>
public Estimate [] GetClientEstimates (string client)
public static Estimate [] GetClientEstimates (string client)
{
return ContentProvider.GetEstimates (client, null);
}
@ -74,7 +74,7 @@ namespace Yavsc.Model.WorkFlow
/// </summary>
/// <returns>The user estimates.</returns>
/// <param name="username">Username.</param>
public Estimate [] GetUserEstimates (string username)
public static Estimate [] GetUserEstimates (string username)
{
return ContentProvider.GetEstimates (username);
}
@ -84,7 +84,7 @@ namespace Yavsc.Model.WorkFlow
/// </summary>
/// <returns>The stock status.</returns>
/// <param name="productReference">Product reference.</param>
public StockStatus GetStock(string productReference)
public static StockStatus GetStock(string productReference)
{
return ContentProvider.GetStockStatus (productReference);
}
@ -93,7 +93,7 @@ namespace Yavsc.Model.WorkFlow
/// Updates the writting.
/// </summary>
/// <param name="wr">Wr.</param>
public void UpdateWritting (Writting wr)
public static void UpdateWritting (Writting wr)
{
ContentProvider.UpdateWritting (wr);
}
@ -102,7 +102,7 @@ namespace Yavsc.Model.WorkFlow
/// Drops the writting.
/// </summary>
/// <param name="wrid">Wrid.</param>
public void DropWritting (long wrid)
public static void DropWritting (long wrid)
{
ContentProvider.DropWritting (wrid);
}
@ -110,19 +110,19 @@ namespace Yavsc.Model.WorkFlow
/// Drops the estimate.
/// </summary>
/// <param name="estid">Estid.</param>
public void DropEstimate (long estid)
public static void DropEstimate (long estid)
{
ContentProvider.DropEstimate(estid);
}
IContentProvider contentProvider;
static IContentProvider contentProvider;
/// <summary>
/// Gets the content provider.
/// </summary>
/// <value>The content provider.</value>
public IContentProvider ContentProvider {
public static IContentProvider ContentProvider {
get {
DataProviderConfigurationSection c = (DataProviderConfigurationSection) ConfigurationManager.GetSection ("system.web/workflow");
if (c == null)
@ -162,7 +162,7 @@ namespace Yavsc.Model.WorkFlow
/// <param name="client">Client.</param>
/// <param name="title">Title.</param>
/// <param name="description">Description.</param>
public Estimate CreateEstimate(string responsible, string client, string title, string description)
public static Estimate CreateEstimate(string responsible, string client, string title, string description)
{
Estimate created = ContentProvider.CreateEstimate (responsible, client, title, description);
return created;
@ -176,7 +176,7 @@ namespace Yavsc.Model.WorkFlow
/// <param name="ucost">Ucost.</param>
/// <param name="count">Count.</param>
/// <param name="productid">Productid.</param>
public long Write(long estid, string desc, decimal ucost, int count, string productid)
public static long Write(long estid, string desc, decimal ucost, int count, string productid)
{
if (!string.IsNullOrWhiteSpace(productid)) {
if (Catalog == null)
@ -197,7 +197,7 @@ namespace Yavsc.Model.WorkFlow
/// <param name="estid">Estid.</param>
/// <param name="status">Status.</param>
/// <param name="username">Username.</param>
public void SetEstimateStatus(long estid, int status, string username)
public static void SetEstimateStatus(long estid, int status, string username)
{
ContentProvider.SetEstimateStatus (estid, status, username);
}
@ -206,10 +206,17 @@ namespace Yavsc.Model.WorkFlow
/// </summary>
/// <returns>The commands.</returns>
/// <param name="username">Username.</param>
public CommandSet GetCommands(string username)
public static CommandSet GetCommands(string username)
{
return ContentProvider.GetCommands (username);
}
public static string [] APEDisponibles
{
get {
return new string[]{ "Chanteur", "DJ", "Musicien", "Clown" };
}
}
}
}

3
yavscModel/YavscModel.csproj
View file

@ -21,7 +21,6 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<DocumentationFile>bin\Debug\YavscModel.xml</DocumentationFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
@ -30,7 +29,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Lua|AnyCPU' ">
<Optimize>false</Optimize>
@ -201,6 +199,7 @@
<Compile Include="IRating.cs" />
<Compile Include="IAuthorized.cs" />
<Compile Include="Skill\PerformerProfile.cs" />
<Compile Include="FileSystem\UserFileSystemManager.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>