1
0
Fork 0
forked from github/pelican
Commit graph

92 commits

Author SHA1 Message Date
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
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
lexual
62ab60d0b1 Added S3 support for pelican quickstart. 2013-03-15 15:04:33 +11:00
Thomas Thurman
372e8c07cf Fixed the stopserver command to use the correct Makefile syntax 2013-03-09 21:27:19 +00:00
Andrew Spiers
205792e9d4 string types have no decode method in py3 2013-03-03 22:00:37 -08:00
Richard Duivenvoorde
a13e31a76b adding a stopsever target for make 2013-03-03 21:45:08 -08:00
Richard Duivenvoorde
824edb8823 rsync additions
- adding / otherwise you will endup with output on remote
- adding --cvs-exclude (to not sync cvs stuff)
2013-03-03 21:45:08 -08:00
John Kristensen
4e4080c523 Check output directory exists before doing a clean
- if the output directory does not exist the 'make clean' command fails,
   which also means that the 'make html' command which would otherwise
   create the output directory also fails without generating the output
2013-03-03 21:21:05 -08:00
Steve Schwarz
986733e8fb Corrected parsing of categories/tags 2013-03-03 21:17:42 -08:00
Steve Schwarz
8a6d96b289 pelican_import fix for bs4
Quick fix for this traceback:
$ pelican-import --wpfile ~/Downloads/mysite.wordpress.2013-02-24.xml 
Traceback (most recent call last):
  File "/Users/me/.virtualenvs/pelican/bin/pelican-import", line 8, in <module>
    load_entry_point('pelican==3.2', 'console_scripts', 'pelican-import')()
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 363, in main
    disable_slugs=args.disable_slugs or False)
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 238, in fields2pelican
    for title, content, filename, date, author, categories, tags, in_markup in fields:
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 37, in wp2fields
    if item.fetch('wp:status')[0].contents[0] == "publish":
TypeError: 'NoneType' object is not callable

I'm a BeautifulSoup novice but these changes allowed me to import two of my wordpress.xml files.
2013-03-03 21:17:42 -08:00
Sasha Hart
07f4163300 make develop_server.sh notify/cleanup when pelican or server don't start
After waiting for pelican and server to come up, if either one has
died then give a more helpful message and clean up. Previously did not
check for this, so script informed user that everything was running even
if one or both parts failed for whatever reason.

This is meant to provide a little more user-friendliness
in those cases where user has a develop_server.sh in project directory
but forgot to (re)install pelican, activate relevant virtualenv, etc.
as well as other unforeseen situations where one of the processes does
not start.
2013-03-03 21:08:28 -08:00
Alexis Métaireau
149ca493e0 Annotate py3k code when needed. 2013-01-11 18:55:04 +01:00
Alexis Métaireau
1197e09626 Revert previously erased changes 2013-01-11 18:46:16 +01:00
Dirk Makowski
71995d5e1b Port pelican to python 3.
Stays compatible with 2.x series, thanks to an unified codebase.
2013-01-11 03:20:09 +01:00
Alexis Metaireau
98c8db568b Merge pull request #577 from davidjb/import-improvements-slug
Provide slug storage option for posts during Pelican import
2012-12-11 03:52:12 -08:00
David Beitey
b4c5d7cf62 Store slugs in posts by default on Pelican import 2012-12-11 21:44:40 +10:00
Tomi Pieviläinen
e006cf04bb Kill SimpleHTTPServer also on OS X 2012-11-21 14:02:56 +02:00
David Beitey
1b23a4a8e1 Merge remote-tracking branch 'davidjb/decode-html-wp-titles' into wp-import-improvements
Conflicts:
	docs/changelog.rst
2012-11-04 14:09:25 +10:00
David Beitey
528747684d Split post content on all types of line endings for adding paragraph tags 2012-11-04 14:08:58 +10:00
David Beitey
e2c3701757 Decode HTML entities in titles on WP import 2012-11-03 21:55:56 +10:00
Alexis Métaireau
dd299d272b merge win-encoding 2012-10-25 14:47:57 +02:00
Alexis Métaireau
17dc36aad6 merge upstream 2012-10-12 23:22:55 +02:00
Alexis Métaireau
9add2151c3 Don't force the number of categories to be equal to 1. Fixes #521 2012-10-12 23:01:50 +02:00
Remi Rampin
7d1c362635 Fixed escaping in files generated from quickstart
Variables are properly escaped before they are replaced in the
templates.
2012-10-12 23:01:50 +02:00
Rémy HUBSCHER
61fe02f411 fix-pelican-rsync_upload-makefile 2012-10-12 23:01:50 +02:00
Perry Roper
6afc9f7902 Add missing colon 2012-09-26 19:59:47 +01:00
Perry Roper
cf3697199a Output author details in pelican_import 2012-09-26 19:58:15 +01:00
Remi Rampin
b1099477f9 Fixed escaping in files generated from quickstart
Variables are properly escaped before they are replaced in the
templates.
2012-09-17 22:48:11 -04:00
Rémy HUBSCHER
6466bb4384 fix-pelican-rsync_upload-makefile 2012-09-17 14:47:05 +02:00
guillermooo
c02926e2ad fix encoding issues in Linux 2012-09-02 10:59:33 +02:00
guillermooo
fc749755df fix encoding problem in Windows 2012-09-02 09:26:58 +02:00
Justin Mayer
000210d875 Improve devserver durability. Refs #473.
Three changes:

1. Fix inconsistent "pwd" behavior by using make's $(CURDIR) builtin.
2. Change bash shebang to the more-portable form.
3. Tell users when Pelican and SimpleHTTPServer have been backgrounded.
2012-08-27 13:09:25 -07:00
tBunnyMan
62f190d574 use lowercase pwd since only Mac OS X allows uppercase commands
Fix #473
2012-08-23 07:58:39 -07:00
Zoresvit
515847fdd2 Include index in format() string.
Argument index is included in .format() method format string in order to be friendly with various Python versions and consistent with the rest of the code.
2012-08-16 14:17:46 +03:00
Justin Mayer
0c02536605 Give devserver its own make target
Restore "make serve" to a non-backgrounded SimpleHTTPServer process and
give the develop_server.sh its own make target at "make devserver".
Add a few missing make targets to the help list and re-order targets for
consistency. Add note to docs regarding how to stop the devserver.
2012-08-05 17:25:39 -07:00
Justin Mayer
7ee6fdd9e6 Make develop_server.sh executable. Refs #443.
The pelican-quickstart command generates a develop_server.sh file that
must have executable permissions in order to run.
2012-08-03 08:26:19 -07:00
Alexis Metaireau
5cb009d782 if not virtualenv is defined, fallback on '.' 2012-07-23 18:37:12 +02:00