Skip to content

Commit

Permalink
add size property for packages
Browse files Browse the repository at this point in the history
  • Loading branch information
zeusongit committed Jul 24, 2024
1 parent 06f3c7e commit 5d98992
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/GregClient/GregClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Days>$([MSBuild]::Multiply($(TotalDays), 10))</Days>
<Hours>$([MSBuild]::Divide($([System.DateTime]::get_Now().get_TimeOfDay().get_TotalHours()), 3))</Hours>
<Revision>$([MSBuild]::Add($(Days), $(Hours)).ToString('F0'))</Revision>
<Version>3.0.2.$(Revision)</Version>
<Version>3.0.3.$(Revision)</Version>
<GeneratedAssemblyInfoFile>$(MSBuildProjectDirectory)/$(AppDesignerFolder)/AssemblyVersionInfo.cs</GeneratedAssemblyInfoFile>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
Expand Down
35 changes: 31 additions & 4 deletions src/GregClient/Requests/PackageUploadRequestBody.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ namespace Greg.Requests
{
public class PackageUploadRequestBody : PackageVersionUploadRequestBody
{
public string license { get; set; }

//public parameterless constructor used for system.text.json deserialization.
public PackageUploadRequestBody()
{
}

[Obsolete("This constructor will be removed in a future release of PackageManagerClient.")]
public PackageUploadRequestBody(string name, string version, string description,
IEnumerable<string> keywords, string license,
string contents, string engine, string engineVersion,
Expand Down Expand Up @@ -40,9 +43,33 @@ public PackageUploadRequestBody(string name, string version, string description,
this.license = license;
}




public string license { get; set; }
public PackageUploadRequestBody(string name, string version, string description,
IEnumerable<string> keywords, string license,
string contents, string engine, string engineVersion,
string metadata, string group, IEnumerable<PackageDependency> dependencies,
string siteUrl, string repositoryUrl, bool containsBinaries,
IEnumerable<string> nodeLibraryNames, IEnumerable<string> hostDependencies,
string copyright_holder, string copyright_year, string size)
{
this.name = name;
this.version = version;
this.description = description;
this.keywords = keywords;
this.dependencies = dependencies;
this.contents = contents;
this.engine = engine;
this.group = group;
this.engine_version = engineVersion;
this.engine_metadata = metadata;
this.site_url = siteUrl;
this.repository_url = repositoryUrl;
this.contains_binaries = containsBinaries;
this.node_libraries = nodeLibraryNames;
this.license = license;
this.host_dependencies = hostDependencies;
this.copyright_holder = copyright_holder;
this.copyright_year = copyright_year;
this.size = size;
}
}
}
52 changes: 52 additions & 0 deletions src/GregClient/Requests/PackageVersionUploadRequestBody.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public PackageVersionUploadRequestBody()
/// <param name="hostDependencies"> external programs this package depends on.</param
/// <param name="copyright_holder">Copyright Holder's name</param>
/// <param name="copyright_year">Year the copyright was put into effect.</param>
[Obsolete("This constructor will be removed in a future release of PackageManagerClient.")]
public PackageVersionUploadRequestBody(string name, string version, string description,
IEnumerable<string> keywords,
string contents, string engine, string engineVersion,
Expand Down Expand Up @@ -61,6 +62,56 @@ public PackageVersionUploadRequestBody(string name, string version, string descr
this.node_libraries = nodeLibraryNames;
}

/// <summary>
/// Constructor which can be used to set hostDependencies
/// </summary>
/// <param name="name">Package name</param>
/// <param name="version">Package version</param>
/// <param name="description">Package description</param>
/// <param name="keywords">Package keywords for quick identification</param>
/// <param name="contents">Package content description</param>
/// <param name="engine">Package engine name, usually is set to Dynamo</param>
/// <param name="engineVersion">Package engine version, usually is set to use Dynamo version</param>
/// <param name="metadata"></param>
/// <param name="group"></param>
/// <param name="dependencies">Package dependencies</param>
/// <param name="siteUrl"></param>
/// <param name="repositoryUrl"></param>
/// <param name="containsBinaries">boolean flag indicating if the package contains binaries</param>
/// <param name="nodeLibraryNames"></param>
/// <param name="hostDependencies"> external programs this package depends on.</param
/// <param name="copyright_holder">Copyright Holder's name</param>
/// <param name="copyright_year">Year the copyright was put into effect.</param>
/// <param name="size">Size of the package content.</param>
public PackageVersionUploadRequestBody(string name, string version, string description,
IEnumerable<string> keywords,
string contents, string engine, string engineVersion,
string metadata, string group, IEnumerable<PackageDependency> dependencies,
string siteUrl, string repositoryUrl, bool containsBinaries,
IEnumerable<string> nodeLibraryNames, IEnumerable<string> hostDependencies,
string copyright_holder, string copyright_year, string size)

{
this.host_dependencies = hostDependencies;
this.copyright_holder = copyright_holder;
this.copyright_year = copyright_year;
this.name = name;
this.version = version;
this.description = description;
this.dependencies = dependencies;
this.keywords = keywords;
this.contents = contents;
this.engine = engine;
this.group = group;
this.engine_version = engineVersion;
this.engine_metadata = metadata;
this.site_url = siteUrl;
this.repository_url = repositoryUrl;
this.contains_binaries = containsBinaries;
this.node_libraries = nodeLibraryNames;
this.size = size;
}



public string file_hash { get; set; }
Expand All @@ -82,5 +133,6 @@ public PackageVersionUploadRequestBody(string name, string version, string descr
public IEnumerable<string> node_libraries { get; set; }
public string copyright_holder { get; set; }
public string copyright_year { get; set; }
public string size { get; set; }
}
}
6 changes: 3 additions & 3 deletions src/GregClientTests/GregClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void UploadDynamoPackageVersionTest()
var keywords = new List<string>() { "neat", "ok" };
var nv = new PackageVersionUploadRequestBody("Third .NET Package", "2.1.0", "", keywords, "contents", "dynamo", "0.1.0", "metadata", "group",
new List<PackageDependency>() { new PackageDependency("peter", "0.1.0"), new PackageDependency("stephen", "0.1.0") }, "", "",
false, new List<String>(), new List<String>(), "Dynamo Team", "2021");
false, new List<String>(), new List<String>(), "Dynamo Team", "2021", "2048");

