holger/Katteker
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: holger:ff424c6c1499eef59a398e0490f287011ff0d1c6
Branches Tags
holger:master
..
compare: holger:64a2c35c0c91ccf718f3f0b3fccdc242b04fb606
Branches Tags
holger:master

No commits in common. "ff424c6c1499eef59a398e0490f287011ff0d1c6" and "64a2c35c0c91ccf718f3f0b3fccdc242b04fb606" have entirely different histories.
ff424c6c14 ... 64a2c35c0c

15 changed files with 71 additions and 184 deletions
Show Stats Expand all files Collapse all files

2
Creator/Program.cs
View File

@ -144,7 +144,7 @@ namespace KattekerCreator
var pathToFile = Path.Combine(_tempDir, Constants.KattekerConfig);
var kattekerConfig = new KattekerConfig
{
Publish = _appArguments.PublishDir ?? _appArguments.OutputDir,
PublishDir = _appArguments.PublishDir ?? _appArguments.OutputDir,
Changelog = _appArguments.ChangeLog
};
kattekerConfig.WriteToFile(pathToFile);

13
Example/MainWindow.xaml
View File

@ -8,20 +8,11 @@
Title="MainWindow"
Width="800"
Height="450"
Background="#E20074"
Background="Chartreuse"
ContentRendered="MainWindow_OnContentRendered"
mc:Ignorable="d">
<StackPanel>
<Button Margin="10" FontSize="24" Content="Update" Click="ButtonBase_OnClick"></Button>
<TextBlock Margin="20" Text=":-)" FontSize="60" HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5" >
<TextBlock.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="90"/>
<TranslateTransform/>
</TransformGroup>
</TextBlock.RenderTransform>
</TextBlock>
<TextBlock Text=":-(" FontSize="60" HorizontalAlignment="Center" />
</StackPanel>
</Window>

4
Example/Properties/AssemblyInfo.cs
View File

@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.53")]
[assembly: AssemblyFileVersion("1.0.53")]
[assembly: AssemblyVersion("1.0.48")]
[assembly: AssemblyFileVersion("1.0.48")]

4
Katteker.Gui/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonMark.NET" version="0.15.1" targetFramework="net45" />
</packages>

15
Katteker/ChangelogHelper.cs
View File

