README updates, RSS escaping, fixes #20

LICENSE

@@ -1,7 +1,6 @@
 BSD 2-Clause License
 
 Copyright (c) 2013-2016, Thomas Skowron and others
-(https://github.com/thomersch/Mikrowelle-OS/graphs/contributors)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -107,15 +107,13 @@ The file name doesn't really matter, but your episode order will depend on it.
 ## Templating
 ### Changing the looks of your podcast page.
 
-You can customize your templates at any time. Simply go to the template folder and edit the files. Variables should be rather self explainatory. A working example for a template is located [there](https://github.com/thomersch/mikrowelle-template).
-
 If you want to start a new style, I recommend to duplicate the `templates/base-template` folder and start editing in the duplicate. Remember to change the `tplfolder` path in `settings.json`.
 
 Adding a stylesheet is nice as well, give it a try. The directory `res` in the template path will be linked in the pub-path, so you can place all your assets in `$templatename/res` and those will be available at `res` on your main publishing path, e.g. `podcast.example.com/res`.
 
 ## Feature requests
 
-Give 'em to me. Create a ticket or contact me.
+Give 'em to me. Create a GitHub issue or contact me.
 
 ## Other Questions?
 
@@ -124,3 +122,9 @@ Ask me.
 ## License
 
 BSD License. No bullshit. See `LICENSE` file.
+
+## Contributors
+
+* Thomas Skowron
+* Thomas Sänger (HorayNarea)
+* Andreas Hubel (saerdnaer)

util/rssgen.py

@@ -22,11 +22,6 @@ def _chapters(element, namespaces):
 	return xml_chapters
 
 
-def _encode(s):
-	s = s.replace("&", "&")
-	return s
-
-
 def generate(channel, elements, settings):
 	namespaces = {
 	"itunes": "http://www.itunes.com/dtds/podcast-1.0.dtd",
@@ -41,16 +36,16 @@ def generate(channel, elements, settings):
 	fe = {}
 
 	fe["title"] = etree.Element("title")
-	fe["title"].text = _encode(channel["title"])
+	fe["title"].text = channel["title"]
 
 	fe["link"] = etree.Element("link")
-	fe["link"].text = _encode(channel["link"])
+	fe["link"].text = channel["link"]
 
 	fe["ttl"] = etree.Element("ttl")
 	fe["ttl"].text = channel["feedinterval"]
 
 	fe["description"] = etree.Element("description")
-	fe["description"].text = _encode(channel["description"])
+	fe["description"].text = channel["description"]
 
 	fe["lastBuildDate"] = etree.Element("lastBuildDate")
 	fe["lastBuildDate"].text = datetime.now().strftime("%a, %d %b %Y %H:%M:%S +0000")
@@ -59,22 +54,22 @@ def generate(channel, elements, settings):
 	fe["generator"].text = "Mikrowelle OS"
 
 	fe["author"] = etree.Element("author")
-	fe["author"].text = _encode(channel["author"])
+	fe["author"].text = channel["author"]
 
 	fe["it_author"] = etree.Element("{%s}author" % namespaces["itunes"])
-	fe["it_author"].text = _encode(channel["author"])
+	fe["it_author"].text = channel["author"]
 
 	fe["language"] = etree.Element("language")
 	fe["language"].text = settings.get("language", "de-de")
 
-	cat = _encode(settings.get("category", None))
+	cat = settings.get("category", None)
 	if isinstance(cat, str) or isinstance(cat, unicode):
 		fe["it_category"] = etree.Element("{%s}category" % namespaces["itunes"], text=cat)
 
 	if "artwork" in channel:
 		fe["it_logo"] = etree.Element("{%s}image" % namespaces["itunes"], href=channel["artwork"])
 		fe["logo"] = etree.Element("logo")
-		fe["logo"].text = _encode(channel["artwork"])
+		fe["logo"].text = channel["artwork"]
 
 	if "explicit" in channel:
 		fe["explicit"] = etree.Element("{%s}explicit" % namespaces["itunes"])