var files = new List<string>() { "../test/pedro.dyf", "../test/RootNode.dyf" };
var request = new PackageVersionUpload(nv, files);
Expand All @@ -70,7 +70,7 @@ public void UploadDynamoPackageWithHostDependencyTest()
var keywords = new List<string>() { "Civil" };
var nv = new PackageVersionUploadRequestBody("Third .NET Package", "2.1.0", "", keywords, "contents", "dynamo", "0.1.0", "metadata", "group",
new List<PackageDependency>() { new PackageDependency("Ram", "0.1.0"), new PackageDependency("Ian", "0.1.0") }, "", "",
false, new List<String>(), new List<String>() { "Civil3D" }, "Dynamo Team", "2021");
false, new List<String>(), new List<String>() { "Civil3D" }, "Dynamo Team", "2021", "2048");

var files = new List<string>() { "../test/pedro.dyf", "../test/RootNode.dyf" };
var request = new PackageVersionUpload(nv, files);
Expand All @@ -83,7 +83,7 @@ public void UploadDynamoPackageVersionWithFilesTest()
{
var keywords = new List<string>() { "neat", "ok" };
var nv = new PackageVersionUploadRequestBody("Third .NET Package", "2.1.0", "", keywords, "contents", "dynamo", "0.1.0", "metadata", "group",
new List<PackageDependency>() { new PackageDependency("peter", "0.1.0"), new PackageDependency("stephen", "0.1.0") }, "", "", false, new List<String>(), new List<String>(), "", "");
new List<PackageDependency>() { new PackageDependency("peter", "0.1.0"), new PackageDependency("stephen", "0.1.0") }, "", "", false, new List<String>(), new List<String>(), "", "", "");

var files = new List<string>() {Assembly.GetExecutingAssembly().Location };

Expand Down

0 comments on commit 5d98992

Please sign in to comment.