diff --git a/hydeengine/siteinfo.py b/hydeengine/siteinfo.py index 24018dc2..e510b451 100644 --- a/hydeengine/siteinfo.py +++ b/hydeengine/siteinfo.py @@ -368,7 +368,8 @@ def target_folder(self): @property def temp_folder(self): temp_folder = self.site.temp_folder - return temp_folder.child_folder_with_fragment(self.url) + # return temp_folder.child_folder_with_fragment(self.url) + return temp_folder.child_folder_with_fragment(self.fragment) @property def fragment(self): @@ -432,7 +433,8 @@ def target_folder(self): @property def temp_folder(self): temp_folder = self.site.temp_folder - return temp_folder.child_folder_with_fragment(self.url) + # return temp_folder.child_folder_with_fragment(self.url) + return temp_folder.child_folder_with_fragment(self.fragment) class SiteInfo(SiteNode): def __init__(self, settings, site_path): diff --git a/hydeengine/url.py b/hydeengine/url.py index 0cfcacd3..3b66dbea 100644 --- a/hydeengine/url.py +++ b/hydeengine/url.py @@ -2,6 +2,7 @@ Utility functions for dealing with urls. """ +import sys def join(parent, child): """ @@ -19,6 +20,8 @@ def fixslash(url, relative=True): otherwise ensures it is not. """ + if sys.platform == 'win32': + url = url.replace('\\', '/') url = url.strip("/") if relative: url = "/" + url @@ -31,7 +34,6 @@ def clean_url(url): Removes .html from the url if it exists. """ - parts = url.rsplit(".", 1) if parts[1] == "html": return parts[0]