0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:5591739531277074984b6fbad2f6e9e95069ffdf
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:ef680080cfb3569377d9788176822682c93f4a76
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "5591739531277074984b6fbad2f6e9e95069ffdf" and "ef680080cfb3569377d9788176822682c93f4a76" have entirely different histories.
5591739531 ... ef680080cf

15 changed files with 25 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pandora/archive/extract.py
View file

@ -19,13 +19,10 @@ import ox.image
from ox.utils import json
from django.conf import settings
from PIL import Image, ImageOps
import pillow_avif
from pillow_heif import register_heif_opener
from .chop import Chop, make_keyframe_index
register_heif_opener()
logger = logging.getLogger('pandora.' + __name__)
img_extension = 'jpg'

5
pandora/document/fulltext.py
View file

@ -8,7 +8,6 @@ from django.conf import settings
logger = logging.getLogger('pandora.' + __name__)
IMAGE_EXTENSIONS = ('png', 'jpg', 'webp', 'heic', 'heif')
def extract_text(pdf, page=None):
if page is not None:
@ -54,7 +53,7 @@ class FulltextMixin:
if self.file:
if self.extension == 'pdf':
return extract_text(self.file.path)
elif self.extension in IMAGE_EXTENSIONS:
elif self.extension in ('png', 'jpg'):
return ocr_image(self.file.path)
elif self.extension == 'html':
return self.data.get('text', '')
@ -181,7 +180,7 @@ class FulltextPageMixin(FulltextMixin):
if self.document.file:
if self.document.extension == 'pdf':
return extract_text(self.document.file.path, self.page)
elif self.extension in IMAGE_EXTENSIONS:
elif self.extension in ('png', 'jpg'):
return ocr_image(self.document.file.path)
elif self.extension == 'html':
# FIXME: is there a nice way to split that into pages

11
pandora/document/models.py
View file

@ -521,17 +521,14 @@ class Document(models.Model, FulltextMixin):
return save_chunk(self, self.file, chunk, offset, name, done_cb)
return False, 0
def thumbnail(self, size=None, page=None, accept=None):
def thumbnail(self, size=None, page=None):
if not self.file:
return os.path.join(settings.STATIC_ROOT, 'png/document.png')
src = self.file.path
folder = os.path.dirname(src)
if size:
size = int(size)
ext = 'jpg'
if accept and 'image/avif' in accept and size > 512:
ext = 'avif'
path = os.path.join(folder, '%d.%s' % (size, ext))
path = os.path.join(folder, '%d.jpg' % size)
else:
path = src
if self.extension == 'pdf':
@ -564,7 +561,7 @@ class Document(models.Model, FulltextMixin):
path = os.path.join(folder, '%dp%d,%s.jpg' % (size, page, ','.join(map(str, crop))))
if not os.path.exists(path):
resize_image(src, path, size=size)
elif self.extension in ('jpg', 'png', 'gif', 'webp', 'heic', 'heif'):
elif self.extension in ('jpg', 'png', 'gif'):
if os.path.exists(src):
if size and page:
crop = list(map(int, page.split(',')))
@ -577,7 +574,7 @@ class Document(models.Model, FulltextMixin):
img = open_image_rgb(path)
src = path
if size < max(img.size):
path = os.path.join(folder, '%sp%s.%s' % (size, ','.join(map(str, crop)), ext))
path = os.path.join(folder, '%sp%s.jpg' % (size, ','.join(map(str, crop))))
if not os.path.exists(path):
resize_image(src, path, size=size)
if os.path.exists(src) and not os.path.exists(path):

9
pandora/document/views.py
View file

