Version 1.1.2

Author: gsimardnet

Client/CredentialWeb.cs

@@ -15,5 +15,15 @@ public class CredentialWeb : Credential
         /// URL address of the ressource
         /// </summary>
         public string Url { get; set; }
+
+        /// <summary>
+        /// Username value
+        /// </summary>
+        public string Username { get; set; }
+
+        /// <summary>
+        /// Password value
+        /// </summary>
+        public string Password { get; set; }
     }
 }

Engine/CommandCredentials.cs

@@ -38,46 +38,46 @@ public void SetCredentialFolder(string folderName)
             return;
         }
 
-        public void SetCredentialWeb(string url)
+        public void SetCredentialWeb(string url, string userName, string password)
         {
             DataSource dataSource = new DataSource("Web", url);
-            DataSourceSetting dataSourceSetting = new DataSourceSetting("Anonymous");
+            DataSourceSetting dataSourceSetting;
+            if (userName == null)
+                dataSourceSetting = new DataSourceSetting("Anonymous");
+            else
+                dataSourceSetting = DataSourceSetting.CreateUsernamePasswordCredential(userName, password);
 
             CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
-            
+
+
             return;
         }
 
         public void SetCredentialSQL(string sql, string userName, string password)
         {
             DataSource dataSource = new DataSource("SQL", sql);
+            DataSourceSetting dataSourceSetting;
             if (userName == null)
-            {
-                DataSourceSetting dataSourceSetting = new DataSourceSetting("Windows");
-                CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
-            }
+                dataSourceSetting = new DataSourceSetting("Windows");
             else
-            {
-                var dataSourceSetting = DataSourceSetting.CreateUsernamePasswordCredential(userName, password);
-                CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
-            }
+                dataSourceSetting = DataSourceSetting.CreateUsernamePasswordCredential(userName, password);
+
+            CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
 
             return;
         }
 
         public void SetCredentialOData(string url, string userName, string password)
         {
             DataSource dataSource = new DataSource("OData", url);
+            DataSourceSetting dataSourceSetting;
             if (userName == null)
-            {
-                DataSourceSetting dataSourceSetting = new DataSourceSetting("Anonymous");
-                CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
-            }
+                dataSourceSetting = new DataSourceSetting("Anonymous");
             else
-            {
-                var dataSourceSetting = DataSourceSetting.CreateUsernamePasswordCredential(userName, password);
-                CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
-            }
+                dataSourceSetting = DataSourceSetting.CreateUsernamePasswordCredential(userName, password);
+
+            CredentialStore.SetCredential(dataSource, dataSourceSetting, null);
+
 
             return;
         }

PQNet/Program.cs

@@ -58,7 +58,6 @@ static void Main(string[] args)
                     if (!string.IsNullOrWhiteSpace(a.OutputFile))
                         File.WriteAllText(a.OutputFile, "");
 
-                    //ExecuteRequest request = LoadRequest(a);
                     PowerQueryCommand powerQueryCommand = LoadCommand(a);
 
                     PowerQueryResponse powerQueryResponse = powerQueryService.Execute(powerQueryCommand);
@@ -122,8 +121,6 @@ private static PowerQueryCommand LoadCommand(Arguments a)
                     case ExecuteOutputFlags.Csv:
                         c.CsvFileName = a.OutputFile;
                         break;
-                    //case ExecuteOutputFlags.DataTable:
-                    //    break;
                     case ExecuteOutputFlags.Html:
                         c.HtmlFileName = a.OutputFile;
                         break;

Samples/PowerQueryApp/MyFiles/MyReport.xlsx

@@ -9,8 +9,9 @@ REM PQNet "AdventureWorksSales.pq" -c "#credentials.xml" -o html -f "%temp%\Adve
 REM PQNet "AdventureWorksSales.pq" -c "#credentials.xml" -o json -f "%temp%\AdventureWorksSales.json"
 REM PQNet "AdventureWorksSales.pq" -c "#credentials.xml" -o xml -f "%temp%\AdventureWorksSales.xml"
 REM PQNet "..\MyFiles\MyReport.pbix" vChineseCalendar -s "Data Source=.\SQL2016;Initial Catalog=master;Integrated Security=True" -t tChineseCalendar -a dc
+REM PQNet "..\MyFiles\MyReport.xlsx" vChineseCalendar
 @echo on
-PQNet "#Hello World.pq"
+PQNet "..\MyFiles\MyReport.xlsx" vChineseCalendar
 @echo off
 if %ERRORLEVEL% EQU 0 (
     echo Success

Samples/cmd/pqnet.cmd

@@ -23,10 +23,22 @@ public string MashupFromFile(string fileName)
         {
             try
             {
-                string tempFile = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()) + ".pbix";
-                File.Copy(fileName, tempFile);
-                string mashup = Command.MashupFromFile(tempFile);
-                File.Delete(tempFile);
+                string mashup = null;
+
+                try
+                {
+                    mashup = Command.MashupFromFile(fileName);
+                }
+                catch (Exception)
+                {
+                    string tempFile = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()) + Path.GetExtension(fileName);
+                    File.Copy(fileName, tempFile);
+
+                    mashup = Command.MashupFromFile(tempFile);
+
+                    File.Delete(tempFile);
+                }
+
                 return mashup;
             }
             catch (Exception ex)
@@ -189,11 +201,11 @@ public PowerQueryResponse Execute(PowerQueryCommand powerQueryCommand)
                         else if(credential is CredentialFolder credentialFolder)
                             commandCredentials.SetCredentialFolder(credentialFolder.Path);
                         else if (credential is CredentialWeb credentialWeb)
-                            commandCredentials.SetCredentialWeb(credentialWeb.Url);
+                            commandCredentials.SetCredentialWeb(credentialWeb.Url, credentialWeb.Username, credentialWeb.Password);
                         else if (credential is CredentialSQL credentialSQL)
                             commandCredentials.SetCredentialSQL(credentialSQL.SQL, credentialSQL.Username, credentialSQL.Password);
                         else if (credential is CredentialOData credentialOData)
-                            commandCredentials.SetCredentialOData(((CredentialOData)credential).Url, credentialOData.Username, credentialOData.Password);
+                            commandCredentials.SetCredentialOData(credentialOData.Url, credentialOData.Username, credentialOData.Password);
                         else
                             throw new NotImplementedException("This Credential kind is not supported for now.");
                     }

Service/PowerQueryService.cs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:sql="http://schemas.microsoft.com/wix/SqlExtension">
   <?include $(sys.CURRENTDIR)\Config.wxi?>  
-  <Product Id="95f93336-b7a9-4a68-acf5-1492ec0c5d72" Name="PowerQueryNet" Language="1033" Version="1.1.1" Manufacturer="Guillaume Simard" UpgradeCode="115ef465-536f-4030-bd2d-44b0edb1bbe5">
+  <Product Id="95f93336-b7a9-4a68-acf5-1492ec0c5d72" Name="PowerQueryNet" Language="1033" Version="1.1.2" Manufacturer="Guillaume Simard" UpgradeCode="115ef465-536f-4030-bd2d-44b0edb1bbe5">
     <Package Id="5e1dc07c-131a-43d4-8a98-4d091537ac0f" InstallPrivileges="elevated" InstallerVersion="200" Platform ="x64" Compressed="yes" InstallScope="perMachine" Languages="1033" SummaryCodepage="1252" Description="[ProductName]" />
     <Icon Id="PQNet.ico" SourceFile="Resources\PQNet.ico" />
     <Property Id="ARPPRODUCTICON" Value="PQNet.ico" />