change order of pip command line, set namespaces to library name if none are found

Author: JimSuplizio

eng/scripts/Language-Settings.ps1

@@ -146,7 +146,10 @@ function Get-python-DocsMsDevLanguageSpecificPackageInfo($packageInfo, $packageS
       if ($namespaces.Count -gt 0) {
         $packageInfo | Add-Member -Type NoteProperty -Name "Namespaces" -Value $namespaces
       } else {
-        LogWarning "Unable to find namespaces $($packageInfo.Name):$version"
+        LogWarning "Unable to find namespaces for $($packageInfo.Name):$version, using the package name."
+        $tempNamespaces = @()
+        $tempNamespaces += $packageInfo.Name
+        $packageInfo | Add-Member -Type NoteProperty -Name "Namespaces" -Value $tempNamespaces
       }
     }
   }

eng/scripts/docs/Docs-ToC.ps1

@@ -6,10 +6,11 @@ function Get-WhlFile {
       [Parameter(Mandatory=$true)] [string]$Destination,
       [Parameter(Mandatory=$false)] [string]$ExtraIndexUrl = ""
   )
-  $pipCommandArgs = "$Library==$Version"
+  $pipCommandArgs = ""
   if ($ExtraIndexUrl) {
-      $pipCommandArgs += " --extra-index-url $ExtraIndexUrl"
+      $pipCommandArgs += "--extra-index-url $ExtraIndexUrl "
   }
+  $pipCommandArgs += "$Library==$Version"
 
   # download the whl file
   Write-Host "pip download --quiet --only-binary :all: --dest $Destination --no-cache --no-deps $pipCommandArgs"
@@ -34,39 +35,39 @@ function Get-NamespacesFromWhlFile {
 
   try {
 
-      # Pulling the whl file generates output, make sure it's sent to null so
-      # it's not returned as part of this function.
-      $success = Get-WhlFile $Library $Version $destination $ExtraIndexUrl
-      if ($success) {
-
-          # Each library gets its own temporary directory. There should only be one whl
-          # file in the destination directory
-          $whlFile = Get-ChildItem -Path $destination -File -Filter "*.whl" | Select-Object -First 1
-          $unpackDir = Join-Path -Path $destination -ChildPath "$Library-$Version"
-          Expand-Archive -Path $whlFile -DestinationPath $unpackDir
-
-          # Look for any directory that contains __init__.py with the following exceptions:
-          # 1. *.dist-info directories shouldn't be included in the results.
-          # 2. If any subdirectory starts with "_" it's internal and needs to be skipped
-          # 3. If there's a root level directory named "azure" with an __init__.py file then
-          # needs to be skipped. This doesn't happen with libraries released from the
-          # azure-sdk-for-python repository but there are older libraries that are in the
-          # docs directories which are/were released outside of the repository where this
-          # is true.
-          $rootLevelAzureDir = Join-Path -Path $unpackDir -ChildPath "azure"
-          $namespaceDirs = Get-ChildItem -Path $unpackDir -Recurse -Filter "__init__.py" |
-              Where-Object{$_.DirectoryName -notlike "*.dist-info"} |
-              Where-Object{$_.DirectoryName -notlike "*$([IO.Path]::DirectorySeparatorChar)_*" } |
-              Where-Object{$_.DirectoryName -ine $rootLevelAzureDir}
-          foreach($namespaceDir in $namespaceDirs) {
-              # strip off the root directy, everything left will be subDir1/subDir2 which needs
-              $partialDir = $namespaceDir.DirectoryName.Replace($unpackDir + $([IO.Path]::DirectorySeparatorChar), "")
-              $namespaces += $partialDir.Replace([IO.Path]::DirectorySeparatorChar, ".")
-              # Since only the primary namespace is being pulled, break out of the loop after
-              # the first one.
-              break
-          }
-      }
+    # Pulling the whl file generates output, make sure it's sent to null so
+    # it's not returned as part of this function.
+    $success = Get-WhlFile $Library $Version $destination $ExtraIndexUrl
+    if ($success) {
+
+        # Each library gets its own temporary directory. There should only be one whl
+        # file in the destination directory
+        $whlFile = Get-ChildItem -Path $destination -File -Filter "*.whl" | Select-Object -First 1
+        $unpackDir = Join-Path -Path $destination -ChildPath "$Library-$Version"
+        Expand-Archive -Path $whlFile -DestinationPath $unpackDir
+
+        # Look for any directory that contains __init__.py with the following exceptions:
+        # 1. *.dist-info directories shouldn't be included in the results.
+        # 2. If any subdirectory starts with "_" it's internal and needs to be skipped
+        # 3. If there's a root level directory named "azure" with an __init__.py file then
+        # needs to be skipped. This doesn't happen with libraries released from the
+        # azure-sdk-for-python repository but there are older libraries that are in the
+        # docs directories which are/were released outside of the repository where this
+        # is true.
+        $rootLevelAzureDir = Join-Path -Path $unpackDir -ChildPath "azure"
+        $namespaceDirs = Get-ChildItem -Path $unpackDir -Recurse -Filter "__init__.py" |
+            Where-Object{$_.DirectoryName -notlike "*.dist-info"} |
+            Where-Object{$_.DirectoryName -notlike "*$([IO.Path]::DirectorySeparatorChar)_*" } |
+            Where-Object{$_.DirectoryName -ine $rootLevelAzureDir}
+        foreach($namespaceDir in $namespaceDirs) {
+            # strip off the root directy, everything left will be subDir1/subDir2 which needs
+            $partialDir = $namespaceDir.DirectoryName.Replace($unpackDir + $([IO.Path]::DirectorySeparatorChar), "")
+            $namespaces += $partialDir.Replace([IO.Path]::DirectorySeparatorChar, ".")
+            # Since only the primary namespace is being pulled, break out of the loop after
+            # the first one.
+            break
+        }
+    }
   }
   finally {
       # Clean up the temp directory if it was created