@ -378,22 +378,15 @@ actions.register(sortDocuments, cache=False)
def file(request, id, name=None):
document = get_document_or_404_json(request, id)
accept = request.headers.get("Accept")
if accept and 'image/' in accept and document.extension in (
'webp', 'heif', 'heic', 'avif'
) and document.extension not in accept:
image_size = max(document.width, document.height)
return HttpFileResponse(document.thumbnail(image_size))
return HttpFileResponse(document.file.path)
def thumbnail(request, id, size=256, page=None):
size = int(size)
document = get_document_or_404_json(request, id)
accept = request.headers.get("Accept")
if "q" in request.GET and page:
img = document.highlight_page(page, request.GET["q"], size)
return HttpResponse(img, content_type="image/jpeg")
return HttpFileResponse(document.thumbnail(size, page=page, accept=accept))
return HttpFileResponse(document.thumbnail(size, page=page))
@login_required_json

2
pandora/urls.py
View file

@ -53,7 +53,7 @@ urlpatterns += [
re_path(r'^resetUI$', user.views.reset_ui),
re_path(r'^collection/(?P<id>.*?)/icon(?P<size>\d*).jpg$', documentcollection.views.icon),
re_path(r'^documents/(?P<id>[A-Z0-9]+)/(?P<size>\d*)p(?P<page>[\d,]*).jpg$', document.views.thumbnail),
re_path(r'^documents/(?P<id>[A-Z0-9]+)/(?P<name>.*?\.[^\d]{3,4})$', document.views.file),
re_path(r'^documents/(?P<id>[A-Z0-9]+)/(?P<name>.*?\.[^\d]{3})$', document.views.file),
re_path(r'^documents/(?P<fragment>.*?)$', document.views.document),
re_path(r'^edit/(?P<id>.*?)/icon(?P<size>\d*).jpg$', edit.views.icon),
re_path(r'^list/(?P<id>.*?)/icon(?P<size>\d*).jpg$', itemlist.views.icon),

2
requirements.txt
View file

@ -20,6 +20,4 @@ future
pytz
pypdfium2
Pillow>=10
pillow-heif
pillow-avif-plugin
mozilla-django-oidc==4.0.1

11
static/js/editor.js
View file

@ -454,17 +454,6 @@ pandora.ui.editor = function(data) {
$dialog.close();
pandora.api.transcribeAudio({
item: pandora.user.ui.item
}, function(result) {
if (result.data.taskId) {
pandora.wait(result.data.taskId, function(result) {
Ox.Request.clearCache();
if (ui.item == data.id && ui.itemView == 'editor') {
pandora.$ui.contentPanel.replaceElement(
1, pandora.$ui.item = pandora.ui.item()
);
}
})
}
})
pandora.ui.tasksDialog().open();
}

2
static/js/uploadDocumentDialog.js
View file

@ -8,7 +8,7 @@ pandora.ui.uploadDocumentDialog = function(options, callback) {
existingFiles = [],
uploadFiles = [],
supportedExtensions = ['gif', 'jpg', 'jpeg', 'pdf', 'png', 'webp', 'heic', 'heif', 'avif'],
supportedExtensions = ['gif', 'jpg', 'jpeg', 'pdf', 'png'],
filename,

6
static/js/utils.js
View file

@ -421,7 +421,7 @@ pandora.createLinks = function($element) {
};
pandora.uploadDroppedFiles = function(files) {
var documentExtensions = ['pdf', /* 'epub', 'txt', */ 'png', 'gif', 'jpg', 'jpeg', 'webp', 'heic', 'heif', 'avif'];
var documentExtensions = ['pdf', /* 'epub', 'txt', */ 'png', 'gif', 'jpg', 'jpeg'];
files = Ox.map(files, function(file) { return file });
if (files.every(function(file) {
@ -2132,9 +2132,7 @@ pandora.getSpan = function(state, val, callback) {
} else {
state.span = val;
}
} else if (Ox.contains([
'gif', 'gif', 'jpg', 'png', 'webp', 'heic', 'heif', 'avif'
], extension)) {
} else if (Ox.contains(['gif', 'jpg', 'png'], extension)) {
values = val.split(',');
if (values.length == 4) {
state.span = values.map(function(number, index) {

8
static/mobile/js/VideoElement.js
View file

@ -8,7 +8,6 @@ VideoElement <f> VideoElement Object
loop <b|false> loop playback
playbackRate <n|1> playback rate
position <n|0> start position
in <n|0> start offset
self <o> Shared private variable
([options[, self]]) -> <o:Element> VideoElement Object
loadedmetadata <!> loadedmetadata
@ -39,7 +38,6 @@ window.VideoElement = function(options) {
muted: false,
playbackRate: 1,
position: 0,
"in": 0,
volume: 1
}
Object.assign(self.options, options);
@ -168,10 +166,9 @@ window.VideoElement = function(options) {
function getCurrentTime() {
var item = self.items[self.currentItem];
var currentTime = self.seeking || self.loading
return self.seeking || self.loading
? self.currentTime
: item ? item.position + self.video.currentTime - item['in'] - self.options["in"] : 0;
return currentTime
: item ? item.position + self.video.currentTime - item['in'] : 0;
}
function getset(key, value) {
@ -511,7 +508,6 @@ window.VideoElement = function(options) {
}
function setCurrentItemTime(currentTime) {
currentTime += self.options["in"]
debug('Video', 'sCIT', currentTime, self.video.currentTime,
'delta', currentTime - self.video.currentTime);
isReady(self.video, function(video) {

1
static/mobile/js/VideoPlayer.js
View file

@ -10,7 +10,6 @@ window.VideoPlayer = function(options) {
loop: false,
muted: false,
playbackRate: 1,
"in": 0,
position: 0,
volume: 1
}

2
static/mobile/js/edits.js
View file

@ -91,7 +91,7 @@ async function loadEdit(id, args) {
}
}
data.edit = response['data']
if (['public', 'featured'].indexOf(data.edit.status) == -1) {
if (data.edit.status !== 'public') {
return {
site: data.site,
error: {

1
static/mobile/js/main.js
View file

@ -67,7 +67,6 @@ function parseURL() {
id = id.replace('/editor/', '/').replace('/player/', '/')
type = "item"
}
//console.log(type, id, args)
return [type, id, args]
}

27
static/mobile/js/render.js
View file

@ -75,8 +75,7 @@ function renderItem(data) {
var video = window.video = VideoPlayer({
items: data.videos,
poster: data.poster,
"in": data["in"] || 0,
position: 0,
position: data["in"] || 0,
duration: data.duration,
aspectratio: data.aspectratio
})
@ -86,10 +85,16 @@ function renderItem(data) {
video.addEventListener("loadedmetadata", event => {
//
})
function updateAnnotations(currentTime) {
video.addEventListener("timeupdate", event => {
var currentTime = video.currentTime()
if (currentTime >= data['out']) {
if (!video.paused) {
video.pause()
}
video.currentTime(data['in'])
}
div.querySelectorAll('.annotation').forEach(annot => {
var now = currentTime + (data["in"] || 0)
var now = currentTime
var start = parseFloat(annot.dataset.in)
var end = parseFloat(annot.dataset.out)
if (now >= start && now <= end) {
@ -102,18 +107,8 @@ function renderItem(data) {
}
}
})
}
video.addEventListener("timeupdate", event => {
var currentTime = video.currentTime()
if ((currentTime + (data["in"] || 0)) >= data['out']) {
if (!video.paused) {
video.pause()
}
video.currentTime(0)
}
updateAnnotations(currentTime)
})
updateAnnotations(data["position"] || 0)
if (item.next || item.previous) {
var nav = document.createElement('nav')
nav.classList.add('items')

2
update.py
View file

@ -304,8 +304,6 @@ if __name__ == "__main__":
run('./bin/pip', 'install', '-r', 'requirements.txt')
if old <= 6659:
run('./bin/pip', 'install', '-r', 'requirements.txt')
if old <= 6688:
run('./bin/pip', 'install', '-r', 'requirements.txt')
else:
if len(sys.argv) == 1:
branch = get_branch()