From d508bb58af7b1a8be4ec6f825c112083985c7d87 Mon Sep 17 00:00:00 2001
From: Aleksandar Erkalovic <aerkalov@gmail.com>
Date: Sun, 22 Nov 2009 19:43:32 +0100
Subject: [PATCH] Add epub importer to profile

---
 lib/booki/account/templates/account/view_profile.html | 10 ++++++++++
 lib/booki/account/views.py                            | 17 ++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/booki/account/templates/account/view_profile.html b/lib/booki/account/templates/account/view_profile.html
index 3dca722..d780638 100644
--- a/lib/booki/account/templates/account/view_profile.html
+++ b/lib/booki/account/templates/account/view_profile.html
@@ -39,6 +39,16 @@
 <br/><br/>
 <button>Import</button>
 </form>
+
+<h2>Import epub</h2>
+<form action="." method="POST">
+<table>
+{{ epub_form.as_table }}
+</table>
+<br/><br/>
+<button>Import</button>
+</form>
+
 <!--
 <h2>Import from fm.net</h2>
 <form action="." method="POST">
diff --git a/lib/booki/account/views.py b/lib/booki/account/views.py
index 1e38902..5098f43 100644
--- a/lib/booki/account/views.py
+++ b/lib/booki/account/views.py
@@ -68,6 +68,10 @@ class ProjectForm(forms.Form):
 
 class ImportForm(forms.Form):
     archive_id = forms.CharField(required=False)
+
+
+class ImportEpubForm(forms.Form):
+    url = forms.CharField(required=False)
     
 
 def view_profile(request, username):
@@ -81,10 +85,17 @@ def view_profile(request, username):
     if request.method == 'POST':
         project_form = ProjectForm(request.POST)
         import_form = ImportForm(request.POST)
+        epub_form = ImportEpubForm(request.POST)
+        espri_url = "http://objavi.flossmanuals.net/espri.cgi"
 
         if import_form.is_valid() and import_form.cleaned_data["archive_id"] != "":
             from booki.editor import common
-            common.importBookFromURL("http://objavi.flossmanuals.net/espri.cgi?mode=zip&book="+import_form.cleaned_data["archive_id"], createTOC = True)
+
+            common.importBookFromURL(espri_url + "?mode=zip&book="+import_form.cleaned_data["archive_id"], createTOC = True)
+
+        if epub_form.is_valid() and epub_form.cleaned_data["url"] != "":
+            from booki.editor import common
+            common.importBookFromURL(espri_url + "?mode=zip&url="+epub_form.cleaned_data["url"], createTOC = True)
 
         if project_form.is_valid() and project_form.cleaned_data["title"] != "":
             title = project_form.cleaned_data["title"]
@@ -115,9 +126,9 @@ def view_profile(request, username):
     else:
         project_form = ProjectForm()
         import_form = ImportForm()
-        floss_form = ImportFlossForm()
+        epub_form = ImportEpubForm()
 
     books = models.Book.objects.all()
 
-    return render_to_response('account/view_profile.html', {"request": request, "user": user, "project_form": project_form, "import_form": import_form, "floss_form": floss_form, "books": books})
+    return render_to_response('account/view_profile.html', {"request": request, "user": user, "project_form": project_form, "import_form": import_form, "epub_form": epub_form, "books": books})
 
-- 
2.11.4.GIT