Skip to content

Commit

Permalink
Merge pull request #12 from koechlm/2024.1
Browse files Browse the repository at this point in the history
2024.1
  • Loading branch information
koechlm authored Jul 26, 2023
2 parents 251c7ce + e6fff28 commit a041dca
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Deploy/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("C716965C-8440-4490-A9D8-1A4C2C35D056")]

[assembly: AssemblyVersion("2024.0.0.0")]
[assembly: AssemblyFileVersion("2024.0.0.0")]
[assembly: AssemblyVersion("2024.1.0.1")]
[assembly: AssemblyFileVersion("2024.1.0.1")]
15 changes: 14 additions & 1 deletion Thunderdome/DeploymentController/SavedSearchesController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,28 @@ public override void SetMoveOperations(string folder, UtilSettings utilSettings)
string serverName = AutodeskPathUtil.GetServerSettingsFolderName(Connection);
string localSettingFolder = AutodeskPathUtil.GetCurrentVaultCommonFolder(Connection, serverName, VaultName);
string searchesPath = Path.Combine(localSettingFolder, FolderSearches);
string filename = null;
foreach (string searchPath in DirectoryUtil.GetFilesOrEmpty(folder))
{
string filename = Path.GetFileName(searchPath);
filename = Path.GetFileName(searchPath);
utilSettings.FileMoveOperations.Add(new FileMove
{
From = searchPath,
To = Path.Combine(searchesPath, filename)
});
}
//add the group settings file
string searchGroupPath = Path.Combine(localSettingFolder, (FolderSearches + '\\' + SearchesGroups));
string grpfolder = Path.Combine(folder, "Groups");
foreach (string searchPath in DirectoryUtil.GetFilesOrEmpty(grpfolder))
{
filename = Path.GetFileName(searchPath);
utilSettings.FileMoveOperations.Add(new FileMove
{
From = searchPath,
To = Path.Combine(searchGroupPath, filename)
});
}
}
catch
{
Expand Down
10 changes: 10 additions & 0 deletions Thunderdome/DeploymentController/VaultFoldersController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ public async Task<DeploymentVaultFolder> AddFolderAsync(string vaultFolder, stri
IO.Directory.CreateDirectory(tmpLocalFolder);

var downloadResults = await Util.VaultUtil.DownloadFolderAsync(Connection, folder, true, false, tmpLocalFolder);

//delete _V folders from temp location; avoid to re-destribute _V folders
string[] _VFolders = IO.Directory.GetDirectories(tmpLocalFolder, "_V", IO.SearchOption.AllDirectories);
if (_VFolders.Length > 0)
{
foreach (string _VFldr in _VFolders)
{
FileUtil.DeleteDirectory(_VFldr, false);
}
}
FileUtil.RemoveReadOnly(downloadResults.FileResults.Select(f => f.LocalPath.FullPath));

var configFilePath = IO.Path.Combine(tmpLocalFolder, ConfigNames[0]);
Expand Down
31 changes: 20 additions & 11 deletions Thunderdome/Model/DeploymentFolder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,32 @@ private void ZipFolder(ZipFile zip, string key, string currentPath)

foreach (string file in DirectoryUtil.GetFilesOrEmpty(currentPath))
{
string subPath = System.IO.Path.GetDirectoryName(file);
subPath = subPath.Remove(0, Path.Length);
subPath = subPath.Replace('\\', '/');
subPath = subPath.TrimStart('/');
if (file.EndsWith(".v"))
{
continue;
}
else
{
string subPath = System.IO.Path.GetDirectoryName(file);
subPath = subPath.Remove(0, Path.Length);
subPath = subPath.Replace('\\', '/');
subPath = subPath.TrimStart('/');

string zipPath;
string zipPath;

if (subPath.Length > 0)
zipPath = key + "/" + folderName + "/" + subPath + "/" + System.IO.Path.GetFileName(file);
else
zipPath = key + "/" + folderName + "/" + System.IO.Path.GetFileName(file);
if (subPath.Length > 0)
zipPath = key + "/" + folderName + "/" + subPath + "/" + System.IO.Path.GetFileName(file);
else
zipPath = key + "/" + folderName + "/" + System.IO.Path.GetFileName(file);

zip.Add(new FileDataSource(file), zipPath);
}

zip.Add(new FileDataSource(file), zipPath);
}

foreach (string folder in DirectoryUtil.GetDirectoriesOrEmpty(currentPath))
ZipFolder(zip, key, folder);
if (!folder.Contains("_V"))
ZipFolder(zip, key, folder);
}
}
}
4 changes: 2 additions & 2 deletions Thunderdome/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("129EBB30-24B6-4635-AE20-46BF10EF3B12")]

[assembly: AssemblyVersion("2024.0.0.0")]
[assembly: AssemblyFileVersion("2024.0.0.0")]
[assembly: AssemblyVersion("2024.1.0.1")]
[assembly: AssemblyFileVersion("2024.1.0.1")]
1 change: 1 addition & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Thunderdome is open source. You are expected to build your individual applicatio

RELEASE NOTES:
---------------------------------
2024.1.0: exclude _V folders and *.v files
2024.0.0: updated for 2024 compatibility
2023.0: updated for 2023
2022.1: Support for Saved Searches Groups added; Minor updates on the Tools->Thunderdome Pullout-Menu
Expand Down

0 comments on commit a041dca

Please sign in to comment.