Egalware/SteamWare
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-20 17:30:05 +01:00
parent 2bad26a99d 31b34a2024
commit a12239134f
8 changed files with 165 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=728']) {
withEnv(['NEXT_BUILD_NUMBER=729']) {
// env.versionNumber = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
SteamWare.IO/fileMover.cs
+9
View File
@@ -845,6 +845,15 @@ namespace SteamWare.IO
setDirs(System.Web.HttpContext.Current.Server.MapPath(_path));
}
/// <summary>
/// restituisce la stringa completa e corretta del filepath del server (anche con vDir)
/// </summary>
/// <param name="pathRel">path relativo alla cartella iis dell'applicativo</param>
/// <returns>path fisico tradotto</returns>
public static string getFilePath(string pathRel)
{
return System.Web.HttpContext.Current.Server.MapPath(pathRel);
}
/// <summary>
/// esegue un comando in shell
/// </summary>
/// <param name="workDir"></param>
SteamWareLib/SteamWare.csproj
+1
View File
@@ -251,6 +251,7 @@
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="PasswordHash.cs" />
<Compile Include="SteamwareStrings.cs" />
<Compile Include="UpdateMan.cs" />
<Compile Include="UserPage.cs">
<SubType>ASPXCodeBehind</SubType>
SteamWareLib/SteamwareStrings.cs
+143
View File
@@ -0,0 +1,143 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SteamWare
{
/// <summary>
/// Classe di metodi che estendono quelli base applicati alle string
/// </summary>
public class SteamwareStrings
{
/// <summary>
/// Trasforma in MAIUSCOLo il primo carattere della stringa
/// </summary>
/// <param name="_stringaIN">stringa da processare</param>
/// <returns>stringa processata</returns>
public static string firstToUpper(string _stringaIN)
{
string _stringaOUT = _stringaIN;
if (_stringaIN.Length > 1)
{
_stringaOUT = _stringaIN.Substring(0, 1).ToUpper() + _stringaIN.Substring(1, _stringaIN.Length - 1).ToLower();
}
return _stringaOUT;
}
/// <summary>
/// effettua escape di stringhe di ricerca di tipo filtro per apici e altri caratteri non ammessi
/// </summary>
/// <param name="s_"></param>
/// <returns></returns>
public static string EscapeSqlLike(string s_)
{
StringBuilder sb = new StringBuilder(s_.Length);
for (int i = 0; i < s_.Length; i++)
{
char c = s_[i];
switch (c)
{
case ']':
case '[':
case '%':
case '*':
sb.Append("[").Append(c).Append("]");
break;
case '\'':
sb.Append("''");
break;
default:
sb.Append(c);
break;
}
}
return sb.ToString();
}
/// <summary>
/// restituisce una stringa uguale all'originale + terminazione newline
/// </summary>
/// <param name="s"></param>
/// <returns></returns>
public static string addLine(object s)
{
return string.Format("{0}{1}", s, Environment.NewLine);
}
/// <summary>
/// formatta un titolo
/// </summary>
/// <param name="title">Titolo da scrivere</param>
/// <param name="padChar">carattere x padding titolo</param>
/// <param name="repNum">larghezza caratteri (x pad)</param>
/// <returns></returns>
public static string charTitle(object title, char padChar, int repNum)
{
string answ = "";
answ += addLine(new string(padChar, repNum));
answ += addLine(string.Format("{0} {1}", padChar, title));
answ += addLine(new string(padChar, repNum));
return answ;
}
/// <summary>
/// formatta una riga di caratteri
/// </summary>
/// <param name="padChar">carattere da utilizzare</param>
/// <param name="repNum">larghezza caratteri (x pad)</param>
/// <returns></returns>
public static string charLine(char padChar, int repNum)
{
string answ = "";
answ += addLine(new string(padChar, repNum));
return answ;
}
/// <summary>
/// genera stringhe pseudo-casuali
/// </summary>
/// <param name="Lenght"></param>
/// <returns></returns>
public static string pseudoRandomString(int Lenght)
{
string answ = "";
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
var random = new Random();
answ = new string(
Enumerable.Repeat(chars, Lenght)
.Select(s => s[random.Next(s.Length)])
.ToArray());
return answ;
}
/// <summary>
/// limita una stringa al numero max di caratteri imposto
/// </summary>
/// <param name="original"></param>
/// <param name="maxChar"></param>
/// <returns></returns>
public static string limitString(string original, int maxChar)
{
string outString = original;
if (outString.Length > maxChar)
{
outString = string.Format("{0}...", original.Substring(0, maxChar - 3));
}
return outString;
}
/// <summary>
/// limita una stringa al numero max di caratteri imposto prendendo ANCHE ultimi
/// </summary>
/// <param name="original"></param>
/// <param name="maxChar"></param>
/// <param name="lastNumChar"></param>
/// <returns></returns>
public static string limitString(string original, int maxChar, int lastNumChar)
{
string outString = original;
if (outString.Length > maxChar)
{
outString = string.Format("{0}...{1}", original.Substring(0, maxChar - 3 - lastNumChar), original.Substring(outString.Length - lastNumChar));
}
return outString;
}
}
}
SteamWareLib/dbUpdateManager.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace SteamWare
_connString = connectionString;
try
{
_sqlScriptDir = SteamwareStrings.getFilePath(sqlDir);
_sqlScriptDir = fileMover.getFilePath(sqlDir);
}
catch
{
SteamWareLib/fileMover.cs
+9
View File
@@ -844,6 +844,15 @@ namespace SteamWare
setDirs(System.Web.HttpContext.Current.Server.MapPath(_path));
}
/// <summary>
/// restituisce la stringa completa e corretta del filepath del server (anche con vDir)
/// </summary>
/// <param name="pathRel">path relativo alla cartella iis dell'applicativo</param>
/// <returns>path fisico tradotto</returns>
public static string getFilePath(string pathRel)
{
return System.Web.HttpContext.Current.Server.MapPath(pathRel);
}
/// <summary>
/// esegue un comando in shell
/// </summary>
/// <param name="workDir"></param>
SteamWareLib/logger.cs
+1 -1
View File
@@ -57,7 +57,7 @@ namespace SteamWare
string _logDir = memLayer.ML.confReadString("_logDir");
try
{
_logBaseDir = SteamwareStrings.getFilePath(_logDir);
_logBaseDir = fileMover.getFilePath(_logDir);
}
catch (Exception exc)
{
SteamWareLib/utils.cs
-143
View File
@@ -1093,149 +1093,6 @@ namespace SteamWare
#endregion
/// <summary>
/// Classe di metodi che estendono quelli base applicati alle string
/// </summary>
public class SteamwareStrings
{
/// <summary>
/// Trasforma in MAIUSCOLo il primo carattere della stringa
/// </summary>
/// <param name="_stringaIN">stringa da processare</param>
/// <returns>stringa processata</returns>
public static string firstToUpper(string _stringaIN)
{
string _stringaOUT = _stringaIN;
if (_stringaIN.Length > 1)
{
_stringaOUT = _stringaIN.Substring(0, 1).ToUpper() + _stringaIN.Substring(1, _stringaIN.Length - 1).ToLower();
}
return _stringaOUT;
}
/// <summary>
/// restituisce la stringa completa e corretta del filepath del server (anche con vDir)
/// </summary>
/// <param name="pathRel">path relativo alla cartella iis dell'applicativo</param>
/// <returns>path fisico tradotto</returns>
public static string getFilePath(string pathRel)
{
return System.Web.HttpContext.Current.Server.MapPath(pathRel);
}
/// <summary>
/// effettua escape di stringhe di ricerca di tipo filtro per apici e altri caratteri non ammessi
/// </summary>
/// <param name="s_"></param>
/// <returns></returns>
public static string EscapeSqlLike(string s_)
{
StringBuilder sb = new StringBuilder(s_.Length);
for (int i = 0; i < s_.Length; i++)
{
char c = s_[i];
switch (c)
{
case ']':
case '[':
case '%':
case '*':
sb.Append("[").Append(c).Append("]");
break;
case '\'':
sb.Append("''");
break;
default:
sb.Append(c);
break;
}
}
return sb.ToString();
}
/// <summary>
/// restituisce una stringa uguale all'originale + terminazione newline
/// </summary>
/// <param name="s"></param>
/// <returns></returns>
public static string addLine(object s)
{
return string.Format("{0}{1}", s, Environment.NewLine);
}
/// <summary>
/// formatta un titolo
/// </summary>
/// <param name="title">Titolo da scrivere</param>
/// <param name="padChar">carattere x padding titolo</param>
/// <param name="repNum">larghezza caratteri (x pad)</param>
/// <returns></returns>
public static string charTitle(object title, char padChar, int repNum)
{
string answ = "";
answ += addLine(new string(padChar, repNum));
answ += addLine(string.Format("{0} {1}", padChar, title));
answ += addLine(new string(padChar, repNum));
return answ;
}
/// <summary>
/// formatta una riga di caratteri
/// </summary>
/// <param name="padChar">carattere da utilizzare</param>
/// <param name="repNum">larghezza caratteri (x pad)</param>
/// <returns></returns>
public static string charLine(char padChar, int repNum)
{
string answ = "";
answ += addLine(new string(padChar, repNum));
return answ;
}
/// <summary>
/// genera stringhe pseudo-casuali
/// </summary>
/// <param name="Lenght"></param>
/// <returns></returns>
public static string pseudoRandomString(int Lenght)
{
string answ = "";
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
var random = new Random();
answ = new string(
Enumerable.Repeat(chars, Lenght)
.Select(s => s[random.Next(s.Length)])
.ToArray());
return answ;
}
/// <summary>
/// limita una stringa al numero max di caratteri imposto
/// </summary>
/// <param name="original"></param>
/// <param name="maxChar"></param>
/// <returns></returns>
public static string limitString(string original, int maxChar)
{
string outString = original;
if (outString.Length > maxChar)
{
outString = string.Format("{0}...", original.Substring(0, maxChar - 3));
}
return outString;
}
/// <summary>
/// limita una stringa al numero max di caratteri imposto prendendo ANCHE ultimi
/// </summary>
/// <param name="original"></param>
/// <param name="maxChar"></param>
/// <param name="lastNumChar"></param>
/// <returns></returns>
public static string limitString(string original, int maxChar, int lastNumChar)
{
string outString = original;
if (outString.Length > maxChar)
{
outString = string.Format("{0}...{1}", original.Substring(0, maxChar - 3 - lastNumChar), original.Substring(outString.Length - lastNumChar));
}
return outString;
}
}
/// <summary>
/// fornisce dati di base per l'utente
/// </summary>