Skip to content
This repository was archived by the owner on Jun 25, 2020. It is now read-only.

Run on Mono #253

Merged
merged 19 commits into from
Aug 10, 2015
Merged

Run on Mono #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
48fa47b
Using Path combine instead of \'s
Jul 20, 2015
21f9478
Fixing resource files for case sensitive systems
Jul 20, 2015
f5edb2b
Fixing paths for files baked
Jul 20, 2015
5f9a0ef
Fixing post pages paths
Jul 20, 2015
5948a91
Fix MapToOutputPath
Jul 20, 2015
fff6e59
Fixing permalinks baked posts
Jul 21, 2015
df0fa7c
Reverting GetTitle to Regex. Fixing Regex for Unix.
Jul 21, 2015
a61d352
Using Path combine instead of \'s
thiagojedi Jul 24, 2015
db64347
Fixing resource files for case sensitive systems
thiagojedi Jul 24, 2015
0a94c61
Fixing paths for files baked
thiagojedi Jul 24, 2015
05c09c3
Fixing post pages paths
thiagojedi Jul 24, 2015
c041da1
Fix MapToOutputPath
thiagojedi Jul 24, 2015
5533053
Fixing permalinks baked posts
thiagojedi Jul 24, 2015
840862c
Reverting GetTitle to Regex. Fixing Regex for Unix.
thiagojedi Jul 24, 2015
f8f004d
Merge branch 'unix_fixes' of https://github.com/thiagoabreu/pretzel.git
thiagojedi Jul 24, 2015
816ce1e
Fixing wordpress import path
thiagojedi Jul 29, 2015
69c9450
A better regex for time stamp and title
thiagojedi Jul 29, 2015
81f18cd
Using DirectorySeparatorChar for consistency and better understanding
thiagojedi Aug 3, 2015
9c4e49c
Merge remote-tracking branch 'upstream/master'
thiagojedi Aug 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Pretzel.Logic/Extensibility/Extensions/AzureHostSupport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public void MixIn(string directory)

foreach (var file in fileSystem.Directory.GetFiles(directory))
{
var trimStart = file.Replace(directory, string.Empty).TrimStart('/', '\\');
var trimStart = file.Replace(directory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
fileSystem.File.Move(file, Path.Combine(sourceFolder, trimStart));
}

foreach (var directoryToMove in fileSystem.Directory.GetDirectories(directory).Where(n => new DirectoryInfo(n).Name != "_source"))
{
var trimStart = directoryToMove.Replace(directory, string.Empty).TrimStart('/', '\\');
var trimStart = directoryToMove.Replace(directory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
fileSystem.Directory.Move(directoryToMove, Path.Combine(sourceFolder, trimStart));
}

Expand Down
5 changes: 3 additions & 2 deletions src/Pretzel.Logic/Import/WordpressImport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ private void ImportPost(WordpressPost p)

var yamlHeader = string.Format("---\r\n{0}---\r\n\r\n", header.ToYaml());
var postContent = yamlHeader + p.Content; //todo would be nice to convert to proper md
var fileName = string.Format(@"_posts\{0}-{1}.md", p.Published.ToString("yyyy-MM-dd"), p.PostName.Replace(' ', '-')); //not sure about post name
var postsFolder = "_posts";
var fileName = string.Format("{0}-{1}.md", p.Published.ToString("yyyy-MM-dd"), p.PostName.Replace(' ', '-')); //not sure about post name

fileSystem.File.WriteAllText(Path.Combine(pathToSite, fileName), postContent);
fileSystem.File.WriteAllText(Path.Combine(pathToSite, postsFolder, fileName), postContent);
}


Expand Down
2 changes: 1 addition & 1 deletion src/Pretzel.Logic/Minification/LessTransform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void Transform(SiteContext siteContext)


var n = cssfile.Replace(".css", ".less");
n = n.Replace('/', '\\');
n = n.Replace('/', Path.DirectorySeparatorChar);

var cssPageToCompile = siteContext.Pages.FirstOrDefault(f => f.OutputFile.Contains(n));
if (cssPageToCompile != null && !shouldCompile.Contains(cssPageToCompile))
Expand Down
6 changes: 3 additions & 3 deletions src/Pretzel.Logic/Properties/Liquid.Designer.cs
View file
Open in desktop

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

18 changes: 9 additions & 9 deletions src/Pretzel.Logic/Properties/Liquid.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,33 +119,33 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="About" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\about.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\About.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Atom" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\atom.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
<value>..\Resources\Liquid\Atom.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="Config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\config.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\Config.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="FirstPost" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\firstpost.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\FirstPost.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Liquid\Head.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Index" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\index.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\Index.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Layout" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\layout.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\Layout.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Post" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\post.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\Post.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Rss" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\rss.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\Rss.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Sitemap" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\liquid\sitemap.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Liquid\Sitemap.liquid;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
</root>
4 changes: 2 additions & 2 deletions src/Pretzel.Logic/Properties/Razor.Designer.cs
View file
Open in desktop

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

18 changes: 9 additions & 9 deletions src/Pretzel.Logic/Properties/Razor.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,33 +119,33 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="About" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\about.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\About.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Atom" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\atom.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\Atom.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\config.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\Config.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="FirstPost" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\firstpost.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\FirstPost.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Head" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Razor\Head.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Index" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\index.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\Index.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Layout" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\layout.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\Layout.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Post" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\post.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\Post.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Rss" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\rss.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Razor\Rss.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Sitemap" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razor\sitemap.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<value>..\Resources\Razor\Sitemap.cshtml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Pretzel.Logic/Properties/RazorCsProject.Designer.cs
View file
Open in desktop

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

30 changes: 15 additions & 15 deletions src/Pretzel.Logic/Properties/RazorCsProject.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,48 +119,48 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="AssemblyInfo_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\assemblyinfo_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\AssemblyInfo_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Category_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\category_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\Category_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="LayoutProject_csproj" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\layoutproject_csproj;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\LayoutProject_csproj;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="LayoutSolution_sln" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\layoutsolution_sln;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\LayoutSolution_sln;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NonProcessedPage_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\nonprocessedpage_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\NonProcessedPage_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NuGet_Config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\nuget_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\NuGet_Config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NuGet_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\nuget_exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\NuGet_exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NuGet_targets" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\nuget_targets;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\NuGet_targets;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="packages_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\packages_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\packages_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="PageContext_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\pagecontext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\PageContext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Page_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\page_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\Page_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Paginator_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\paginator_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\Paginator_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="SiteContext_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\sitecontext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\SiteContext_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Tag_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\tag_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\Tag_cs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Web_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\razorcsproject\web_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\RazorCsProject\Web_config;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
10 changes: 3 additions & 7 deletions src/Pretzel.Logic/Properties/RazorWiki.Designer.cs
View file
Open in desktop

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

Loading