Added simple static asset handling
This commit is contained in:
parent
8fdf4dd0c7
commit
97629ca1c3
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
After Width: | Height: | Size: 910 B |
|
@ -5,15 +5,19 @@ sys.path.append('../')
|
||||||
|
|
||||||
from verdandi.verdandi import Verdandi
|
from verdandi.verdandi import Verdandi
|
||||||
from verdandi.modules.page import Page
|
from verdandi.modules.page import Page
|
||||||
|
from verdandi.modules.commonassets import CommonAssets
|
||||||
|
|
||||||
class TestPage1(Page):
|
class TestPage1(Page):
|
||||||
title = "A cool new Page"
|
title = "A cool new Page"
|
||||||
menu_title = "New Page"
|
menu_title = "New Page"
|
||||||
menu_label = "new_cool_page"
|
menu_label = "new_cool_page"
|
||||||
|
|
||||||
|
|
||||||
class TestPage2(Page):
|
class TestPage2(Page):
|
||||||
title = "An other cool Page"
|
title = "An other cool Page"
|
||||||
|
assets = [('img/foo.png', 'img/'),
|
||||||
|
('img/foo.png', 'img/bar.png'),
|
||||||
|
('img/foo.png', 'img/bar')]
|
||||||
url = "page2.html"
|
url = "page2.html"
|
||||||
menu_title = "Other new Page"
|
menu_title = "Other new Page"
|
||||||
menu_label = "cool_page1"
|
menu_label = "cool_page1"
|
||||||
|
@ -26,11 +30,15 @@ class TestPage3(Page):
|
||||||
menu_parent = "cool_page1"
|
menu_parent = "cool_page1"
|
||||||
url = "subdir/page3.html"
|
url = "subdir/page3.html"
|
||||||
|
|
||||||
|
class Assets(CommonAssets):
|
||||||
|
assets = [('img', 'img/dir'),
|
||||||
|
('img/', 'img/files')]
|
||||||
|
|
||||||
class TestBlog(Verdandi):
|
class TestBlog(Verdandi):
|
||||||
modules = [TestPage1(),
|
modules = [TestPage1(),
|
||||||
TestPage2(),
|
TestPage2(),
|
||||||
TestPage3()]
|
TestPage3(),
|
||||||
|
Assets()]
|
||||||
|
|
||||||
|
|
||||||
testblog = TestBlog()
|
testblog = TestBlog()
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
#!/usr/bin/env python2
|
#!/usr/bin/env python2
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
|
||||||
from verdandi.constants import CONTENT_DIRECTORY
|
from verdandi.constants import CONTENT_DIRECTORY
|
||||||
|
|
||||||
|
|
||||||
class AssetsMixin(object):
|
class AssetsMixin(object):
|
||||||
|
|
||||||
assets = []
|
assets = []
|
||||||
content_directory = CONTENT_DIRECTORY
|
asset_directory = CONTENT_DIRECTORY
|
||||||
|
|
||||||
|
|
||||||
def get_assets(self):
|
def get_assets(self):
|
||||||
|
@ -14,4 +17,51 @@ class AssetsMixin(object):
|
||||||
def collect_assets(self, output_directory):
|
def collect_assets(self, output_directory):
|
||||||
assets = self.get_assets()
|
assets = self.get_assets()
|
||||||
|
|
||||||
|
for source, destination in assets:
|
||||||
|
source_path = os.path.join(self.asset_directory, source)
|
||||||
|
dest_path = os.path.join(output_directory, destination);
|
||||||
|
|
||||||
|
if os.path.isdir(source_path):
|
||||||
|
self.copy_dir(source_path, dest_path)
|
||||||
|
elif os.path.isfile(source_path):
|
||||||
|
self.copy_file(source_path, dest_path)
|
||||||
|
else:
|
||||||
|
print "Skipping %s is neither directory nor file" % source_path
|
||||||
|
|
||||||
|
|
||||||
|
def copy_file(self, source_path, dest_path):
|
||||||
|
print "Copying %s to %s" % (source_path, dest_path)
|
||||||
|
|
||||||
|
dest_dir = os.path.dirname(dest_path)
|
||||||
|
|
||||||
|
if not os.path.exists(dest_dir):
|
||||||
|
os.makedirs(dest_dir)
|
||||||
|
shutil.copy(source_path, dest_path)
|
||||||
|
|
||||||
|
|
||||||
|
def copy_dir(self, source_path, dest_path):
|
||||||
|
# /foo/bar /rofl -> contents of bar go to rofl/bar
|
||||||
|
# /foo/bar/ /rofl -> contests of bar got to rofl/
|
||||||
|
# Trailing slash on destination should have no effect
|
||||||
|
|
||||||
|
# Will be '' in case of a trailing slash: /foo/bar/ else bar
|
||||||
|
source_base = os.path.basename(source_path)
|
||||||
|
# /rofl will become /rofl/ if base is '' otherwise it will become /rofl/bar
|
||||||
|
dest_path = os.path.join(dest_path, source_base)
|
||||||
|
|
||||||
|
if not os.path.exists(dest_path):
|
||||||
|
os.makedirs(dest_path)
|
||||||
|
|
||||||
|
# Discover the whole tree and copy each file individually
|
||||||
|
for source_dir, _, files in os.walk(source_path):
|
||||||
|
rel_path = os.path.relpath(source_dir, source_path)
|
||||||
|
# Purely cosmetical for debug output
|
||||||
|
if rel_path == '.':
|
||||||
|
dest_dir = dest_path
|
||||||
|
else:
|
||||||
|
dest_dir = os.path.join(dest_path, rel_path)
|
||||||
|
|
||||||
|
for source_file in files:
|
||||||
|
file_source_path = os.path.join(source_dir, source_file)
|
||||||
|
file_dest_path = os.path.join(dest_dir, source_file)
|
||||||
|
self.copy_file(file_source_path, file_dest_path)
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
#!/usr/bin/env python2
|
||||||
|
|
||||||
|
from verdandi.mixins.assetsmixin import AssetsMixin
|
||||||
|
from verdandi.mixins.messagemixin import MessageMixin
|
||||||
|
from verdandi.mixins.rendermixin import RenderMixin
|
||||||
|
|
||||||
|
class CommonAssets(AssetsMixin, MessageMixin, RenderMixin):
|
||||||
|
pass
|
|
@ -6,9 +6,10 @@ import markdown
|
||||||
|
|
||||||
from verdandi.mixins.templatemixin import TemplateMixin
|
from verdandi.mixins.templatemixin import TemplateMixin
|
||||||
from verdandi.mixins.menuitemmixin import MenuItemMixin
|
from verdandi.mixins.menuitemmixin import MenuItemMixin
|
||||||
|
from verdandi.mixins.assetsmixin import AssetsMixin
|
||||||
from verdandi.constants import CONTENT_DIRECTORY
|
from verdandi.constants import CONTENT_DIRECTORY
|
||||||
|
|
||||||
class Page(MenuItemMixin, TemplateMixin):
|
class Page(MenuItemMixin, TemplateMixin, AssetsMixin):
|
||||||
|
|
||||||
title = "Page Title"
|
title = "Page Title"
|
||||||
content_file = "content.md"
|
content_file = "content.md"
|
||||||
|
|
Loading…
Reference in New Issue