Skip to content

Commit

Permalink
Added template files to resource file
Browse files Browse the repository at this point in the history
  • Loading branch information
@devedse
devedse committed Jul 25, 2020
1 parent a1d6877 commit 4f188e0
Show file tree
Hide file tree
Showing 8 changed files with 264 additions and 24 deletions.
6 changes: 3 additions & 3 deletions WebOptimizationProject/GitHubRepositoryOptimizer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ public async Task GoOptimize(string repositoryOwner, string repositoryName, stri

await _git.RunHubCommand("add .");

var descriptionForCommit = await TemplatesHandler.GetDescriptionForCommit();
var descriptionForCommit = TemplatesHandler.GetDescriptionForCommit();
await _git.Commit("Wop optimized this repository", descriptionForCommit);
await _git.RunHubCommand($"push");

var descriptionForPullRequest = await TemplatesHandler.GetDescriptionForPullRequest();
var descriptionForPullRequest = TemplatesHandler.GetDescriptionForPullRequest();

//Only create pull request if there were actually any successful optimizations
if (optimizedFileResults.Any(t => t.OptimizationResult == OptimizationResult.Success) && optimizedFileResults.Sum(t => t.OriginalSize) > optimizedFileResults.Sum(t => t.OptimizedSize))
Expand Down Expand Up @@ -141,7 +141,7 @@ public async Task GoOptimize(string repositoryOwner, string repositoryName, stri
commitCount = splittedBody.Count(t => t.StartsWith(commitIdentifier));
}

var descriptionForCommitInPr = await TemplatesHandler.GetCommitDescriptionForPullRequest(clonedRepo, branchName, optimizedFileResults, commitCount + 1);
var descriptionForCommitInPr = TemplatesHandler.GetCommitDescriptionForPullRequest(clonedRepo, branchName, optimizedFileResults, commitCount + 1);

bodySb.AppendLine();
bodySb.AppendLine();
Expand Down
20 changes: 8 additions & 12 deletions WebOptimizationProject/Helpers/TemplatesHandler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
using DeveImageOptimizer;
using DeveImageOptimizer.Helpers;
using DeveImageOptimizer.State;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using WebOptimizationProject.Resources;

namespace WebOptimizationProject.Helpers
{
public static class TemplatesHandler
{
public static async Task<string> GetDescriptionForPullRequest()
public static string GetDescriptionForPullRequest()
{
var filePath = Path.Combine(FolderHelperMethods.Internal_AssemblyDirectory.Value, "PullRequestMarkdownTemplate.txt");
var templateText = await Task.Run(() => File.ReadAllText(filePath));
var templateText = Templates.PullRequestMarkdownTemplate;


//var stringForCommitDetails = await GetCommitDescriptionForPullRequest(optimizedFileResults, 1);
Expand All @@ -25,10 +23,9 @@ public static async Task<string> GetDescriptionForPullRequest()
return templateText;
}

public static async Task<string> GetCommitDescriptionForPullRequest(string clonedRepoPath, string branchName, IEnumerable<OptimizableFile> optimizedFileResults, int commitNumber)
public static string GetCommitDescriptionForPullRequest(string clonedRepoPath, string branchName, IEnumerable<OptimizableFile> optimizedFileResults, int commitNumber)
{
var filePath = Path.Combine(FolderHelperMethods.Internal_AssemblyDirectory.Value, "CommitInPullRequestMarkdownTemplate.txt");
var templateText = await Task.Run(() => File.ReadAllText(filePath));
var templateText = Templates.CommitInPullRequestMarkdownTemplate;

templateText = templateText.Replace("{CommitNumber}", commitNumber.ToString());
templateText = templateText.Replace("{SupportedFileExtensions}", string.Join(" ", ConstantsAndConfig.ValidExtensions));
Expand All @@ -37,7 +34,7 @@ public static async Task<string> GetCommitDescriptionForPullRequest(string clone
var totalBytesBefore = optimizedFileResults.Sum(t => t.OriginalSize);
var totalBytesSaved = optimizedFileResults.Where(t => t.OptimizationResult == OptimizationResult.Success).Sum(t => t.OriginalSize - t.OptimizedSize);
var totalBytesAfter = totalBytesBefore - totalBytesSaved;
var percentageRemaining = Math.Round((double)totalBytesAfter / (double)totalBytesBefore * 100.0, 2);
var percentageRemaining = Math.Round(totalBytesAfter / (double)totalBytesBefore * 100.0, 2);

var timeSpan = TimeSpan.Zero;
foreach (var duration in optimizedFileResults.Select(t => t.Duration))
Expand Down Expand Up @@ -89,10 +86,9 @@ public static async Task<string> GetCommitDescriptionForPullRequest(string clone
return templateText;
}

public static async Task<string> GetDescriptionForCommit()
public static string GetDescriptionForCommit()
{
var filePath = Path.Combine(FolderHelperMethods.Internal_AssemblyDirectory.Value, "CommitMarkdownTemplate.txt");
var templateText = await Task.Run(() => File.ReadAllText(filePath));
var templateText = Templates.CommitMarkdownTemplate;

return templateText;
}
Expand Down
0 ...t/CommitInPullRequestMarkdownTemplate.txt → ...s/CommitInPullRequestMarkdownTemplate.txt
View file
File renamed without changes.
0 ...izationProject/CommitMarkdownTemplate.txt → ...ject/Resources/CommitMarkdownTemplate.txt
View file
File renamed without changes.
0 ...onProject/PullRequestMarkdownTemplate.txt → ...Resources/PullRequestMarkdownTemplate.txt
View file
File renamed without changes.
111 changes: 111 additions & 0 deletions WebOptimizationProject/Resources/Templates.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 130 additions & 0 deletions WebOptimizationProject/Resources/Templates.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="CommitInPullRequestMarkdownTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>CommitInPullRequestMarkdownTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="CommitMarkdownTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>CommitMarkdownTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="PullRequestMarkdownTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>PullRequestMarkdownTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
</root>
21 changes: 12 additions & 9 deletions WebOptimizationProject/WebOptimizationProject.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,18 @@
</ItemGroup>

<ItemGroup>
<None Update="CommitInPullRequestMarkdownTemplate.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="CommitMarkdownTemplate.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="PullRequestMarkdownTemplate.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Compile Update="Resources\Templates.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Templates.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources\Templates.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Templates.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

</Project>

0 comments on commit 4f188e0

Please sign in to comment.