Commit graph

1,057 commits

Author SHA1 Message Date
Rogdham
a495527e2b Delib. overriding and overwrite detect. Fixes #938
Make deliberate overriding (*) works with overwrites detection.

(*) first introduced by d0e9c52410

The following are decided to be deliberate override:
 - articles using the `save_as` metadata
 - pages using the `save_as` metadata
 - template pages (always)

Pelican now exits in the following 2 cases:
 - at least 2 not deliberate writes to the same file name (behaviour introduced
   by the overwrite detection feature ff7410ce2a)
 - at least 2 deliberate writes to the same file name (new behaviour)

Also added info logging when deliberate overrides are performed.

Switched to StandardError instead of IOError, thanks to @ametaireau and
@russkel.
2013-08-04 12:09:26 +01:00
Rogdham
0999d4d691 Deliberate overriding of an existing file to tests
Deliberate overriding via `save_as` metadata should be allowed, even after the
overwrite detection feature. This commit is to add tests for deliberate
overriding. As a result, the relevant tests *should fail* after this commit.

Added a page and an article, both to override a tag, with very old dates so
it limits the amount of diff in the generated pages.

Overriding feature introduced by d0e9c52410
Overwrite detection introduced by ff7410ce2a
2013-08-04 12:07:40 +01:00
Russ Webber
4977de8453 fix: clear directory before generation of context
fixes #927
2013-08-04 14:00:56 +08:00
Justin Mayer
72ea20f06a Merge pull request #871 from dknecht/master
Sort author and category pages using same sort as tags
2013-08-03 22:51:30 -07:00
Justin Mayer
122ec39a27 Merge pull request #932 from qdot/master
Change meta tag "contents" attribute to "content" to conform to HTML spec
2013-08-03 22:40:18 -07:00
Dane Knecht
10dc5ef0b7 sort author and category pages same way as tags 2013-08-03 19:17:14 -07:00
Justin Mayer
2a53934834 Merge pull request #950 from fbs/makedebug
Add a debug target to the template makefile
2013-08-03 16:51:23 -07:00
Justin Mayer
2aa0c6e24b Merge pull request #968 from russkel/encodingfix
Fix setting default locale and exception encoding
2013-08-03 16:42:37 -07:00
Justin Mayer
1abd5ef447 Merge pull request #894 from dominiqueplante/quickstart-debuggable
make Pelican-quickstart debuggable in PyCharm
2013-08-03 16:35:36 -07:00
Justin Mayer
76fa457654 Normalize whitespace via lstrip Jinja parameter
This adds the lstrip_blocks Jinja parameter and removes unnecessary
whitespace from a few notmyidea templates.

Note: The lstrip_blocks parameter requires Jinja 2.7+, which has been
noted in Pelican's setup.py.

Credit for this commit goes entirely to Russ Webber, who has earned my
eternal thanks for discovering and applying this useful Jinja parameter.

Refs #969
2013-08-03 16:17:26 -07:00
Justin Mayer
23e62b0056 Merge pull request #966 from jude/patch-1
Adding a FEED_ALL_ATOM check in the "social" div.
2013-08-03 15:16:58 -07:00
Justin Mayer
1443131fde Merge pull request #976 from kylewm/notmyidea-active-pages
Modify notmyidea to include class="active" on pages
2013-08-03 15:12:52 -07:00
Justin Mayer
bea03bb4bb Merge pull request #979 from nyergler/pagination_conf
Support flexible pagination configuration
2013-08-03 14:58:47 -07:00
Justin Mayer
0de44cc844 Merge pull request #964 from nickzoic/master
Slugify {category} in URLs. Fixes #926
2013-08-03 14:45:07 -07:00
Nathan Yergler
50ff7ce89f Fall back to the default PAGINATION PATTERNS when none specified. 2013-08-03 14:04:58 -07:00
Nathan Yergler
5ffbf907de Create new formatting context dict instead of using self.__dict__
Using self.__dict__ is fine, but when its mutated it changes the
object's state. Creating a new dict avoids needing to think about
that, and doesn't introduce Python 3 issues (ie, where self.number is
accidentally set to '').
2013-08-03 13:49:43 -07:00
Nicholas Kuechler
92f5c06ba6 Group PDF related settings together. 2013-08-03 14:58:52 -05:00
Nathan Yergler
74c7c72fb3 Use six.u instead of unicode. 2013-07-31 21:31:08 -07:00
Russ Webber
89034f8b3f added THEME_STATIC_DIR setting
The theme static output directory path is now customisable via settings.
i.e. you can now use 'assets' instead of 'theme'.
2013-08-01 11:02:38 +08:00
Nathan Yergler
9abc08ea9f Don't assume that PAGINATION_PATTERNS will always be present. 2013-07-31 18:57:21 -07:00
Justin Mayer
30192b2318 Add fabfile generation to pelican-quickstart
This commit adds optional fabfile.py generation during the
pelican-quickstart process. Reasons include:

* "make" is cumbersome to install on Windows
* Fabric runs in any Python environment
* fabfile is just Python and thus more flexible and extensible

This is an initial implementation and does not currently provide as many
upload options as its Makefile counterpart.

