added pdf.js to add pdf support.

This commit is contained in:
ajurna
2020-05-21 12:44:57 +01:00
parent be32796bea
commit f4411163f9
9 changed files with 437 additions and 33 deletions

View File

@@ -7,6 +7,7 @@ from django.contrib.auth.models import User
from django.db import models
from django.db.transaction import atomic
from django.utils.http import urlsafe_base64_encode
from PyPDF4 import PdfFileReader
from comic import rarfile
@@ -82,6 +83,10 @@ class ComicBook(models.Model):
def selector_string(self):
return urlsafe_base64_encode(self.selector.bytes)
def get_pdf(self):
base_dir = Setting.objects.get(name="BASE_DIR").value
return path.join(base_dir, self.directory.get_path(), self.file_name)
def get_image(self, page):
base_dir = Setting.objects.get(name="BASE_DIR").value
if self.directory:
@@ -257,7 +262,14 @@ class ComicBook(models.Model):
try:
cbx = zipfile.ZipFile(comic_full_path)
except zipfile.BadZipFile:
return comic_file_name
cbx = None
if not cbx:
pdf_file = PdfFileReader(comic_full_path)
else:
pdf_file = None
if not pdf_file and not cbx:
return comic_file_name
with atomic():
if directory:
book = ComicBook(file_name=comic_file_name, directory=directory)
@@ -265,27 +277,34 @@ class ComicBook(models.Model):
book = ComicBook(file_name=comic_file_name)
book.save()
page_index = 0
for page_file_name in sorted([str(x) for x in cbx.namelist()], key=str.lower):
try:
dot_index = page_file_name.rindex(".") + 1
except ValueError:
continue
ext = page_file_name.lower()[dot_index:]
if ext in ["jpg", "jpeg"]:
content_type = "image/jpeg"
elif ext == "png":
content_type = "image/png"
elif ext == "bmp":
content_type = "image/bmp"
elif ext == "gif":
content_type = "image/gif"
else:
content_type = "text/plain"
page = ComicPage(
Comic=book, index=page_index, page_file_name=page_file_name, content_type=content_type
)
page.save()
page_index += 1
if cbx:
for page_file_name in sorted([str(x) for x in cbx.namelist()], key=str.lower):
try:
dot_index = page_file_name.rindex(".") + 1
except ValueError:
continue
ext = page_file_name.lower()[dot_index:]
if ext in ["jpg", "jpeg"]:
content_type = "image/jpeg"
elif ext == "png":
content_type = "image/png"
elif ext == "bmp":
content_type = "image/bmp"
elif ext == "gif":
content_type = "image/gif"
else:
content_type = "text/plain"
page = ComicPage(
Comic=book, index=page_index, page_file_name=page_file_name, content_type=content_type
)
page.save()
page_index += 1
elif pdf_file:
for page_index in range(pdf_file.getNumPages()):
page = ComicPage(
Comic=book, index=page_index, page_file_name=page_index+1, content_type='application/pdf'
)
page.save()
return book
@staticmethod

View File

