Merge branch 'release/DeleteOldPdf'

Fix nexus upload http/https

.gitlab-ci.yml

@@ -1,37 +1,118 @@
 variables:
  NUGET_PATH: 'C:\Tools\nuget.exe'
  MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe'
+ ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
+ EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release'
+ DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds'
+ NEXUS_PATH: 'LPA/LPA'
+ APP_NAME: 'LPA'
+ VERS_MAIN: '1.2'
+ NEW_REL: ''
+ OUTPUT_DIR: ''
 
+# helper x fix pacchetti nuget da repo locale nexus.steamware.net
+.nuget-fix: &nuget-fix
+   - |
+      $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
+      if ($hasSource -eq 0) {
+         C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
+      } else {
+         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
+      }
+      echo $hasSource
  
+# helper x fix version number
+.version-fix: &version-fix
+   - |
+      $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+$CI_PIPELINE_IID
+      $contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw
+      $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL
+      $newContenuto | Set-Content -Path 'VersGen\VersGen.cs'
+      echo "Set vers: $env:NEW_REL"
+
+# helper pulizia files zip
+.cleanup-zip: &cleanup-zip
+   - |
+      $env:OUTPUT_DIR = "Releases\" + $CI_COMMIT_BRANCH + "\*"
+      if ((Test-Path $env:OUTPUT_DIR))
+      {
+        Remove-Item $env:OUTPUT_DIR -Force -Recurse -ErrorAction Ignore
+      }
+      echo "Clening ZIP dir: $env:OUTPUT_DIR"
+
+# helper creazione files zip
+.zipper: &zipper
+   - |
+      $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe"
+      if (-not (Test-Path -Path $7zipPath -PathType Leaf)) {
+          throw "7 zip file '$7zipPath' not found"
+      }
+      Set-Alias 7zip $7zipPath
+      $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
+      $Source = "LPA\bin\*"
+      7zip a -tzip $Target $Source
+      echo "called ZIP $Source --> $Target"      
+      
+# helper creazione hash files
+.hashBuild: &hashBuild
+   - |
+      $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
+      $MD5 = Get-FileHash $Target -Algorithm MD5
+      $SHA1 = Get-FileHash $Target -Algorithm SHA1
+      New-Item $Target".md5"
+      New-Item $Target".sha1"
+      $MD5.Hash | Set-Content -Path $Target".md5"
+      $SHA1.Hash | Set-Content -Path $Target".sha1"
+
+      echo "Created HASH files for $Target"      
+
+# helper x send su NEXUS
+.nexusUpload: &nexusUpload
+   - |
+      Set-Alias mCurl  C:\Windows\system32\curl.exe
+      if($CI_COMMIT_BRANCH -eq "master")
+      {
+        $version = "stable"
+      }
+      else
+      {
+        $version = "unstable"
+      }
+      $File2Send = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".md5"
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".sha1" https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1"
+
+
+# mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip
+
 stages:
  - build
  - deploy
- 
-before_script:  
-     - '& "$env:NUGET_PATH" restore sourcecode\project.sln'  # sourcecode\project.sln-This path includes project solution where is available and restoring
-           
          
 build_job:
  stage: build
- only:
-   - developer #this branch will run on GitLab Runner and can change it.  
+ tags:
+   - win
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore LPA.sln' # path alla solution corrente
+   - *version-fix
  script:  
-    - '& "$env:MSBUILD_PATH" sourcecode\project.sln /p:DeployOnBuild=true /p:Configuration=Release  /p:Platform="Any CPU" /P:PublishProfile=FolderProfile.pubxml'  
-    - bat "\$env:MSBUILD_PATH" LPA/LPA.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" 
- 
- artifacts:
-   expire_in: 365 days  #artifcats will be stored only 365 days after this it will expire  
-   paths:
-     - '.\sourcecode\project.sln\bin\Release\Publish\'
-     - '.\sourcecode\project.sln\bin\Publish\'
-
-   
- dependencies:
-   - build_job
+    - '& "$env:MSBUILD_PATH" LPA\LPA.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
 
 deploy_job:
  stage: deploy
- only:
-   - developer #this branch will run on GitLab Runner and can change it.  
- script:
-    - 'xcopy /y /s ".\sourcecode\project.sln\bin\Release\Publish\*.*" "C:\solutionDir"'  #Path where you want to store the solution  
+ tags:
+   - win
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore LPA.sln' # path alla solution corrente
+   - *version-fix
+   - *cleanup-zip
+ script:  
+    - '& "$env:MSBUILD_PATH" LPA\LPA.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
+    - *zipper
+    - *hashBuild
+    - *nexusUpload
+ needs: ["build_job"]

