1
0
Fork 0
forked from github/pelican
Commit graph

127 commits

Author SHA1 Message Date
wvi
71103ef2c1 Fix #1182# 2013-12-23 21:32:10 +01:00
Justin Mayer
1e203e955a Merge pull request #879 from joeshaw/post-id
Wordpress import error on empty <wp:post_name>
2013-12-18 18:24:16 -08:00
Justin Mayer
3715749cc6 Minor wording changes in develop_server.sh 2013-12-11 21:09:02 -08:00
Jamie Culpon
c495502c8f Support publishing to personal pages sites in quickstart
Previously pelican-quickstart would assume that the site it created for GitHub
Pages should be published to the gh-pages branch. This is correct for project
pages, but not correct for personal pages. Personal pages, which live in a
user's special username.github.io repository, are instead deployed to the
master branch. This means that if you did pelican-quickstart and tried to
publish your new personal site with make github you'd see nothing (or whatever
old pages site you had floating around in master).

ghp-import already supports publishing to different branches, so publishing
to the correct branch is just a matter of correct configuration and updating
the Makefile to pass the branch along to ghp-import. pelican-quickstart now
asks if the user wants to publish to GitHub Pages, and if so, asks if this
is a personal page and chooses the correct branch appropriately. I preferred
this approach to prompting for an arbitrary branch because I felt that
choosing the branch would feel more intimidating to someone using
pelican-quickstart for the first time.

This essentially ports changes I made to my personal pages site at
jculpon@82cae477a9e8712b90654f6432464369ebcc7ae5
2013-12-06 17:39:51 -08:00
Joe Shaw
eeae09be5e wordpress importer: fallback onto wp:post_id if wp:post_name is empty 2013-12-04 09:46:44 -05:00
Tommy George
082ce1dd19 Update pelicanconf.py.in
pep8 issues
2013-12-03 09:48:10 -06:00
Kevin Deldycke
83e4d35b44 Produce inline links instead of references. 2013-11-26 10:04:15 +01:00
Justin Mayer
fb994b1399 Add content dir to default settings file template
This adds a line to the settings file generated by pelican-quickstart
that ensures the automatically-generated "content" directory is
specified in said settings file. Fixes #1116
2013-10-28 15:52:09 -07:00
Justin Mayer
e2f50750d2 Add Tumblr and Posterous to importer description 2013-10-08 13:20:56 +02:00
Kyle Fuller
f83d0d3b0c Handle east asian character column width in the importer
Fixes #682
Closes #923
2013-10-08 09:46:40 +01:00
Justin Mayer
8d352d9a78 Correct upload targets in Makefile.in 2013-08-29 17:35:48 -07:00
Nicholas Kuechler
6b68d94079 Adds Rackspace Cloud Files support to quickstart and fabfile 2013-08-05 23:30:31 -05:00
Russ Webber
dc58a17e64 fix missing 'kind' arg in importer
fixes #983
2013-08-04 17:21:35 +08: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
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
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
Justin Mayer
d4b64a3c8e Merge pull request #873 from xlz/tumblr-import
Support importing Tumblr
2013-07-18 09:17:26 -07: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
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
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
bas smit
0d63b4520a Add info about debugging to the help output of the makefile 2013-06-26 14:01:01 +02:00
bas smit
12fd53c27e Add debug target to the template makefile
If the DEBUG variable is set (e.g. DEBUG=1 make target) debugging will
be enabled by using pelicans -D flag.
2013-06-26 14:00:45 +02:00
Justin Mayer
bf0a50880d Revert "make clean" behavior to rm -rf. Fixes #773
The change to the "make clean" task in 764a2cf from "rm -rf" to instead
relying on GNU "find" appears to have broken cross-platform portability,
likely causing problems on *BSD and other platforms. This commit reverts
that change back to the previous "rm -rf" behavior.
2013-06-24 13:40:32 -07:00
Justin Mayer
e9fec3b1dc Remove "clean" task from "make html"; fixes #637
This change removes the "clean" task from the "html" and "regenerate"
tasks in the default Makefile generated by pelican-quickstart. The
previous behavior ignored whether the DELETE_OUTPUT_DIRECTORY
setting was set to True or not and deleted everything in the output
directory every time the "make html" or "make regenerate" task was run.
In addition to violating the Principle of Least Astonishment, there was
also the potential for data loss if the user wasn't careful when
defining the output directory location in the Makefile.