@@ -0,0 +1,173 @@
{% extends "base.html" %}
{% load static %}
{% block title %}{{ title }}{% endblock %}
{% block content %}
<div class="container m-0">
<div class="row justify-content-center w-100">
<div class="btn-group" role="group" aria-label="Basic example">
<button id="prev" class="btn btn-secondary">Previous</button>
<button id="pages" class="btn btn-secondary"><span id="page_num"></span> / <span id="page_count"></button>
<button id="next" class="btn btn-secondary">Next</button>
</div>
</div>
<div class="row w-100">
<canvas id="the-canvas" width="100%"></canvas>
</div>
</div>
{% endblock %}
{% block script %}
<script type="text/javascript" src="{% static "pdfjs/build/pdf.js" %}"></script>
<script>
// If absolute URL from the remote server is provided, configure the CORS
// header on that server.
var url = '{% url "get_pdf" nav.cur_path %}';
// Loaded via <script> tag, create shortcut to access PDF.js exports.
var pdfjsLib = window['pdfjs-dist/build/pdf'];
// The workerSrc property shall be specified.
pdfjsLib.GlobalWorkerOptions.workerSrc = '{% static "pdfjs/build/pdf.worker.js" %}';
var pdfDoc = null,
pageNum = {{ status.last_read_page }},
pageRendering = false,
pageNumPending = null,
scale = 0.8,
canvas = document.getElementById('the-canvas'),
ctx = canvas.getContext('2d');
/**
* Get page info from document, resize canvas accordingly, and render page.
* @param num Page number.
*/
function renderPage(num) {
pageRendering = true;
// Using promise to fetch the page
pdfDoc.getPage(num).then(function(page) {
let viewport = page.getViewport({scale: (window.innerWidth *.95) / page.getViewport(1.0).width});
canvas.height = viewport.height;
canvas.width = viewport.width;
document.getElementById('the-canvas').scrollIntoView({behavior: 'smooth'})
$.ajax({url: "/comic/set_page/{{nav.cur_path}}/" + (pageNum - 1) + "/"})
// Render PDF page into canvas context
let renderContext = {
canvasContext: ctx,
viewport: viewport
};
let renderTask = page.render(renderContext);
// Wait for rendering to finish
renderTask.promise.then(function() {
pageRendering = false;
if (pageNumPending !== null) {
// New page rendering is pending
renderPage(pageNumPending);
pageNumPending = null;
}
});
});
// Update page counters
document.getElementById('page_num').textContent = num;
}
/**
* If another page rendering in progress, waits until the rendering is
* finised. Otherwise, executes rendering immediately.
*/
function queueRenderPage(num) {
if (pageRendering) {
pageNumPending = num;
} else {
renderPage(num);
}
}
/**
* Displays previous page.
*/
function onPrevPage() {
if (pageNum <= 1) {
window.location = "{% url "read_comic" nav.prev_path %}"
}
pageNum--;
queueRenderPage(pageNum);
}
document.getElementById('prev').addEventListener('click', onPrevPage);
/**
* Displays next page.
*/
function onNextPage() {
if (pageNum >= pdfDoc.numPages) {
window.location = "{% url "read_comic" nav.next_path %}"
}
pageNum++;
queueRenderPage(pageNum);
}
document.getElementById('next').addEventListener('click', onNextPage);
/**
* Asynchronously downloads PDF.
*/
pdfjsLib.getDocument(url).promise.then(function(pdfDoc_) {
pdfDoc = pdfDoc_;
document.getElementById('page_count').textContent = pdfDoc.numPages;
// Initial/first page rendering
renderPage(pageNum);
});
$(document).keydown(function(e) { // add arrow key support
switch(e.which) {
case 37: // left
onPrevPage()
break;
case 38: // up
window.scrollTo({
top: window.scrollY-window.innerHeight*.7,
left: 0,
behavior: 'smooth'
});
break;
case 39: // right
onNextPage()
break;
case 40: // down
window.scrollTo({
top: window.scrollY+window.innerHeight*.7,
left: 0,
behavior: 'smooth'
});
break;
default: return; // exit this handler for other keys
}
e.preventDefault(); // prevent the default action (scroll / move caret)
});
var hammertime = new Hammer(document.getElementById('the-canvas'), {});
hammertime.on('swipeleft', function (ev) {
onNextPage()
})
hammertime.on('swiperight', function (ev) {
onPrevPage()
})
hammertime.on('tap', function (ev) {
onNextPage()
})
</script>
{% endblock %}

View File

@@ -13,6 +13,7 @@ urlpatterns = [
url(r"^read/(?P<comic_selector>[\w-]+)/$", views.read_comic, name="read_comic"),
url(r"^set_page/(?P<comic_selector>[\w-]+)/(?P<page>[0-9]+)/$", views.set_read_page, name="set_read_page"),
url(r"^read/(?P<comic_selector>[\w-]+)/(?P<page>[0-9]+)/img$", views.get_image, name="get_image"),
url(r"^read/(?P<comic_selector>[\w-]+)/pdf$", views.get_pdf, name="get_pdf"),
url(r"^list_json/$", views.comic_list_json, name="comic_list_json1"),
url(r"^list_json/(?P<directory_selector>[\w-]+)/$", views.comic_list_json, name="comic_list_json2"),
url(r"^recent/$", views.recent_comics, name="recent_comics"),

View File

@@ -162,7 +162,7 @@ def generate_directory(user, directory=False):
df.populate_directory(directory_obj, user)
files.append(df)
for file_name in file_list:
if file_name.lower()[-4:] in [".rar", ".zip", ".cbr", ".cbz"]:
if file_name.lower()[-4:] in [".rar", ".zip", ".cbr", ".cbz", ".pdf"]:
book = ComicBook.process_comic_book(file_name, directory)
df = DirFile()
df.populate_comic(book, user)

View File

@@ -293,6 +293,13 @@ def settings_page(request):
@login_required
def read_comic(request, comic_selector):
selector = uuid.UUID(bytes=urlsafe_base64_decode(comic_selector))
try:
book = ComicBook.objects.get(selector=selector)
except ComicBook.DoesNotExist:
Directory.objects.get(selector=selector)
return redirect('comic_list', directory_selector=comic_selector)
except Directory.DoesNotExist:
return HttpResponse(status=404)
book = get_object_or_404(ComicBook, selector=selector)
pages = ComicPage.objects.filter(Comic=book)
@@ -308,7 +315,11 @@ def read_comic(request, comic_selector):
"menu": Menu(request.user),
"title": title,
}
return render(request, "comic/read_comic.html", context)
if book.file_name.lower().endswith('pdf'):
context['status'].last_read_page += 1
return render(request, "comic/read_comic_pdf.html", context)
else:
return render(request, "comic/read_comic.html", context)
@login_required
@@ -335,6 +346,13 @@ def get_image(_, comic_selector, page):
return FileResponse(img, content_type=content)
@login_required
def get_pdf(_, comic_selector):
selector = uuid.UUID(bytes=urlsafe_base64_decode(comic_selector))
book = ComicBook.objects.get(selector=selector)
return FileResponse(open(book.get_pdf(), 'rb'), content_type='application/pdf')
def initial_setup(request):
if User.objects.all().exists():
return redirect("/comic/")