Refs #584.
2013-07-29 11:03:14 -07:00
Nathan Yergler
95890a2a61 Allow definition of pagination rules by page index. 2013-07-29 08:10:28 -04:00
Ross McFarland
71e83635ea remove u prefix from string literal, using unicode_literals 2013-07-29 08:09:45 -04:00
Ross McFarland
0caa101ec7 use six.string_types for python 3 compat 2013-07-29 08:09:44 -04:00
Ross McFarland
e07b39dfcb more robust PAGINATION_(URL|SAVE_AS) support
- add base_name and number_seperator to context to give more flexibility
  when naming things
2013-07-29 08:09:44 -04:00
Ross McFarland
c5eecd23eb PAGINATION_URL/PAGINATION_SAVE_AS implementation
allows the use of custom urls for pagination similar to *_URLS
2013-07-29 08:09:44 -04:00
Kyle Mahan
0ddabb95c3 Modify notmyidea to include class="active" on pages 2013-07-27 12:30:24 -07:00
Russ Webber
b527fd594d added testing for default locale setting
removed LOCALE="" from default conf as it looks weird and you
shouldn't need to set a blank LOCALE for the system to work.
2013-07-21 14:12:21 +08:00
Russ Webber
2ace30cdb0 fix it not setting the default locale
If LOCALE was not specified in the settings file it would default
to [] insted of [''], where '' is used by locale.setlocale
to mean the user's default locale.
2013-07-21 13:31:11 +08:00
Justin Mayer
e32c893aa1 Support Gaug.es analytics in notmyidea theme 2013-07-18 10:26:45 -07:00
Justin Mayer
d4b64a3c8e Merge pull request #873 from xlz/tumblr-import
Support importing Tumblr
2013-07-18 09:17:26 -07:00
Russ Webber
3445066b11 fix an exception not correctly reporting if the locale is not set 2013-07-18 09:44:46 +08:00
Jude N
c5008f61e0 Adding a FEED_ALL_ATOM check in the "social" div.
The head section has a tests for FEED_ALL_ATOM when building the atom link.  This diff add a similar test in the "social" div.
2013-07-16 23:44:53 -04:00
Justin Mayer
9b0cfd9884 Merge pull request #883 from ben2367/author-filter
Add filter-author option to importer
2013-07-16 08:22:26 -07:00
Nick Moore
9b7ae20aa9 test for author & category slugification 2013-07-15 00:22:05 +10:00
Nick Moore
6c5444eb68 do slug_substitutions on category and author ... 2013-07-14 23:01:16 +10:00
Alexis Metaireau
9f0ad2bd95 Merge pull request #958 from hrbonz/dev_server_port
Dev server port
2013-07-14 05:04:42 -07:00
Alexis Metaireau
5e73b7b40e Merge pull request #954 from ajma/master
Adding stackoverflow to social icons
2013-07-14 03:35:13 -07:00
Benjamin Port
cb650c1c99 Add filter-author option to importer
Allow to import post from only one author when importing data
2013-07-13 16:15:45 +02:00
Stefan hr Berder
689632835e add port option to Makefile target serve/devserver 2013-07-07 14:28:31 +02:00
Stefan hr Berder
3a5db543bb add port parameter to bash script 2013-07-07 13:27:50 +02:00
Lingzhu Xiang
241ac2400a Use better titles than None for Tumblr posts without title 2013-07-07 19:05:21 +08:00
Lingzhu Xiang
75263fa852 Fix importing Tumblr photo caption
Besides each photo's caption, the general caption is also needed.

While we're at it, also add a linefeed at the end of file.
2013-07-07 19:05:21 +08:00
Lingzhu Xiang
00a1cbb6b8 Support importing Tumblr
Try to integrate Tumblr's various post types without using
additonal templates.
2013-07-07 19:05:21 +08:00
Stefan hr Berder
3da4c2e13e add port option to pelican.server 2013-07-07 12:44:21 +02:00
Andy Pearce
39518e15ef Allow text substitutions when generating slugs
The `slugify()` function used by Pelican is in general very good at
coming up with something both readable and URL-safe. However, there are
a few specific cases where it causes conflicts. One that I've run into
is using the strings `C++` and `C` as tags, both of which transform to
the slug `c`. This commit adds an optional `SLUG_SUBSTITUTIONS` setting
which is a list of 2-tuples of substitutions to be carried out
case-insensitively just prior to stripping out non-alphanumeric
characters. This allows cases like `C++` to be transformed to `CPP` or
similar. This can also improve the readability of slugs.
2013-07-04 12:17:21 +01:00
Justin Mayer
7ec4d5faa2 Merge pull request #880 from joeshaw/pre-index-fix
Exception on WP import looking for <pre> tag
2013-06-29 08:02:27 -07:00
Andrew Ma
bed53d1c0b Updating unit tests 2013-06-28 15:09:36 -07:00
Andrew Ma
298151237e Adding stackoverflow to social icons 2013-07-03 22:36:52 -07:00
Justin Mayer
5c70e2bcb1 Merge pull request #948 from justinmayer/make-clean
Remove "clean" task from "make html"; revert "make clean" behavior to "rm -rf"
2013-06-26 17:08:19 -07:00