.gitlab-ci.yml_bck

@@ -1,56 +0,0 @@
-# This file is a template, and might need editing before it works on your project.
-# The following script will work for any project that can be built from command line by msbuild
-# It uses powershell shell executor, so you need to add the following line to your config.toml file
-# (located in gitlab-runner.exe directory):
-#   shell = "powershell"
-#
-# The script is composed of 3 stages: build, test and deploy.
-#
-# The build stage restores NuGet packages and uses msbuild to build the exe and msi
-# One major issue you'll find is that you can't build msi projects from command line
-# if you use vdproj.  There are workarounds building msi via devenv, but they rarely work
-# The best solution is migrating your vdproj projects to WiX, as it can be build directly
-# by msbuild.
-#
-# The test stage runs nunit from command line against Test project inside your solution
-# It also saves the resulting TestResult.xml file
-#
-# The deploy stage copies the exe and msi from build stage to a network drive
-# You need to have the network drive mapped as Local System user for gitlab-runner service to see it
-# The best way to persist the mapping is via a scheduled task (see: https://stackoverflow.com/a/7867064/1288473),
-# running the following batch command: net use P: \\x.x.x.x\Projects /u:your_user your_pass /persistent:yes
-
-
-# place project specific paths in variables to make the rest of the script more generic
-variables:
-  EXE_RELEASE_FOLDER: 'C:\Testb\bin\Release'
-  MSI_RELEASE_FOLDER: 'C:\Testb\Setup\bin\Release'
-  TEST_FOLDER: 'C:\Testb\Tests\bin\Release'
-  #DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds'
-  NUGET_PATH: 'C:\Tools\NuGet\nuget.exe'
-  #MSBUILD_PATH: 'C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe'
-  MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\msbuild.exe'
-  #NUNIT_PATH: 'C:\Program Files (x86)\NUnit.org\nunit-console\nunit3-console.exe'
-
-stages:
-  - build
-  #- test
-  #- deploy
-
-build_job:
-  stage: build
-  only:
-    - master # the build process will only be started by git tag commits
-  tags:
-    - msbuild
-  script:
-    - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
-    - '& "$env:MSBUILD_PATH" LPA/LPA.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m'  # build the project
-  artifacts:
-    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
-    paths:
-      - '$env:EXE_RELEASE_FOLDER\LPA.exe'  # saving exe to copy to deploy folder
-      - '$env:MSI_RELEASE_FOLDER\LPA.msi'  # saving msi to copy to deploy folder
-      #- '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
-
-

LPA/App.config

@@ -5,10 +5,12 @@
     </startup>
     <appSettings>
         <add key="appName" value="LPA" />
-        <add key="serverBaseAddr" value="http://iis01/MP/MAG/" />
-        <add key="serverIp" value="iis01" />
-        <!--<add key="serverBaseAddr" value="http://iis02/NKC/" />
-        <add key="serverIp" value="iis02" />-->
+        <!--<add key="serverBaseAddr" value="http://iis01/MP/MAG/" />
+        <add key="serverIp" value="iis01" />-->
+        <add key="serverBaseAddr" value="http://iis01.egalware.com/NKC/" />
+        <add key="serverIp" value="iis01.egalware.com" />
+        <!--<add key="serverBaseAddr" value="http://iis02.egalware.com/NKC/" />
+        <add key="serverIp" value="iis02.egalware.com" />-->
         <add key="localReportPath" value="reports" />
         <add key="localPdfPath" value="pdf" />
         <add key="_logDir" value="/logs/" />

LPA/LPA.csproj

@@ -312,8 +312,6 @@
     <Content Include="Core\Compression\Snappy\lib\win\snappy64.dll" />
     <Content Include="Core\Compression\Zstandard\lib\win\libzstd.dll" />
     <Content Include="Resources\SteamWare.ico" />
-    <Content Include="snappy32.dll" />
-    <Content Include="snappy64.dll" />
     <Content Include="SqlServerTypes\readme.htm" />
     <Content Include="SqlServerTypes\x64\msvcr120.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

LPA/MainForm.cs