The new behavior therefore relies primarily on the
DELETE_OUTPUT_DIRECTORY setting to control if and when the output
directory is cleaned. The default settings and Makefile generated by the
pelican-quickstart command, for example, no longer clean the output
directory when the "make html" task is run. If the user wants to change
this behavior and have the output directory cleaned on every "make html"
run, the recommended method would be to set DELETE_OUTPUT_DIRECTORY to
True in pelicanconf.py. Alternatively, the user can manually run "make
clean", with the caveat that the output directory and its contents will
be entirely destroyed, including any otherwise to-be-retained files or
folders specified in the OUTPUT_RETENTION setting. It is for that reason
that relying on the DELETE_OUTPUT_DIRECTORY setting is instead
recommended.

As before, DELETE_OUTPUT_DIRECTORY is set to True in the publishconf.py
settings file generated by the pelican-quickstart script. This way, any
potentially old and irrelevant files will be automatically removed
before the latest version of the site is transferred to the production
server environment.

In summary, this change allows for the sanest possible default settings,
while still allowing end users to customize output cleaning to their
preferred behavior with a minimum of confusion.
2013-06-24 13:05:00 -07:00
Rogdham
0ecae1f50d Encoding issue in pelican-quickstart. Fixes #904 2013-05-26 11:38:55 +01:00
Dominique Plante
6c9d158609 makes Pelican-quickstart debuggable in PyCharm 2013-05-18 06:33:49 -07:00
mr.Shu
2856f49b3a Updated pelican.server not started error message. 2013-05-18 08:20:50 +02:00
Alexis Metaireau
55382dd184 Merge pull request #858 from jmurty/feature/import_wp_pages
Import wordpress pages to pages/ subdir with --dir-page option
2013-05-13 00:18:01 -07:00
Joe Shaw
5fa3504ad0 use string find() instead of index(). Fixes #880.
We're expecting a non-match to return -1, which is what find() does,
but index() instead throws a ValueError.
2013-05-08 09:41:55 -04:00
Justin Mayer
6db2ad2130 Remove "Done" after running "make html"
Pelican now provides better user feedback (see #857), so echoing "Done"
after a "make html" run has become redundant.
2013-04-23 07:32:42 -07:00
Justin Mayer
740bb46e6d MOAR Unicode for generated settings files 2013-04-21 15:18:31 -07:00
Justin Mayer
d59a59dc83 Unicode all the things, incl. our settings files 2013-04-21 15:00:40 -07:00
James Murty
8c7ea8df98 Import wordpress pages to pages/ subdir with --dir-page option
When importing from Wordpress, the --dir-page directive (disabled by
default) automatically adds files to the pages/ when they are recognised
as pages, as opposed to posts.
2013-04-19 23:06:59 +01:00
Rogdham
b2aabdc02b Do not generate invalid filenames. Fixes #814.
Turn invalid characters into underscores, remove leading dots and enforce
a maximum length. Should be fine on main file systems used by Windows, Mac OS
and Linux.
Thanks to @Avaris for helping to clean my code.
2013-04-14 13:20:16 +01:00
Justin Mayer
87735b5215 Merge pull request #842 from avaris/remove-unittest2
remove unittest2 and fix various warnings in py3
2013-04-13 14:23:38 -07:00
Deniz Turgut
bc4bd773a0 remove unittest2 and fix various warnings in py3 2013-04-13 16:36:05 -04:00
Rogdham
a4c16e1b53 Warn user in case of missing title. Fixes #440.
When a WP XML file is imported, items with missing title are generated with a
title which is probably not the good one (instead of being dropped), and a
warning is displayed to the user.
2013-04-13 20:44:18 +01:00
Justin Mayer
886c8d649c Better defaults for quickstart settings files
Since feed generation is usually unnecessary during development (and can
produce potentially-confusing warnings when SITEURL is not set), running
"make html" will now skip feed generation by default. Feed generation
settings have been added to publishconf.py so feeds will be generated
when the site is published.

Also corrected some URLs in pelicanconf.py.
2013-04-12 08:48:42 -07:00
Justin Mayer
0a8678a8ae Change RELATIVE_URLS default to False - Fixes #829 2013-04-11 16:12:55 -07:00
Irfan Ahmad
58faf9462e Implement Posterous import - fixes #608 2013-03-29 09:10:27 -07:00
James King
999980c07c Added WordPress content decoding to importer 2013-03-28 07:16:01 -07:00
Chenguang Wang
5e4622b229 make pelican-quickstart and the Makefile it generates support py3k. 2013-03-23 19:37:02 -07:00
Alexis Metaireau
5dbb8c3041 Merge pull request #775 from lexual/s3_support_for_quickstart
Added S3 support for pelican quickstart.
2013-03-23 19:16:39 -07:00
W. Trevor King
b59da89e80 Convert '.' and '..' to the less magical os.curdir and os.pardir
While I'm cleaning up path manipulation, I might as well make things
more semantic.
2013-03-21 12:44:44 -04:00
Wraithan (Chris McDonald)
5fcb18ea60 Add help directly to publishconf.py 2013-03-21 03:33:32 -07:00