<%: traduci("TaskRunning") %>
diff --git a/NKC_WF/site/UpdMan.aspx.cs b/NKC_WF/site/UpdMan.aspx.cs
index 97b1e6d..7837fd1 100644
--- a/NKC_WF/site/UpdMan.aspx.cs
+++ b/NKC_WF/site/UpdMan.aspx.cs
@@ -1,4 +1,5 @@
-using SteamWare;
+using AppData;
+using SteamWare;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -11,8 +12,23 @@ namespace NKC_WF.site
{
public partial class UpdMan : BasePage
{
+ protected DS_App.UpdManDataTable _tabPackages { get; set; } = new DS_App.UpdManDataTable();
+
+ protected DS_App.UpdManDataTable tabPackages
+ {
+ get
+ {
+ DS_App.UpdManDataTable tabella = _tabPackages;
+ if (tabella == null || tabella.Count == 0)
+ {
+ tabella = DLMan.taUpdMan.GetData();
+ }
+ return tabella;
+ }
+ }
protected void Page_Load(object sender, EventArgs e)
{
+ DataLayer DLMan = new DataLayer();
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
@@ -53,13 +69,12 @@ namespace NKC_WF.site
if (caller == "ALL")
{
int done = 0;
- // scarico TUTTI...
- done += updManAuth.downloadLatest(updateUrlAuth("NKC"), localDownloadPath("NKC"), "NKC");
- done += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
- // versione IIS
- //done += UpdateMan.obj.downloadLatest(updateUrl("NKC"), localDownloadPath("NKC"), "NKC");
- //done += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
+ foreach (var item in tabPackages)
+ {
+ doDownload(caller, item);
+ }
+
stopWatch.Stop();
// calcolo elapsed time come TimeSpan value.
TimeSpan ts = stopWatch.Elapsed;
@@ -67,8 +82,9 @@ namespace NKC_WF.site
}
else
{
- // scarico singolo target...
- UpdateMan.obj.downloadLatest(updateUrl(caller), localDownloadPath(caller), caller);
+
+ var riga = tabPackages.FindByAppName(caller);
+ doDownload(caller, riga);
// calcolo elapsed time come TimeSpan value.
TimeSpan ts = stopWatch.Elapsed;
resultsMsg = $"OK: {caller} downloaded, {ts.TotalSeconds:0.000} sec | {updateUrl(caller)} --> {localDownloadPath(caller)}";
@@ -78,18 +94,67 @@ namespace NKC_WF.site
lblOut.Text = resultsMsg;
}
+ private int doDownload(string caller, DS_App.UpdManRow riga)
+ {
+ int numDone = 0;
+ // modalità DB...
+ if (riga != null)
+ {
+ if (riga.IsAuth)
+ {
+ updManAuth.downloadLatest(updateUrlAuth(riga.AppName), localDownloadPath(riga.LocalRepo), riga.PackName);
+ numDone++;
+ }
+ else
+ {
+ UpdateMan.obj.downloadLatest(updateUrl(riga.AppName), localDownloadPath(riga.LocalRepo), riga.PackName);
+ numDone++;
+ }
+ }
+ // modalità LEGACY...
+ else
+ {
+ if (caller == "ALL")
+ {
+ // scarico TUTTI...
+ numDone += updManAuth.downloadLatest(updateUrlAuth("NKC"), localDownloadPath("NKC"), "NKC");
+ numDone += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
+
+ // versione IIS
+ //numDone += UpdateMan.obj.downloadLatest(updateUrl("NKC"), localDownloadPath("NKC"), "NKC");
+ //numDone += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
+ }
+ else
+ {
+ UpdateMan.obj.downloadLatest(updateUrl(caller), localDownloadPath(caller), caller);
+ numDone++;
+ }
+ }
+ return numDone;
+ }
+
public string Version(object package, object authUrl)
{
UpdateInfoEventArgs updArgs = new UpdateInfoEventArgs();
string answ = "a.b.c.d";
bool isAuth = false;
bool.TryParse($"{authUrl}", out isAuth);
- string remoteUrl = isAuth ? updateUrlAuth($"{package}") : updateUrl($"{package}");
// Recupero info...
- updArgs = UpdateMan.obj.getUpdateInfo(remoteUrl);
+ if (isAuth)
+ {
+ updArgs = updManAuth.getUpdateInfo(updateUrlAuth($"{package}"));
+ }
+ else
+ {
+ updArgs = UpdateMan.obj.getUpdateInfo(updateUrl($"{package}"));
+ }
if (updArgs.IsUpdateAvailable)
{
- answ = updArgs.CurrentVersion.ToString();
+ answ = $"{updArgs.CurrentVersion}";
+ }
+ else
+ {
+ answ = $"OK {updArgs.CurrentVersion}";
}
return answ;
}
@@ -104,14 +169,34 @@ namespace NKC_WF.site
///
protected string updateUrl(string package)
{
- return string.Format("http://seriate.steamware.net:8083/SWS/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers"));
+ string answ = "";
+ var riga = tabPackages.FindByAppName(package);
+ if (riga != null)
+ {
+ answ = riga.ManifestUrl;
+ }
+ else
+ {
+ answ = string.Format("http://seriate.steamware.net:8083/SWS/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers"));
+ }
+ return answ;
}
///
/// URL stringa di UPDATE su area che richiede Auth (nexus.steamware.net)...
///
protected string updateUrlAuth(string package)
{
- return string.Format("http://nexus.steamware.net/repository/SWS/{0}/{1}/LAST/{0}/{0}-.xml", package, memLayer.ML.CRS("appVers"));
+ string answ = "";
+ var riga = tabPackages.FindByAppName(package);
+ if (riga != null)
+ {
+ answ = riga.ManifestUrl;
+ }
+ else
+ {
+ answ = string.Format("http://nexus.steamware.net/repository/SWS/{0}/{1}/LAST/{0}/{0}-.xml", package, memLayer.ML.CRS("appVers"));
+ }
+ return answ;
}
///
/// Path locale dove scaricare gli installer
diff --git a/NKC_WF/site/UpdMan.aspx.designer.cs b/NKC_WF/site/UpdMan.aspx.designer.cs
index 2163659..3099ea6 100644
--- a/NKC_WF/site/UpdMan.aspx.designer.cs
+++ b/NKC_WF/site/UpdMan.aspx.designer.cs
@@ -24,31 +24,22 @@ namespace NKC_WF.site
protected global::System.Web.UI.WebControls.LinkButton lbtDownloadAll;
///
- /// lbtDownloadNKC control.
+ /// repDownlLink control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.LinkButton lbtDownloadNKC;
+ protected global::System.Web.UI.WebControls.Repeater repDownlLink;
///
- /// lbtDownloadZCode control.
+ /// ods control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.LinkButton lbtDownloadZCode;
-
- ///
- /// hlLPA control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.HyperLink hlLPA;
+ protected global::System.Web.UI.WebControls.ObjectDataSource ods;
///
/// UpdateProgressDisplay control.