Merge pull request #4 from beide/master

2 bugfixes

makePDF.py

@@ -16,9 +16,10 @@
 
 parts = []
 
-title = path
-if(title[-1:]=="/"):
-    title = title[:len(title)-1]
+title = os.path.abspath(path)
+
+title = os.path.basename(os.path.dirname(title)) + \
+        "-" + os.path.basename(title)
 
 title = title.replace("/","-")
 

makepub.py

@@ -38,10 +38,12 @@
 
 
 def get_title(path):
-    title = path
-    if(title[-1:] == "/"):
-        title = title[:len(title) - 1]
-    title = title.replace("/", "-")
+    title = os.path.abspath(path)
+
+    title = os.path.basename(os.path.dirname(title)) + \
+            "-" + os.path.basename(title)
+    title = title.replace("/","-")
+
     return title
 
 

mdl.py

@@ -41,7 +41,7 @@ def getit(dirname,target_url):
 		if not os.path.exists(dirname+"/"+chapter+"-"+name):
 			urlretrieve(url, dirname+"/"+chapter+"-"+name)
 
-		getit(dirname,next_url)
+		return next_url
 
 	except urllib2.URLError, e:
 		print ">>> Fail at "+target_url
@@ -53,5 +53,6 @@ def getit(dirname,target_url):
 		print ">>> Start cleaning"
 		cleanup(dirname)
 
-
-getit(sys.argv[2],sys.argv[1])
+nexturl = sys.argv[1]
+while nexturl:
+	nexturl = getit(sys.argv[2],nexturl)