github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't delete the output dir as a default behaviour.

Browse source 
Fixes #107
This commit is contained in:
Alexis Metaireau 2011-05-07 19:27:33 +01:00
commit e09444fa89
4 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/settings.rst
View file

@ -46,7 +46,7 @@ Setting name (default value) what does it do?
`FEED` (``'feeds/all.atom.xml'``) relative url to output the atom feed. `FEED` (``'feeds/all.atom.xml'``) relative url to output the atom feed.
`FEED_RSS` (``None``, i.e. no RSS) relative url to output the rss feed. `FEED_RSS` (``None``, i.e. no RSS) relative url to output the rss feed.
`JINJA_EXTENSIONS` (``[]``) A list of any Jinja2 extensions you want to use. `JINJA_EXTENSIONS` (``[]``) A list of any Jinja2 extensions you want to use.
`KEEP_OUTPUT_DIRECTORY` (``False``) Keep the output directory and just update all `DELETE_OUTPUT_DIRECTORY` (``False``) Delete the output directory instead of just updating all
the generated files. the generated files.
`LOCALE` (''[2]_) Change the locale. `LOCALE` (''[2]_) Change the locale.
`MARKUP` (``('rst', 'md')``) A list of available markup languages you want `MARKUP` (``('rst', 'md')``) A list of available markup languages you want

23
pelican/__init__.py
View file

@ -14,7 +14,7 @@ VERSION = "2.6.0"
class Pelican(object): class Pelican(object):
def __init__(self, settings=None, path=None, theme=None, output_path=None, def __init__(self, settings=None, path=None, theme=None, output_path=None,
markup=None, keep=False): markup=None, delete_outputdir=False):
"""Read the settings, and performs some checks on the environment """Read the settings, and performs some checks on the environment
before doing anything else. before doing anything else.
""" """
@ -32,7 +32,7 @@ class Pelican(object):
output_path = output_path or settings['OUTPUT_PATH'] output_path = output_path or settings['OUTPUT_PATH']
self.output_path = os.path.realpath(output_path) self.output_path = os.path.realpath(output_path)
self.markup = markup or settings['MARKUP'] self.markup = markup or settings['MARKUP']
self.keep = keep or settings['KEEP_OUTPUT_DIRECTORY'] self.delete_outputdir = delete_outputdir or settings['DELETE_OUTPUT_DIRECTORY']
# find the theme in pelican.theme if the given one does not exists # find the theme in pelican.theme if the given one does not exists
if not os.path.exists(self.theme): if not os.path.exists(self.theme):
@ -55,7 +55,7 @@ class Pelican(object):
self.theme, self.theme,
self.output_path, self.output_path,
self.markup, self.markup,
self.keep self.delete_outputdir
) for cls in self.get_generator_classes() ) for cls in self.get_generator_classes()
] ]
@ -63,8 +63,10 @@ class Pelican(object):
if hasattr(p, 'generate_context'): if hasattr(p, 'generate_context'):
p.generate_context() p.generate_context()
# erase the directory if it is not the source # erase the directory if it is not the source and if that's
if os.path.realpath(self.path).startswith(self.output_path) and not self.keep: # explicitely asked
if (self.delete_outputdir and
os.path.realpath(self.path).startswith(self.output_path)):
clean_output_dir(self.output_path) clean_output_dir(self.output_path)
writer = self.get_writer() writer = self.get_writer()
@ -101,11 +103,9 @@ def main():
help='the list of markup language to use (rst or md). Please indicate ' help='the list of markup language to use (rst or md). Please indicate '
'them separated by commas') 'them separated by commas')
parser.add_argument('-s', '--settings', dest='settings', parser.add_argument('-s', '--settings', dest='settings',
help='the settings of the application. Default to None.') help='the settings of the application. Default to False.')
parser.add_argument('-k', '--keep-output-directory', dest='keep', parser.add_argument('-d', '--delete-output-directory', dest='delete_outputdir',
action='store_true', action='store_true', help='Delete the output directory.')
help='Keep the output directory and just update all the generated files.'
'Default is to delete the output directory.')
parser.add_argument('-v', '--verbose', action='store_const', const=log.INFO, dest='verbosity', parser.add_argument('-v', '--verbose', action='store_const', const=log.INFO, dest='verbosity',
help='Show all messages') help='Show all messages')
parser.add_argument('-q', '--quiet', action='store_const', const=log.CRITICAL, dest='verbosity', parser.add_argument('-q', '--quiet', action='store_const', const=log.CRITICAL, dest='verbosity',
@ -135,7 +135,8 @@ def main():
cls = getattr(module, cls_name) cls = getattr(module, cls_name)
try: try:
pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep) pelican = cls(settings, args.path, args.theme, args.output, markup,
args.delete_outputdir)
if args.autoreload: if args.autoreload:
while True: while True:
try: try:

2
pelican/settings.py
View file

@ -21,7 +21,7 @@ _DEFAULT_CONFIG = {'PATH': None,
'CSS_FILE': 'main.css', 'CSS_FILE': 'main.css',
'REVERSE_ARCHIVE_ORDER': False, 'REVERSE_ARCHIVE_ORDER': False,
'REVERSE_CATEGORY_ORDER': False, 'REVERSE_CATEGORY_ORDER': False,
'KEEP_OUTPUT_DIRECTORY': False, 'DELETE_OUTPUT_DIRECTORY': False,
'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls 'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
'RELATIVE_URLS': True, 'RELATIVE_URLS': True,
'DEFAULT_LANG': 'en', 'DEFAULT_LANG': 'en',

2
pelican/utils.py
View file

@ -62,7 +62,7 @@ def clean_output_dir(path):
# remove all the existing content from the output folder # remove all the existing content from the output folder
try: try:
pass # WEEEEE dont kill shutil.rmtree(path)
except Exception: except Exception:
pass pass