@ -5,17 +5,8 @@ using System.Threading.Tasks;
namespace Katteker
{
/// <summary>
/// Helps handle the Changelog.
/// </summary>
public static class ChangelogHelper
{
/// <summary>
/// Format the Changelog as Html compilant file.s
/// </summary>
/// <param name="text"></param>
/// <param name="extension"></param>
/// <returns></returns>
public static string ChangelogAsHtml(this string text, string extension)
{
string result;
@ -36,12 +27,6 @@ namespace Katteker
return result;
}
/// <summary>
/// Load changelog from Web or use the local file, if it fails.
/// </summary>
/// <param name="filename"></param>
/// <param name="path"></param>
/// <returns></returns>
public static async Task<string> LoadChangelogAsync(string filename, string path)
{
if (!string.IsNullOrEmpty(filename) || !string.IsNullOrEmpty(path))

3
Katteker/Constants.cs
View File

@ -1,8 +1,5 @@
namespace Katteker
{
/// <summary>
/// A bunch of constants.
/// </summary>
public static class Constants
{
/// <summary>

2
Katteker/Katteker.csproj
View File

@ -49,7 +49,7 @@
<Compile Include="ReleaseEntry.cs" />
<Compile Include="Releases.cs" />
<Compile Include="Utility.cs" />
<Compile Include="VersionUtils.cs" />
<Compile Include="VersionExtension.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

21
Katteker/KattekerConfig.cs
View File

@ -4,31 +4,16 @@ using System.Runtime.Serialization.Json;
namespace Katteker
{
/// <summary>
/// Configuration of a Katteker-Deployment
/// </summary>
[DataContract]
public class KattekerConfig
{
/// <summary>
/// Publish path
/// </summary>
[DataMember]
public string Publish { get; set; }
public string PublishDir { get; set; }
/// <summary>
/// Name of the changelog file.
/// </summary>
[DataMember]
public string Changelog { get; set; }
/// <summary>
/// Read file and deserialize content.
/// </summary>
/// <param name="path">path of the file.</param>
/// <returns>this object</returns>
/// <exception cref="FileNotFoundException"></exception>
public static KattekerConfig ReadFromFile(string path)
{
if (!File.Exists(path)) throw new FileNotFoundException();
@ -40,10 +25,6 @@ namespace Katteker
}
}
/// <summary>
/// Serialize object and write to file.
/// </summary>
/// <param name="path">path of the file.</param>
public void WriteToFile(string path)
{
if (File.Exists(path)) File.Delete(path);

4
Katteker/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.4")]
[assembly: AssemblyFileVersion("1.0.4")]
[assembly: AssemblyVersion("1.0.3")]
[assembly: AssemblyFileVersion("1.0.3")]

63
Katteker/ReleaseEntry.cs
View File

@ -5,18 +5,12 @@ using Semver;
namespace Katteker
{
/// <summary>
/// Entry of a Release.
/// </summary>
public class ReleaseEntry : IComparable<ReleaseEntry>, IComparable
{
private const string FilenameRegex = @"(^.*)-((?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?).*-(full|delta)";
private const char Seperator = '|';
/// <summary>
/// Construct a new release entry.
/// </summary>
public ReleaseEntry(string filename, SemVersion version, long fileSize, bool isDelta, string sha1)
{
Filename = filename;
@ -26,10 +20,6 @@ namespace Katteker
SHA1 = sha1;
}
/// <summary>
/// Construct release entry from string.
/// </summary>
/// <exception cref="ArgumentOutOfRangeException"></exception>
public ReleaseEntry(string line)
{
var elements = line?.Split(Seperator);
@ -44,53 +34,23 @@ namespace Katteker
IsDelta = fileSegments.Groups[3].Value != "full";
}
/// <summary>
/// cunstruct release entry from application name and version.
/// </summary>
/// <param name="applicationName"></param>
/// <param name="version"></param>
public ReleaseEntry(string applicationName, SemVersion version)
{
ApplicationName = applicationName;
Version = version;
}
/// <summary>
/// Version
/// </summary>
public SemVersion Version { get; }
/// <summary>
/// Hashsum of the file.
/// </summary>
public string SHA1 { get; }
/// <summary>
/// filename
/// </summary>
public string Filename { get; }
/// <summary>
/// Size of the file.
/// </summary>
public long Filesize { get; }
/// <summary>
/// Is true if the update is delta file. False otherwise.
/// </summary>
public bool IsDelta { get; }
/// <summary>
/// Name of the application.
/// </summary>
public string ApplicationName { get; }
/// <summary>
/// Format the release entry as line for release file.
/// </summary>
public string EntryAsString => $"{SHA1}{Seperator}{Filename}{Seperator}{Filesize}";
/// <inheritdoc />
public override string ToString() => $"{ApplicationName} {Version}";
/// <inheritdoc />
public int CompareTo(object obj) => CompareTo(obj as ReleaseEntry);
/// <inheritdoc />
public int CompareTo(ReleaseEntry other)
{
if (ReferenceEquals(this, other)) return 0;
@ -100,20 +60,13 @@ namespace Katteker
return string.Compare(Filename, other.Filename, StringComparison.Ordinal);
}
/// <inheritdoc />
public override bool Equals(object obj) => Equals(obj as ReleaseEntry);
/// <summary>
/// Returns true if the instances are equal. False otherwise.
/// </summary>
/// <param name="other"></param>
/// <returns></returns>
protected bool Equals(ReleaseEntry other)
{
return Equals(Version, other.Version) && string.Equals(SHA1, other.SHA1) && string.Equals(Filename, other.Filename) && Filesize == other.Filesize && IsDelta == other.IsDelta;
}
/// <inheritdoc />
public override int GetHashCode()
{
unchecked
@ -127,14 +80,14 @@ namespace Katteker
}
}
/// <summary>
/// Returns true if the left and right instances are equal.
/// </summary>
public static bool operator ==(ReleaseEntry left, ReleaseEntry right) => Equals(left, right);
public static bool operator ==(ReleaseEntry left, ReleaseEntry right)
{
return Equals(left, right);
}
/// <summary>
/// Returns true if the left and right instances are not equal.
/// </summary>
public static bool operator !=(ReleaseEntry left, ReleaseEntry right) => !Equals(left, right);
public static bool operator !=(ReleaseEntry left, ReleaseEntry right)
{
return !Equals(left, right);
}
}
}

31
Katteker/Releases.cs
View File

@ -6,9 +6,6 @@ using Semver;
namespace Katteker
{
/// <summary>
/// This class represents the release file which will published.
/// </summary>
public class Releases : IEnumerable<ReleaseEntry>
{
private readonly string _filePath;
@ -20,9 +17,6 @@ namespace Katteker
ReleaseEntries = new SortedList<SemVersion, ReleaseEntry>();
}
/// <summary>
/// Constructor with the path as paramter.
/// </summary>
public Releases(string path) : this()
{
_filePath = Path.Combine(path, Constants.Release);
@ -30,9 +24,6 @@ namespace Katteker
AddRange(File.ReadAllLines(_filePath));
}
/// <summary>
/// Constructor with the enumerable content.
/// </summary>
public Releases(IEnumerable<string> content) : this()
{
AddRange(content);
@ -47,9 +38,6 @@ namespace Katteker
}
}
/// <summary>
/// Write release file to disk.
/// </summary>
public void WriteReleaseFile()
{
File.WriteAllLines(_filePath, ReleaseEntries.Select(x => x.Value.EntryAsString));
@ -73,23 +61,20 @@ namespace Katteker
{
ReleaseEntries.Remove(version);
}
ReleaseEntries.Add(version, entry);
}
return entry;
}
/// <summary>
/// Is true if the entry is the last entry.
/// </summary>
/// <param name="entry"></param>
/// <returns></returns>
public bool IsLatestEntry(ReleaseEntry entry) => entry.Equals(ReleaseEntries.LastOrDefault().Value);
public IEnumerator<ReleaseEntry> GetEnumerator()
{
return ReleaseEntries.Values.GetEnumerator();
}
/// <inheritdoc />
public IEnumerator<ReleaseEntry> GetEnumerator() => ReleaseEntries.Values.GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}
}

14
Katteker/UpdateInfo.cs
View File

@ -2,27 +2,15 @@
namespace Katteker
{
/// <summary>
/// Info about the updates.
/// </summary>
public class UpdateInfo
{
/// <summary>
/// Currently installed version.
/// </summary>
public ReleaseEntry CurrentlyInstalledVersion { get; }
/// <summary>
/// Releases to apply.
/// </summary>
public List<ReleaseEntry> ReleasesToApply { get; } = new List<ReleaseEntry>();
/// <summary>
/// Constructor
/// </summary>
public UpdateInfo(string applicationName, Releases releases)
{
CurrentlyInstalledVersion = new ReleaseEntry(applicationName, VersionUtils.GetCurrentVersion());
CurrentlyInstalledVersion = new ReleaseEntry(applicationName, VersionExtension.GetCurrentVersion);
foreach (var release in releases)
{
if (applicationName.Equals(release.ApplicationName) && release.Version > CurrentlyInstalledVersion.Version)

2
Katteker/UpdateManager.cs
View File

@ -53,7 +53,7 @@ namespace Katteker
public static UpdateManager Create(string urlOrPath = null, string applicationName = null, string rootDirectory = null)
{
_config = ReadConfigFile();
urlOrPath = urlOrPath ?? _config.Publish;
urlOrPath = urlOrPath ?? _config.PublishDir;
var appName = applicationName ?? Utility.GetApplicationName();
var rootAppDirectory = Path.Combine(rootDirectory ?? Utility.GetLocalAppDataDirectory(), appName);
return new UpdateManager(urlOrPath, appName, rootAppDirectory);

40
Katteker/VersionExtension.cs Normal file
View File

@ -0,0 +1,40 @@
using System;
using System.Reflection;
using Semver;
namespace Katteker
{
/// <summary>
/// Extension methods for the App-Version.
/// </summary>
public static class VersionExtension
{
/// <summary>
/// Get the current Version of Application.
/// </summary>
public static SemVersion GetCurrentVersion
{
get
{
var assemblyVersion = Assembly.GetEntryAssembly().GetName().Version.ToString(3);
var getCurrentVersion = SemVersion.Parse(assemblyVersion);
var informalVersion = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
if (informalVersion != null && SemVersion.TryParse(informalVersion, out var semVersion))
return semVersion;
return getCurrentVersion;
}
}
/// <summary>
/// Convert to cenventional System.Version instance.
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static Version ToSystemVersion(this SemVersion value) => new Version(value.Major, value.Minor, value.Patch, 0);
/// <summary>
/// Get the current Version of Application.
/// </summary>
public static string GetFullVersion => GetCurrentVersion.ToString();
}
}

37
Katteker/VersionUtils.cs
View File

@ -1,37 +0,0 @@
using System;
using System.Reflection;
using Semver;
namespace Katteker
{
/// <summary>
/// Utils for the App-Version.
/// </summary>
public static class VersionUtils
{
/// <summary>
/// Get the current Version of Application.
/// </summary>
public static SemVersion GetCurrentVersion()
{
var assemblyVersion = Assembly.GetEntryAssembly().GetName().Version.ToString(3);
var getCurrentVersion = SemVersion.Parse(assemblyVersion);
var informalVersion = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
if (informalVersion != null && SemVersion.TryParse(informalVersion, out var semVersion))
return semVersion;
return getCurrentVersion;
}
/// <summary>
/// Get the System.Version representation of a semantic version.
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static Version ToSystemVersion(this SemVersion value) => new Version(value.Major, value.Minor, value.Patch, 0);
/// <summary>
/// Get the current Version of Application.
/// </summary>
public static string GetFullVersion => GetCurrentVersion().ToString();
}
}