TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1304 from eikek/pdf-viewer

Browse Source 
Replace viewerjs with pdfjs viewer
This commit is contained in:
mergify[bot] 2022-01-19 23:29:08 +00:00 committed by GitHub
commit 0b5f4ca738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala
View File

@ -133,7 +133,8 @@ object AttachmentRoutes {
// this route exists to provide a stable url
// it redirects currently to viewerjs
val attachUrl = s"/api/v1/sec/attachment/${id.id}"
val path = s"/app/assets${Webjars.viewerjs}/index.html#$attachUrl"
val path =
s"/app/assets${Webjars.pdfjsdistviewermin}/build/minified/web/viewer.html?file=$attachUrl"
SeeOther(Location(Uri(path = Uri.Path.unsafeFromString(path))))
case GET -> Root / Ident(id) / "meta" =>

3
modules/restserver/src/main/scala/docspell/restserver/routes/ShareAttachmentRoutes.scala
View File

@ -45,7 +45,8 @@ object ShareAttachmentRoutes {
// this route exists to provide a stable url
// it redirects currently to viewerjs
val attachUrl = s"/api/v1/share/attachment/${id.id}"
val path = s"/app/assets${Webjars.viewerjs}/index.html#$attachUrl"
val path =
s"/app/assets${Webjars.pdfjsdistviewermin}/build/minified/web/viewer.html?file=$attachUrl"
SeeOther(Location(Uri(path = Uri.Path.unsafeFromString(path))))
case req @ GET -> Root / Ident(id) / "preview" =>

6
project/Dependencies.scala
View File

@ -34,6 +34,7 @@ object Dependencies {
val MUnitCatsEffectVersion = "1.0.7"
val OrganizeImportsVersion = "0.6.0"
val PdfboxVersion = "2.0.25"
val PdfjsViewerVersion = "2.9.359"
val PoiVersion = "4.1.2"
val PostgresVersion = "42.3.1"
val PureConfigVersion = "0.17.1"
@ -47,7 +48,6 @@ object Dependencies {
val TestContainerVersion = "0.39.12"
val TwelveMonkeysVersion = "3.8.1"
val JQueryVersion = "3.5.1"
val ViewerJSVersion = "0.5.9"
val jwtScala = Seq(
"com.github.jwt-scala" %% "jwt-circe" % JwtScalaVersion
@ -310,8 +310,8 @@ object Dependencies {
val webjars = Seq(
"org.webjars" % "swagger-ui" % SwaggerUIVersion,
"org.webjars" % "viewerjs" % ViewerJSVersion,
"org.webjars" % "clipboard.js" % ClipboardJsVersion
"org.webjars" % "clipboard.js" % ClipboardJsVersion,
"org.webjars.npm" % "pdfjs-dist-viewer-min" % PdfjsViewerVersion
)
val icu4j = Seq(