@@ -642,11 +642,19 @@ namespace LPA
                 {
                     // parto da template base
                     template = item.template;
-                    // cerco nel dato da singolo item
-                    var templateConf = reportConf.Find(conf => conf.name == item.template);
-                    if (reportConf != null)
+                    //se non c'è uso quello della coda...
+                    if (string.IsNullOrEmpty(template))
                     {
-                        template = templateConf.template;
+                        template = confCoda.template;
+                    }
+                    else
+                    {
+                        // cerco nel dato da singolo item
+                        var templateConf = reportConf.Find(conf => conf.name == item.template);
+                        if (reportConf != null)
+                        {
+                            template = templateConf.template;
+                        }
                     }
                     // stampo
                     fatto = rPrint.printReport(template, localReportPath, coda.Value.Printer, item.rdsData, confCoda.deviceInfoParam, true);

LPA/conf/serverSetup.json

@@ -1,4 +1,4 @@
 {
     "serverIp": "iis01",
-    "serverBaseAddr": "http://iis01/MP/MAG/"
+    "serverBaseAddr": "http://iis01/NKC/"
 }

LPA/reportPrinter.cs

@@ -95,8 +95,10 @@ namespace LPA
             string dailyDir = $"{baseDir}{localPdfPath}\\{adesso:yyyy}\\{adesso:MM}\\{adesso:dd}\\";
             string pdfPathName = $"{dailyDir}\\{name}_{adesso:HHmmss}_{adesso:ffff}.{fileNameExtension}";
             // creo Directory se non c'è
-            fileMover fm = new fileMover(dailyDir, "");
-            fm.checkDir();
+            if (!Directory.Exists(dailyDir))
+            {
+                Directory.CreateDirectory(dailyDir);
+            }
             Stream stream = new FileStream(pdfPathName, FileMode.Create);
             m_streams.Add(stream);
             return stream;
@@ -299,16 +301,17 @@ namespace LPA
                 }
                 // ottengo elenco files *.emf
                 fileMover.obj.setDirectory(currPath);
-                FileInfo[] _fis = fileMover.obj.elencoFiles_FI("*.EMF");
+                var _fis = Directory.GetFiles(currPath, "*.EMF");
                 bool fatto = false;
-                foreach (FileInfo _file in _fis)
+                foreach (var _fileName in _fis)
                 {
-                    if (_file.CreationTime < DateTime.Now.AddMinutes(-maxAgeMinutes)) // elimino files vecchi...
+                    FileInfo file = new FileInfo(_fileName);
+                    if (file.CreationTime < DateTime.Now.AddMinutes(-maxAgeMinutes)) // elimino files vecchi...
                     {
-                        fatto = fileMover.obj.eliminaFile(_file);
+                        fatto = fileMover.obj.eliminaFile(file);
                         if (fatto)
                         {
-                            Log.Instance.Info($"Eliminato file {_file.Name}");
+                            Log.Instance.Info($"Eliminato file {file.Name}");
                             eliminati++;
                         }
                     }
@@ -316,7 +319,34 @@ namespace LPA
                 // salvo il log degli update
                 if (eliminati > 0)
                 {
-                    Log.Instance.Info($"Eliminati {eliminati} files temporanei da area temp");
+                    Log.Instance.Info($"Eliminati {eliminati} files EMF temporanei da area temp");
+                }
+
+                // verifica file pdf vecchi (oltre 5 mesi...)
+                currPath = $"{baseDir}{localPdfPath}";
+                eliminati = 0;
+                // ottengo elenco files *.emf
+                fileMover.obj.setDirectory(currPath);
+                _fis = Directory.GetFiles(currPath, "*.pdf", SearchOption.AllDirectories);
+                fatto = false;
+                foreach (var _fileName in _fis)
+                {
+                    FileInfo file = new FileInfo(_fileName);
+                    if (file.CreationTime < DateTime.Now.AddMonths(-5)) // elimino files vecchi...
+                    {
+                        fatto = fileMover.obj.eliminaFile(file);
+                        if (fatto)
+                        {
+                            Log.Instance.Info($"Eliminato file {file.Name}");
+                            eliminati++;
+                        }
+                    }
+                }
+
+                // salvo il log degli update
+                if (eliminati > 0)
+                {
+                    Log.Instance.Info($"Eliminati {eliminati} files EMF temporanei da area temp");
                 }
             }
             catch (Exception exc)

VersGen/VersGen.cs

@@ -3,7 +3,7 @@
 // the next time this code is regenerated.
 //
 using System.Reflection; 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyCopyright("Steamware © 2006-2020")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
+[assembly: AssemblyCopyright("Steamware © 2006-2021")]
 [assembly: AssemblyCompany("Steamware")]

VersGen/VersGen.tt

@@ -4,7 +4,7 @@
 // the next time this code is regenerated.
 //
 using System.Reflection; 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
 [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]