mirror of
https://github.com/hkalexling/Mango.git
synced 2025-08-03 03:15:31 -04:00
Merge branch 'dev'
This commit is contained in:
Alex Ling
commit
899b221842
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
|||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: crystallang/crystal:0.34.0-alpine
|
image: crystallang/crystal:0.35.1-alpine
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@ dist
|
|||||||
mango
|
mango
|
||||||
.env
|
.env
|
||||||
*.md
|
*.md
|
||||||
|
public/css/uikit.css
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
FROM crystallang/crystal:0.34.0-alpine AS builder
|
FROM crystallang/crystal:0.35.1-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /Mango
|
WORKDIR /Mango
|
||||||
|
|
||||||
|
|||||||
@ -50,7 +50,7 @@ The official docker images are available on [Dockerhub](https://hub.docker.com/r
|
|||||||
### CLI
|
### CLI
|
||||||
|
|
||||||
```
|
```
|
||||||
Mango - Manga Server and Web Reader. Version 0.6.1
|
Mango - Manga Server and Web Reader. Version 0.7.0
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
|
|||||||
13
gulpfile.js
13
gulpfile.js
@ -1,6 +1,7 @@
|
|||||||
const gulp = require('gulp');
|
const gulp = require('gulp');
|
||||||
const minify = require("gulp-babel-minify");
|
const minify = require("gulp-babel-minify");
|
||||||
const minifyCss = require('gulp-minify-css');
|
const minifyCss = require('gulp-minify-css');
|
||||||
|
const less = require('gulp-less');
|
||||||
|
|
||||||
gulp.task('minify-js', () => {
|
gulp.task('minify-js', () => {
|
||||||
return gulp.src('public/js/*.js')
|
return gulp.src('public/js/*.js')
|
||||||
@ -10,6 +11,12 @@ gulp.task('minify-js', () => {
|
|||||||
.pipe(gulp.dest('dist/js'));
|
.pipe(gulp.dest('dist/js'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
gulp.task('less', () => {
|
||||||
|
return gulp.src('src/assets/*.less')
|
||||||
|
.pipe(less())
|
||||||
|
.pipe(gulp.dest('public/css'));
|
||||||
|
});
|
||||||
|
|
||||||
gulp.task('minify-css', () => {
|
gulp.task('minify-css', () => {
|
||||||
return gulp.src('public/css/*.css')
|
return gulp.src('public/css/*.css')
|
||||||
.pipe(minifyCss())
|
.pipe(minifyCss())
|
||||||
@ -21,9 +28,9 @@ gulp.task('img', () => {
|
|||||||
.pipe(gulp.dest('dist/img'));
|
.pipe(gulp.dest('dist/img'));
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('favicon', () => {
|
gulp.task('copy-files', () => {
|
||||||
return gulp.src('public/favicon.ico')
|
return gulp.src('public/*.*')
|
||||||
.pipe(gulp.dest('dist'));
|
.pipe(gulp.dest('dist'));
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('default', gulp.parallel('minify-js', 'minify-css', 'img', 'favicon'));
|
gulp.task('default', gulp.parallel('minify-js', gulp.series('less', 'minify-css'), 'img', 'copy-files'));
|
||||||
|
|||||||
@ -8,9 +8,14 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^4.0.2",
|
||||||
"gulp-babel-minify": "^0.5.1",
|
"gulp-babel-minify": "^0.5.1",
|
||||||
"gulp-minify-css": "^1.2.4"
|
"gulp-less": "^4.0.1",
|
||||||
|
"gulp-minify-css": "^1.2.4",
|
||||||
|
"less": "^3.11.3"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"uglify": "gulp"
|
"uglify": "gulp"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"uikit": "^3.5.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,44 +24,48 @@ const loadConfig = () => {
|
|||||||
const remove = (id) => {
|
const remove = (id) => {
|
||||||
var url = base_url + 'api/admin/mangadex/queue/delete';
|
var url = base_url + 'api/admin/mangadex/queue/delete';
|
||||||
if (id !== undefined)
|
if (id !== undefined)
|
||||||
url += '?' + $.param({id: id});
|
url += '?' + $.param({
|
||||||
|
id: id
|
||||||
|
});
|
||||||
console.log(url);
|
console.log(url);
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: url,
|
url: url,
|
||||||
dataType: 'json'
|
dataType: 'json'
|
||||||
})
|
})
|
||||||
.done(data => {
|
.done(data => {
|
||||||
if (!data.success && data.error) {
|
if (!data.success && data.error) {
|
||||||
alert('danger', `Failed to remove job from download queue. Error: ${data.error}`);
|
alert('danger', `Failed to remove job from download queue. Error: ${data.error}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
load();
|
load();
|
||||||
})
|
})
|
||||||
.fail((jqXHR, status) => {
|
.fail((jqXHR, status) => {
|
||||||
alert('danger', `Failed to remove job from download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
alert('danger', `Failed to remove job from download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const refresh = (id) => {
|
const refresh = (id) => {
|
||||||
var url = base_url + 'api/admin/mangadex/queue/retry';
|
var url = base_url + 'api/admin/mangadex/queue/retry';
|
||||||
if (id !== undefined)
|
if (id !== undefined)
|
||||||
url += '?' + $.param({id: id});
|
url += '?' + $.param({
|
||||||
|
id: id
|
||||||
|
});
|
||||||
console.log(url);
|
console.log(url);
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: url,
|
url: url,
|
||||||
dataType: 'json'
|
dataType: 'json'
|
||||||
})
|
})
|
||||||
.done(data => {
|
.done(data => {
|
||||||
if (!data.success && data.error) {
|
if (!data.success && data.error) {
|
||||||
alert('danger', `Failed to restart download job. Error: ${data.error}`);
|
alert('danger', `Failed to restart download job. Error: ${data.error}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
load();
|
load();
|
||||||
})
|
})
|
||||||
.fail((jqXHR, status) => {
|
.fail((jqXHR, status) => {
|
||||||
alert('danger', `Failed to restart download job. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
alert('danger', `Failed to restart download job. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const toggle = () => {
|
const toggle = () => {
|
||||||
$('#pause-resume-btn').attr('disabled', '');
|
$('#pause-resume-btn').attr('disabled', '');
|
||||||
@ -69,50 +73,52 @@ const toggle = () => {
|
|||||||
const action = paused ? 'resume' : 'pause';
|
const action = paused ? 'resume' : 'pause';
|
||||||
const url = `${base_url}api/admin/mangadex/queue/${action}`;
|
const url = `${base_url}api/admin/mangadex/queue/${action}`;
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: url,
|
url: url,
|
||||||
dataType: 'json'
|
dataType: 'json'
|
||||||
})
|
})
|
||||||
.fail((jqXHR, status) => {
|
.fail((jqXHR, status) => {
|
||||||
alert('danger', `Failed to ${action} download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
alert('danger', `Failed to ${action} download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
||||||
})
|
})
|
||||||
.always(() => {
|
.always(() => {
|
||||||
load();
|
load();
|
||||||
$('#pause-resume-btn').removeAttr('disabled');
|
$('#pause-resume-btn').removeAttr('disabled');
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const load = () => {
|
const load = () => {
|
||||||
if (loading) return;
|
if (loading) return;
|
||||||
loading = true;
|
loading = true;
|
||||||
console.log('fetching');
|
console.log('fetching');
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: base_url + 'api/admin/mangadex/queue',
|
url: base_url + 'api/admin/mangadex/queue',
|
||||||
dataType: 'json'
|
dataType: 'json'
|
||||||
})
|
})
|
||||||
.done(data => {
|
.done(data => {
|
||||||
if (!data.success && data.error) {
|
if (!data.success && data.error) {
|
||||||
alert('danger', `Failed to fetch download queue. Error: ${data.error}`);
|
alert('danger', `Failed to fetch download queue. Error: ${data.error}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
console.log(data);
|
console.log(data);
|
||||||
const btnText = data.paused ? "Resume download" : "Pause download";
|
const btnText = data.paused ? "Resume download" : "Pause download";
|
||||||
$('#pause-resume-btn').text(btnText);
|
$('#pause-resume-btn').text(btnText);
|
||||||
$('#pause-resume-btn').removeAttr('hidden');
|
$('#pause-resume-btn').removeAttr('hidden');
|
||||||
const rows = data.jobs.map(obj => {
|
const rows = data.jobs.map(obj => {
|
||||||
var cls = 'uk-label ';
|
var cls = 'label ';
|
||||||
if (obj.status === 'Completed')
|
if (obj.status === 'Pending')
|
||||||
cls += 'uk-label-success';
|
cls += 'label-pending';
|
||||||
if (obj.status === 'Error')
|
if (obj.status === 'Completed')
|
||||||
cls += 'uk-label-danger';
|
cls += 'label-success';
|
||||||
if (obj.status === 'MissingPages')
|
if (obj.status === 'Error')
|
||||||
cls += 'uk-label-warning';
|
cls += 'label-danger';
|
||||||
|
if (obj.status === 'MissingPages')
|
||||||
|
cls += 'label-warning';
|
||||||
|
|
||||||
const info = obj.status_message.length > 0 ? '<span uk-icon="info"></span>' : '';
|
const info = obj.status_message.length > 0 ? '<span uk-icon="info"></span>' : '';
|
||||||
const statusSpan = `<span class="${cls}">${obj.status} ${info}</span>`;
|
const statusSpan = `<span class="${cls}">${obj.status} ${info}</span>`;
|
||||||
const dropdown = obj.status_message.length > 0 ? `<div uk-dropdown>${obj.status_message}</div>` : '';
|
const dropdown = obj.status_message.length > 0 ? `<div uk-dropdown>${obj.status_message}</div>` : '';
|
||||||
const retryBtn = obj.status_message.length > 0 ? `<a onclick="refresh('${obj.id}')" uk-icon="refresh"></a>` : '';
|
const retryBtn = obj.status_message.length > 0 ? `<a onclick="refresh('${obj.id}')" uk-icon="refresh"></a>` : '';
|
||||||
return `<tr id="chapter-${obj.id}">
|
return `<tr id="chapter-${obj.id}">
|
||||||
<td><a href="${baseURL}/chapter/${obj.id}">${obj.title}</a></td>
|
<td><a href="${baseURL}/chapter/${obj.id}">${obj.title}</a></td>
|
||||||
<td><a href="${baseURL}/manga/${obj.manga_id}">${obj.manga_title}</a></td>
|
<td><a href="${baseURL}/manga/${obj.manga_id}">${obj.manga_title}</a></td>
|
||||||
<td>${obj.success_count}/${obj.pages}</td>
|
<td>${obj.success_count}/${obj.pages}</td>
|
||||||
@ -123,16 +129,16 @@ const load = () => {
|
|||||||
${retryBtn}
|
${retryBtn}
|
||||||
</td>
|
</td>
|
||||||
</tr>`;
|
</tr>`;
|
||||||
});
|
});
|
||||||
|
|
||||||
const tbody = `<tbody>${rows.join('')}</tbody>`;
|
const tbody = `<tbody>${rows.join('')}</tbody>`;
|
||||||
$('tbody').remove();
|
$('tbody').remove();
|
||||||
$('table').append(tbody);
|
$('table').append(tbody);
|
||||||
})
|
})
|
||||||
.fail((jqXHR, status) => {
|
.fail((jqXHR, status) => {
|
||||||
alert('danger', `Failed to fetch download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
alert('danger', `Failed to fetch download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
|
||||||
})
|
})
|
||||||
.always(() => {
|
.always(() => {
|
||||||
loading = false;
|
loading = false;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@ -22,8 +22,7 @@ const setTheme = themeStr => {
|
|||||||
$('.uk-card').addClass('uk-card-secondary');
|
$('.uk-card').addClass('uk-card-secondary');
|
||||||
$('.uk-card').removeClass('uk-card-default');
|
$('.uk-card').removeClass('uk-card-default');
|
||||||
$('.ui-widget-content').addClass('dark');
|
$('.ui-widget-content').addClass('dark');
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$('html').css('background', '');
|
$('html').css('background', '');
|
||||||
$('body').removeClass('uk-light');
|
$('body').removeClass('uk-light');
|
||||||
$('.uk-card').removeClass('uk-card-secondary');
|
$('.uk-card').removeClass('uk-card-secondary');
|
||||||
@ -39,5 +38,11 @@ const styleModal = () => {
|
|||||||
$('.uk-modal-footer').css('background', color);
|
$('.uk-modal-footer').css('background', color);
|
||||||
};
|
};
|
||||||
|
|
||||||
// do it before document is ready to prevent the initial flash of white
|
// do it before document is ready to prevent the initial flash of white on
|
||||||
|
// most pages
|
||||||
setTheme(getTheme());
|
setTheme(getTheme());
|
||||||
|
|
||||||
|
$(() => {
|
||||||
|
// hack for the reader page
|
||||||
|
setTheme(getTheme());
|
||||||
|
});
|
||||||
|
|||||||
@ -8,12 +8,12 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
|
|||||||
if (percentage === 0) {
|
if (percentage === 0) {
|
||||||
$('#continue-btn').attr('hidden', '');
|
$('#continue-btn').attr('hidden', '');
|
||||||
$('#unread-btn').attr('hidden', '');
|
$('#unread-btn').attr('hidden', '');
|
||||||
|
} else if (percentage === 100) {
|
||||||
|
$('#read-btn').attr('hidden', '');
|
||||||
|
$('#continue-btn').attr('hidden', '');
|
||||||
} else {
|
} else {
|
||||||
$('#continue-btn').text('Continue from ' + percentage + '%');
|
$('#continue-btn').text('Continue from ' + percentage + '%');
|
||||||
}
|
}
|
||||||
if (percentage === 100) {
|
|
||||||
$('#read-btn').attr('hidden', '');
|
|
||||||
}
|
|
||||||
|
|
||||||
$('#modal-title-link').text(title);
|
$('#modal-title-link').text(title);
|
||||||
$('#modal-title-link').attr('href', `${base_url}book/${titleID}`);
|
$('#modal-title-link').attr('href', `${base_url}book/${titleID}`);
|
||||||
@ -35,7 +35,9 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
|
|||||||
updateProgress(titleID, entryID, 0);
|
updateProgress(titleID, entryID, 0);
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.uk-modal-title.break-word > a').attr('onclick', `edit("${entryID}")`);
|
$('#modal-edit-btn').attr('onclick', `edit("${entryID}")`);
|
||||||
|
|
||||||
|
$('#modal-download-btn').attr('href', `/opds/download/${titleID}/${entryID}`);
|
||||||
|
|
||||||
UIkit.modal($('#modal')).show();
|
UIkit.modal($('#modal')).show();
|
||||||
styleModal();
|
styleModal();
|
||||||
|
|||||||
2
public/robots.txt
Normal file
2
public/robots.txt
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
User-agent: *
|
||||||
|
Disallow: /
|
||||||
26
shard.lock
26
shard.lock
@ -1,46 +1,46 @@
|
|||||||
version: 1.0
|
version: 2.0
|
||||||
shards:
|
shards:
|
||||||
ameba:
|
ameba:
|
||||||
github: crystal-ameba/ameba
|
git: https://github.com/crystal-ameba/ameba.git
|
||||||
version: 0.12.1
|
version: 0.12.1
|
||||||
|
|
||||||
archive:
|
archive:
|
||||||
github: hkalexling/archive.cr
|
git: https://github.com/hkalexling/archive.cr.git
|
||||||
version: 0.2.0
|
version: 0.2.0
|
||||||
|
|
||||||
baked_file_system:
|
baked_file_system:
|
||||||
github: schovi/baked_file_system
|
git: https://github.com/schovi/baked_file_system.git
|
||||||
version: 0.9.8
|
version: 0.9.8
|
||||||
|
|
||||||
clim:
|
clim:
|
||||||
github: at-grandpa/clim
|
git: https://github.com/at-grandpa/clim.git
|
||||||
version: 0.12.0
|
version: 0.12.0
|
||||||
|
|
||||||
db:
|
db:
|
||||||
github: crystal-lang/crystal-db
|
git: https://github.com/crystal-lang/crystal-db.git
|
||||||
version: 0.9.0
|
version: 0.9.0
|
||||||
|
|
||||||
exception_page:
|
exception_page:
|
||||||
github: crystal-loot/exception_page
|
git: https://github.com/crystal-loot/exception_page.git
|
||||||
version: 0.1.4
|
version: 0.1.4
|
||||||
|
|
||||||
kemal:
|
kemal:
|
||||||
github: kemalcr/kemal
|
git: https://github.com/kemalcr/kemal.git
|
||||||
version: 0.26.1
|
version: 0.26.1+git.commit.a8c0f09b858162bd13c96663febef5527b322a32
|
||||||
|
|
||||||
kemal-session:
|
kemal-session:
|
||||||
github: kemalcr/kemal-session
|
git: https://github.com/kemalcr/kemal-session.git
|
||||||
version: 0.12.1
|
version: 0.12.1
|
||||||
|
|
||||||
kilt:
|
kilt:
|
||||||
github: jeromegn/kilt
|
git: https://github.com/jeromegn/kilt.git
|
||||||
version: 0.4.0
|
version: 0.4.0
|
||||||
|
|
||||||
radix:
|
radix:
|
||||||
github: luislavena/radix
|
git: https://github.com/luislavena/radix.git
|
||||||
version: 0.3.9
|
version: 0.3.9
|
||||||
|
|
||||||
sqlite3:
|
sqlite3:
|
||||||
github: crystal-lang/crystal-sqlite3
|
git: https://github.com/crystal-lang/crystal-sqlite3.git
|
||||||
version: 0.16.0
|
version: 0.16.0
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
name: mango
|
name: mango
|
||||||
version: 0.6.1
|
version: 0.7.0
|
||||||
|
|
||||||
authors:
|
authors:
|
||||||
- Alex Ling <hkalexling@gmail.com>
|
- Alex Ling <hkalexling@gmail.com>
|
||||||
@ -8,13 +8,14 @@ targets:
|
|||||||
mango:
|
mango:
|
||||||
main: src/mango.cr
|
main: src/mango.cr
|
||||||
|
|
||||||
crystal: 0.34.0
|
crystal: 0.35.0
|
||||||
|
|
||||||
license: MIT
|
license: MIT
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
kemal:
|
kemal:
|
||||||
github: kemalcr/kemal
|
github: kemalcr/kemal
|
||||||
|
commit: a8c0f09b858162bd13c96663febef5527b322a32
|
||||||
kemal-session:
|
kemal-session:
|
||||||
github: kemalcr/kemal-session
|
github: kemalcr/kemal-session
|
||||||
sqlite3:
|
sqlite3:
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
require "zip"
|
require "compress/zip"
|
||||||
require "archive"
|
require "archive"
|
||||||
|
|
||||||
# A unified class to handle all supported archive formats. It uses the ::Zip
|
# A unified class to handle all supported archive formats. It uses the
|
||||||
# module in crystal standard library if the target file is a zip archive.
|
# Compress::Zip module in crystal standard library if the target file is a
|
||||||
# Otherwise it uses `archive.cr`.
|
# zip archive. Otherwise it uses `archive.cr`.
|
||||||
class ArchiveFile
|
class ArchiveFile
|
||||||
def initialize(@filename : String)
|
def initialize(@filename : String)
|
||||||
if [".cbz", ".zip"].includes? File.extname filename
|
if [".cbz", ".zip"].includes? File.extname filename
|
||||||
@archive_file = Zip::File.new filename
|
@archive_file = Compress::Zip::File.new filename
|
||||||
else
|
else
|
||||||
@archive_file = Archive::File.new filename
|
@archive_file = Archive::File.new filename
|
||||||
end
|
end
|
||||||
@ -20,16 +20,16 @@ class ArchiveFile
|
|||||||
end
|
end
|
||||||
|
|
||||||
def close
|
def close
|
||||||
if @archive_file.is_a? Zip::File
|
if @archive_file.is_a? Compress::Zip::File
|
||||||
@archive_file.as(Zip::File).close
|
@archive_file.as(Compress::Zip::File).close
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Lists all file entries
|
# Lists all file entries
|
||||||
def entries
|
def entries
|
||||||
ary = [] of Zip::File::Entry | Archive::Entry
|
ary = [] of Compress::Zip::File::Entry | Archive::Entry
|
||||||
@archive_file.entries.map do |e|
|
@archive_file.entries.map do |e|
|
||||||
if (e.is_a? Zip::File::Entry && e.file?) ||
|
if (e.is_a? Compress::Zip::File::Entry && e.file?) ||
|
||||||
(e.is_a? Archive::Entry && e.info.file?)
|
(e.is_a? Archive::Entry && e.info.file?)
|
||||||
ary.push e
|
ary.push e
|
||||||
end
|
end
|
||||||
@ -37,8 +37,8 @@ class ArchiveFile
|
|||||||
ary
|
ary
|
||||||
end
|
end
|
||||||
|
|
||||||
def read_entry(e : Zip::File::Entry | Archive::Entry) : Bytes?
|
def read_entry(e : Compress::Zip::File::Entry | Archive::Entry) : Bytes?
|
||||||
if e.is_a? Zip::File::Entry
|
if e.is_a? Compress::Zip::File::Entry
|
||||||
data = nil
|
data = nil
|
||||||
e.open do |io|
|
e.open do |io|
|
||||||
slice = Bytes.new e.uncompressed_size
|
slice = Bytes.new e.uncompressed_size
|
||||||
|
|||||||
33
src/assets/uikit.less
Normal file
33
src/assets/uikit.less
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
@import "node_modules/uikit/src/less/uikit.theme.less";
|
||||||
|
|
||||||
|
.label {
|
||||||
|
display: inline-block;
|
||||||
|
padding: @label-padding-vertical @label-padding-horizontal;
|
||||||
|
background: @label-background;
|
||||||
|
line-height: @label-line-height;
|
||||||
|
font-size: @label-font-size;
|
||||||
|
color: @label-color;
|
||||||
|
vertical-align: middle;
|
||||||
|
white-space: nowrap;
|
||||||
|
.hook-label;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label-success {
|
||||||
|
background-color: @label-success-background;
|
||||||
|
color: @label-success-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label-warning {
|
||||||
|
background-color: @label-warning-background;
|
||||||
|
color: @label-warning-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label-danger {
|
||||||
|
background-color: @label-danger-background;
|
||||||
|
color: @label-danger-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label-pending {
|
||||||
|
background-color: @global-secondary-background;
|
||||||
|
color: @global-inverse-color;
|
||||||
|
}
|
||||||
306
src/library.cr
306
src/library.cr
@ -4,6 +4,8 @@ require "uri"
|
|||||||
require "./util"
|
require "./util"
|
||||||
require "./archive"
|
require "./archive"
|
||||||
|
|
||||||
|
SUPPORTED_IMG_TYPES = ["image/jpeg", "image/png", "image/webp"]
|
||||||
|
|
||||||
struct Image
|
struct Image
|
||||||
property data : Bytes
|
property data : Bytes
|
||||||
property mime : String
|
property mime : String
|
||||||
@ -17,8 +19,7 @@ end
|
|||||||
class Entry
|
class Entry
|
||||||
property zip_path : String, book : Title, title : String,
|
property zip_path : String, book : Title, title : String,
|
||||||
size : String, pages : Int32, id : String, title_id : String,
|
size : String, pages : Int32, id : String, title_id : String,
|
||||||
encoded_path : String, encoded_title : String, mtime : Time,
|
encoded_path : String, encoded_title : String, mtime : Time
|
||||||
date_added : Time
|
|
||||||
|
|
||||||
def initialize(path, @book, @title_id, storage)
|
def initialize(path, @book, @title_id, storage)
|
||||||
@zip_path = path
|
@zip_path = path
|
||||||
@ -28,13 +29,12 @@ class Entry
|
|||||||
@size = (File.size path).humanize_bytes
|
@size = (File.size path).humanize_bytes
|
||||||
file = ArchiveFile.new path
|
file = ArchiveFile.new path
|
||||||
@pages = file.entries.count do |e|
|
@pages = file.entries.count do |e|
|
||||||
["image/jpeg", "image/png"].includes? \
|
SUPPORTED_IMG_TYPES.includes? \
|
||||||
MIME.from_filename? e.filename
|
MIME.from_filename? e.filename
|
||||||
end
|
end
|
||||||
file.close
|
file.close
|
||||||
@id = storage.get_id @zip_path, false
|
@id = storage.get_id @zip_path, false
|
||||||
@mtime = File.info(@zip_path).modification_time
|
@mtime = File.info(@zip_path).modification_time
|
||||||
@date_added = load_date_added
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_json(json : JSON::Builder)
|
def to_json(json : JSON::Builder)
|
||||||
@ -74,7 +74,7 @@ class Entry
|
|||||||
ArchiveFile.open @zip_path do |file|
|
ArchiveFile.open @zip_path do |file|
|
||||||
page = file.entries
|
page = file.entries
|
||||||
.select { |e|
|
.select { |e|
|
||||||
["image/jpeg", "image/png"].includes? \
|
SUPPORTED_IMG_TYPES.includes? \
|
||||||
MIME.from_filename? e.filename
|
MIME.from_filename? e.filename
|
||||||
}
|
}
|
||||||
.sort { |a, b|
|
.sort { |a, b|
|
||||||
@ -90,7 +90,19 @@ class Entry
|
|||||||
img
|
img
|
||||||
end
|
end
|
||||||
|
|
||||||
private def load_date_added
|
def next_entry
|
||||||
|
idx = @book.entries.index self
|
||||||
|
return nil if idx.nil? || idx == @book.entries.size - 1
|
||||||
|
@book.entries[idx + 1]
|
||||||
|
end
|
||||||
|
|
||||||
|
def previous_entry
|
||||||
|
idx = @book.entries.index self
|
||||||
|
return nil if idx.nil? || idx == 0
|
||||||
|
@book.entries[idx - 1]
|
||||||
|
end
|
||||||
|
|
||||||
|
def date_added
|
||||||
date_added = nil
|
date_added = nil
|
||||||
TitleInfo.new @book.dir do |info|
|
TitleInfo.new @book.dir do |info|
|
||||||
info_da = info.date_added[@title]?
|
info_da = info.date_added[@title]?
|
||||||
@ -103,6 +115,60 @@ class Entry
|
|||||||
end
|
end
|
||||||
date_added.not_nil! # is it ok to set not_nil! here?
|
date_added.not_nil! # is it ok to set not_nil! here?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# For backward backward compatibility with v0.1.0, we save entry titles
|
||||||
|
# instead of IDs in info.json
|
||||||
|
def save_progress(username, page)
|
||||||
|
TitleInfo.new @book.dir do |info|
|
||||||
|
if info.progress[username]?.nil?
|
||||||
|
info.progress[username] = {@title => page}
|
||||||
|
else
|
||||||
|
info.progress[username][@title] = page
|
||||||
|
end
|
||||||
|
# save last_read timestamp
|
||||||
|
if info.last_read[username]?.nil?
|
||||||
|
info.last_read[username] = {@title => Time.utc}
|
||||||
|
else
|
||||||
|
info.last_read[username][@title] = Time.utc
|
||||||
|
end
|
||||||
|
info.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def load_progress(username)
|
||||||
|
progress = 0
|
||||||
|
TitleInfo.new @book.dir do |info|
|
||||||
|
unless info.progress[username]?.nil? ||
|
||||||
|
info.progress[username][@title]?.nil?
|
||||||
|
progress = info.progress[username][@title]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
[progress, @pages].min
|
||||||
|
end
|
||||||
|
|
||||||
|
def load_percentage(username)
|
||||||
|
page = load_progress username
|
||||||
|
page / @pages
|
||||||
|
end
|
||||||
|
|
||||||
|
def load_last_read(username)
|
||||||
|
last_read = nil
|
||||||
|
TitleInfo.new @book.dir do |info|
|
||||||
|
unless info.last_read[username]?.nil? ||
|
||||||
|
info.last_read[username][@title]?.nil?
|
||||||
|
last_read = info.last_read[username][@title]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
last_read
|
||||||
|
end
|
||||||
|
|
||||||
|
def finished?(username)
|
||||||
|
load_progress(username) == @pages
|
||||||
|
end
|
||||||
|
|
||||||
|
def started?(username)
|
||||||
|
load_progress(username) > 0
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class Title
|
class Title
|
||||||
@ -191,6 +257,17 @@ class Title
|
|||||||
@title_ids.map { |tid| @library.get_title! tid }
|
@title_ids.map { |tid| @library.get_title! tid }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Get all entries, including entries in nested titles
|
||||||
|
def deep_entries
|
||||||
|
return @entries if title_ids.empty?
|
||||||
|
@entries + titles.map { |t| t.deep_entries }.flatten
|
||||||
|
end
|
||||||
|
|
||||||
|
def deep_titles
|
||||||
|
return [] of Title if titles.empty?
|
||||||
|
titles + titles.map { |t| t.deep_titles }.flatten
|
||||||
|
end
|
||||||
|
|
||||||
def parents
|
def parents
|
||||||
ary = [] of Title
|
ary = [] of Title
|
||||||
tid = @parent_id
|
tid = @parent_id
|
||||||
@ -199,7 +276,7 @@ class Title
|
|||||||
ary << title
|
ary << title
|
||||||
tid = title.parent_id
|
tid = title.parent_id
|
||||||
end
|
end
|
||||||
ary
|
ary.reverse
|
||||||
end
|
end
|
||||||
|
|
||||||
def size
|
def size
|
||||||
@ -279,7 +356,7 @@ class Title
|
|||||||
# Set the reading progress of all entries and nested libraries to 100%
|
# Set the reading progress of all entries and nested libraries to 100%
|
||||||
def read_all(username)
|
def read_all(username)
|
||||||
@entries.each do |e|
|
@entries.each do |e|
|
||||||
save_progress username, e.title, e.pages
|
e.save_progress username, e.pages
|
||||||
end
|
end
|
||||||
titles.each do |t|
|
titles.each do |t|
|
||||||
t.read_all username
|
t.read_all username
|
||||||
@ -289,81 +366,25 @@ class Title
|
|||||||
# Set the reading progress of all entries and nested libraries to 0%
|
# Set the reading progress of all entries and nested libraries to 0%
|
||||||
def unread_all(username)
|
def unread_all(username)
|
||||||
@entries.each do |e|
|
@entries.each do |e|
|
||||||
save_progress username, e.title, 0
|
e.save_progress username, 0
|
||||||
end
|
end
|
||||||
titles.each do |t|
|
titles.each do |t|
|
||||||
t.unread_all username
|
t.unread_all username
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# For backward backward compatibility with v0.1.0, we save entry titles
|
def deep_read_page_count(username) : Int32
|
||||||
# instead of IDs in info.json
|
entries.map { |e| e.load_progress username }.sum +
|
||||||
def save_progress(username, entry, page)
|
titles.map { |t| t.deep_read_page_count username }.flatten.sum
|
||||||
TitleInfo.new @dir do |info|
|
|
||||||
if info.progress[username]?.nil?
|
|
||||||
info.progress[username] = {entry => page}
|
|
||||||
else
|
|
||||||
info.progress[username][entry] = page
|
|
||||||
end
|
|
||||||
# save last_read timestamp
|
|
||||||
if info.last_read[username]?.nil?
|
|
||||||
info.last_read[username] = {entry => Time.utc}
|
|
||||||
else
|
|
||||||
info.last_read[username][entry] = Time.utc
|
|
||||||
end
|
|
||||||
info.save
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def load_progress(username, entry)
|
def deep_total_page_count : Int32
|
||||||
progress = 0
|
entries.map { |e| e.pages }.sum +
|
||||||
TitleInfo.new @dir do |info|
|
titles.map { |t| t.deep_total_page_count }.flatten.sum
|
||||||
unless info.progress[username]?.nil? ||
|
|
||||||
info.progress[username][entry]?.nil?
|
|
||||||
progress = info.progress[username][entry]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
progress
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_percentage(username, entry)
|
|
||||||
page = load_progress username, entry
|
|
||||||
entry_obj = @entries.find { |e| e.title == entry }
|
|
||||||
return 0.0 if entry_obj.nil?
|
|
||||||
page / entry_obj.pages
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def load_percentage(username)
|
def load_percentage(username)
|
||||||
return 0.0 if @entries.empty?
|
deep_read_page_count(username) / deep_total_page_count
|
||||||
read_pages = total_pages = 0
|
|
||||||
@entries.each do |e|
|
|
||||||
read_pages += load_progress username, e.title
|
|
||||||
total_pages += e.pages
|
|
||||||
end
|
|
||||||
read_pages / total_pages
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_last_read(username, entry)
|
|
||||||
last_read = nil
|
|
||||||
TitleInfo.new @dir do |info|
|
|
||||||
unless info.last_read[username]?.nil? ||
|
|
||||||
info.last_read[username][entry]?.nil?
|
|
||||||
last_read = info.last_read[username][entry]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
last_read
|
|
||||||
end
|
|
||||||
|
|
||||||
def next_entry(current_entry_obj)
|
|
||||||
idx = @entries.index current_entry_obj
|
|
||||||
return nil if idx.nil? || idx == @entries.size - 1
|
|
||||||
@entries[idx + 1]
|
|
||||||
end
|
|
||||||
|
|
||||||
def previous_entry(current_entry_obj)
|
|
||||||
idx = @entries.index current_entry_obj
|
|
||||||
return nil if idx.nil? || idx == 0
|
|
||||||
@entries[idx - 1]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_continue_reading_entry(username)
|
def get_continue_reading_entry(username)
|
||||||
@ -380,17 +401,6 @@ class Title
|
|||||||
latest_read_entry
|
latest_read_entry
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# TODO: More concise title?
|
|
||||||
def get_last_read_for_continue_reading(username, entry_obj)
|
|
||||||
last_read = load_last_read username, entry_obj.title
|
|
||||||
# grab from previous entry if current entry hasn't been started yet
|
|
||||||
if last_read.nil?
|
|
||||||
previous_entry = previous_entry(entry_obj)
|
|
||||||
return load_last_read username, previous_entry.title if previous_entry
|
|
||||||
end
|
|
||||||
last_read
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class TitleInfo
|
class TitleInfo
|
||||||
@ -470,6 +480,10 @@ class Library
|
|||||||
@title_ids.map { |tid| self.get_title!(tid) }
|
@title_ids.map { |tid| self.get_title!(tid) }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def deep_titles
|
||||||
|
titles + titles.map { |t| t.deep_titles }.flatten
|
||||||
|
end
|
||||||
|
|
||||||
def to_json(json : JSON::Builder)
|
def to_json(json : JSON::Builder)
|
||||||
json.object do
|
json.object do
|
||||||
json.field "dir", @dir
|
json.field "dir", @dir
|
||||||
@ -509,23 +523,37 @@ class Library
|
|||||||
end
|
end
|
||||||
|
|
||||||
def get_continue_reading_entries(username)
|
def get_continue_reading_entries(username)
|
||||||
# map: get the continue-reading entry or nil for each Title
|
cr_entries = deep_titles
|
||||||
# select: select only entries (and ignore Nil's) from the array
|
# For each Title, get the last read entry. If the user has finished
|
||||||
# produced by map
|
# reading this entry, get the next entry
|
||||||
continue_reading_entries = titles.map { |t|
|
.map { |t|
|
||||||
get_continue_reading_entry username, t
|
last_read_entry = t.entries.reverse_each.find do |e|
|
||||||
}.select Entry
|
e.started? username
|
||||||
|
end
|
||||||
continue_reading = continue_reading_entries.map { |e|
|
if last_read_entry && last_read_entry.finished? username
|
||||||
{
|
last_read_entry = last_read_entry.next_entry
|
||||||
entry: e,
|
end
|
||||||
percentage: e.book.load_percentage(username, e.title),
|
last_read_entry
|
||||||
last_read: get_relevant_last_read(username, e),
|
}
|
||||||
|
# Select elements with type `Entry` from the array and ignore all `Nil`s
|
||||||
|
.select(Entry)
|
||||||
|
.map { |e|
|
||||||
|
# Get the last read time of the entry. If it hasn't been started, get
|
||||||
|
# the last read time of the previous entry
|
||||||
|
last_read = e.load_last_read username
|
||||||
|
pe = e.previous_entry
|
||||||
|
if last_read.nil? && pe
|
||||||
|
last_read = pe.load_last_read username
|
||||||
|
end
|
||||||
|
{
|
||||||
|
entry: e,
|
||||||
|
percentage: e.load_percentage(username),
|
||||||
|
last_read: last_read,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
# Sort by by last_read, most recent first (nils at the end)
|
# Sort by by last_read, most recent first (nils at the end)
|
||||||
continue_reading.sort! { |a, b|
|
cr_entries.sort { |a, b|
|
||||||
next 0 if a[:last_read].nil? && b[:last_read].nil?
|
next 0 if a[:last_read].nil? && b[:last_read].nil?
|
||||||
next 1 if a[:last_read].nil?
|
next 1 if a[:last_read].nil?
|
||||||
next -1 if b[:last_read].nil?
|
next -1 if b[:last_read].nil?
|
||||||
@ -533,65 +561,39 @@ class Library
|
|||||||
}[0..11]
|
}[0..11]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
alias RA = NamedTuple(
|
||||||
|
entry: Entry,
|
||||||
|
percentage: Float64,
|
||||||
|
grouped_count: Int32)
|
||||||
|
|
||||||
def get_recently_added_entries(username)
|
def get_recently_added_entries(username)
|
||||||
# Get all entries added within the last three months
|
recently_added = [] of RA
|
||||||
entries = titles.map { |t| t.entries }
|
|
||||||
|
titles.map { |t| t.deep_entries }
|
||||||
.flatten
|
.flatten
|
||||||
.select { |e| e.date_added > 3.months.ago }
|
.select { |e| e.date_added > 1.month.ago }
|
||||||
|
.sort { |a, b| b.date_added <=> a.date_added }
|
||||||
# Group entries in a Hash by title ID
|
.each do |e|
|
||||||
grouped_entries = {} of String => Array(Entry)
|
last = recently_added.last?
|
||||||
entries.each do |e|
|
if last && e.title_id == last[:entry].title_id &&
|
||||||
if grouped_entries.has_key? e.title_id
|
(e.date_added - last[:entry].date_added).duration < 1.day
|
||||||
grouped_entries[e.title_id].push e
|
# A NamedTuple is immutable, so we have to cast it to a Hash first
|
||||||
else
|
last_hash = last.to_h
|
||||||
grouped_entries[e.title_id] = [e]
|
count = last_hash[:grouped_count].as(Int32)
|
||||||
|
last_hash[:grouped_count] = count + 1
|
||||||
|
# Setting the percentage to a negative value will hide the
|
||||||
|
# percentage badge on the card
|
||||||
|
last_hash[:percentage] = -1.0
|
||||||
|
recently_added[recently_added.size - 1] = RA.from last_hash
|
||||||
|
else
|
||||||
|
recently_added << {
|
||||||
|
entry: e,
|
||||||
|
percentage: e.load_percentage(username),
|
||||||
|
grouped_count: 1,
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
# Cast the Hash to an Array of Tuples and sort it by date_added
|
|
||||||
grouped_ary = grouped_entries.to_a.sort do |a, b|
|
|
||||||
date_added_a = a[1].map { |e| e.date_added }.max
|
|
||||||
date_added_b = b[1].map { |e| e.date_added }.max
|
|
||||||
date_added_b <=> date_added_a
|
|
||||||
end
|
|
||||||
|
|
||||||
recently_added = grouped_ary.map do |_, ary|
|
|
||||||
# Get the most recently added entry in the group
|
|
||||||
entry = ary.sort { |a, b| a.date_added <=> b.date_added }.last
|
|
||||||
{
|
|
||||||
entry: entry,
|
|
||||||
percentage: entry.book.load_percentage(username, entry.title),
|
|
||||||
grouped_count: ary.size,
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
recently_added[0..11]
|
recently_added[0..11]
|
||||||
end
|
end
|
||||||
|
|
||||||
private def get_continue_reading_entry(username, title)
|
|
||||||
in_progress_entries = title.entries.select do |e|
|
|
||||||
title.load_progress(username, e.title) > 0
|
|
||||||
end
|
|
||||||
return nil if in_progress_entries.empty?
|
|
||||||
|
|
||||||
latest_read_entry = in_progress_entries[-1]
|
|
||||||
if title.load_progress(username, latest_read_entry.title) ==
|
|
||||||
latest_read_entry.pages
|
|
||||||
title.next_entry latest_read_entry
|
|
||||||
else
|
|
||||||
latest_read_entry
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private def get_relevant_last_read(username, entry_obj)
|
|
||||||
last_read = entry_obj.book.load_last_read username, entry_obj.title
|
|
||||||
# grab from previous entry if current entry hasn't been started yet
|
|
||||||
if last_read.nil?
|
|
||||||
previous_entry = entry_obj.book.previous_entry(entry_obj)
|
|
||||||
return entry_obj.book.load_last_read username, previous_entry.title \
|
|
||||||
if previous_entry
|
|
||||||
end
|
|
||||||
last_read
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -31,9 +31,9 @@ class Logger
|
|||||||
{% end %}
|
{% end %}
|
||||||
|
|
||||||
@log = Log.for("")
|
@log = Log.for("")
|
||||||
|
|
||||||
@backend = Log::IOBackend.new
|
@backend = Log::IOBackend.new
|
||||||
@backend.formatter = ->(entry : Log::Entry, io : IO) do
|
|
||||||
|
format_proc = ->(entry : Log::Entry, io : IO) do
|
||||||
color = :default
|
color = :default
|
||||||
{% begin %}
|
{% begin %}
|
||||||
case entry.severity.label.to_s().downcase
|
case entry.severity.label.to_s().downcase
|
||||||
@ -50,12 +50,14 @@ class Logger
|
|||||||
io << entry.message
|
io << entry.message
|
||||||
end
|
end
|
||||||
|
|
||||||
Log.builder.bind "*", @@severity, @backend
|
@backend.formatter = Log::Formatter.new &format_proc
|
||||||
|
Log.setup @@severity, @backend
|
||||||
end
|
end
|
||||||
|
|
||||||
# Ignores @@severity and always log msg
|
# Ignores @@severity and always log msg
|
||||||
def log(msg)
|
def log(msg)
|
||||||
@backend.write Log::Entry.new "", Log::Severity::None, msg, nil
|
@backend.write Log::Entry.new "", Log::Severity::None, msg,
|
||||||
|
Log::Metadata.empty, nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.log(msg)
|
def self.log(msg)
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
require "./api"
|
require "./api"
|
||||||
require "sqlite3"
|
require "sqlite3"
|
||||||
require "zip"
|
require "compress/zip"
|
||||||
|
|
||||||
module MangaDex
|
module MangaDex
|
||||||
class PageJob
|
class PageJob
|
||||||
property success = false
|
property success = false
|
||||||
property url : String
|
property url : String
|
||||||
property filename : String
|
property filename : String
|
||||||
property writer : Zip::Writer
|
property writer : Compress::Zip::Writer
|
||||||
property tries_remaning : Int32
|
property tries_remaning : Int32
|
||||||
|
|
||||||
def initialize(@url, @filename, @writer, @tries_remaning)
|
def initialize(@url, @filename, @writer, @tries_remaning)
|
||||||
@ -324,7 +324,7 @@ module MangaDex
|
|||||||
# Find the number of digits needed to store the number of pages
|
# Find the number of digits needed to store the number of pages
|
||||||
len = Math.log10(chapter.pages.size).to_i + 1
|
len = Math.log10(chapter.pages.size).to_i + 1
|
||||||
|
|
||||||
writer = Zip::Writer.new zip_path
|
writer = Compress::Zip::Writer.new zip_path
|
||||||
# Create a buffered channel. It works as an FIFO queue
|
# Create a buffered channel. It works as an FIFO queue
|
||||||
channel = Channel(PageJob).new chapter.pages.size
|
channel = Channel(PageJob).new chapter.pages.size
|
||||||
spawn do
|
spawn do
|
||||||
|
|||||||
@ -4,7 +4,7 @@ require "./mangadex/*"
|
|||||||
require "option_parser"
|
require "option_parser"
|
||||||
require "clim"
|
require "clim"
|
||||||
|
|
||||||
MANGO_VERSION = "0.6.1"
|
MANGO_VERSION = "0.7.0"
|
||||||
|
|
||||||
macro common_option
|
macro common_option
|
||||||
option "-c PATH", "--config=PATH", type: String,
|
option "-c PATH", "--config=PATH", type: String,
|
||||||
|
|||||||
@ -80,7 +80,7 @@ class APIRouter < Router
|
|||||||
if !entry_id.nil?
|
if !entry_id.nil?
|
||||||
entry = title.get_entry(entry_id).not_nil!
|
entry = title.get_entry(entry_id).not_nil!
|
||||||
raise "incorrect page value" if page < 0 || page > entry.pages
|
raise "incorrect page value" if page < 0 || page > entry.pages
|
||||||
title.save_progress username, entry.title, page
|
entry.save_progress username, page
|
||||||
elsif page == 0
|
elsif page == 0
|
||||||
title.unread_all username
|
title.unread_all username
|
||||||
else
|
else
|
||||||
@ -224,7 +224,7 @@ class APIRouter < Router
|
|||||||
entry_id = env.params.query["entry"]?
|
entry_id = env.params.query["entry"]?
|
||||||
title = @context.library.get_title(title_id).not_nil!
|
title = @context.library.get_title(title_id).not_nil!
|
||||||
|
|
||||||
unless ["image/jpeg", "image/png"].includes? \
|
unless SUPPORTED_IMG_TYPES.includes? \
|
||||||
MIME.from_filename? filename
|
MIME.from_filename? filename
|
||||||
raise "The uploaded image must be either JPEG or PNG"
|
raise "The uploaded image must be either JPEG or PNG"
|
||||||
end
|
end
|
||||||
|
|||||||
@ -4,7 +4,7 @@ class MainRouter < Router
|
|||||||
def initialize
|
def initialize
|
||||||
get "/login" do |env|
|
get "/login" do |env|
|
||||||
base_url = Config.current.base_url
|
base_url = Config.current.base_url
|
||||||
render "src/views/login.ecr"
|
render "src/views/login.html.ecr"
|
||||||
end
|
end
|
||||||
|
|
||||||
get "/logout" do |env|
|
get "/logout" do |env|
|
||||||
@ -53,9 +53,8 @@ class MainRouter < Router
|
|||||||
begin
|
begin
|
||||||
title = (@context.library.get_title env.params.url["title"]).not_nil!
|
title = (@context.library.get_title env.params.url["title"]).not_nil!
|
||||||
username = get_username env
|
username = get_username env
|
||||||
percentage = title.entries.map { |e|
|
percentage = title.entries.map &.load_percentage username
|
||||||
title.load_percentage username, e.title
|
title_percentage = title.titles.map &.load_percentage username
|
||||||
}
|
|
||||||
layout "title"
|
layout "title"
|
||||||
rescue e
|
rescue e
|
||||||
@context.error e
|
@context.error e
|
||||||
|
|||||||
@ -4,13 +4,13 @@ class OPDSRouter < Router
|
|||||||
def initialize
|
def initialize
|
||||||
get "/opds" do |env|
|
get "/opds" do |env|
|
||||||
titles = @context.library.titles
|
titles = @context.library.titles
|
||||||
render_xml "src/views/opds/index.ecr"
|
render_xml "src/views/opds/index.xml.ecr"
|
||||||
end
|
end
|
||||||
|
|
||||||
get "/opds/book/:title_id" do |env|
|
get "/opds/book/:title_id" do |env|
|
||||||
begin
|
begin
|
||||||
title = @context.library.get_title(env.params.url["title_id"]).not_nil!
|
title = @context.library.get_title(env.params.url["title_id"]).not_nil!
|
||||||
render_xml "src/views/opds/title.ecr"
|
render_xml "src/views/opds/title.xml.ecr"
|
||||||
rescue e
|
rescue e
|
||||||
@context.error e
|
@context.error e
|
||||||
env.response.status_code = 404
|
env.response.status_code = 404
|
||||||
|
|||||||
@ -9,12 +9,15 @@ class ReaderRouter < Router
|
|||||||
|
|
||||||
# load progress
|
# load progress
|
||||||
username = get_username env
|
username = get_username env
|
||||||
page = title.load_progress username, entry.title
|
page = entry.load_progress username
|
||||||
# we go back 2 * `IMGS_PER_PAGE` pages. the infinite scroll
|
# we go back 2 * `IMGS_PER_PAGE` pages. the infinite scroll
|
||||||
# library perloads a few pages in advance, and the user
|
# library perloads a few pages in advance, and the user
|
||||||
# might not have actually read them
|
# might not have actually read them
|
||||||
page = [page - 2 * IMGS_PER_PAGE, 1].max
|
page = [page - 2 * IMGS_PER_PAGE, 1].max
|
||||||
|
|
||||||
|
# start from page 1 if the user has finished reading the entry
|
||||||
|
page = 1 if entry.finished? username
|
||||||
|
|
||||||
redirect env, "/reader/#{title.id}/#{entry.id}/#{page}"
|
redirect env, "/reader/#{title.id}/#{entry.id}/#{page}"
|
||||||
rescue e
|
rescue e
|
||||||
@context.error e
|
@context.error e
|
||||||
@ -33,7 +36,7 @@ class ReaderRouter < Router
|
|||||||
|
|
||||||
# save progress
|
# save progress
|
||||||
username = get_username env
|
username = get_username env
|
||||||
title.save_progress username, entry.title, page
|
entry.save_progress username, page
|
||||||
|
|
||||||
pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
|
pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
|
||||||
urls = pages.map { |idx|
|
urls = pages.map { |idx|
|
||||||
@ -45,7 +48,7 @@ class ReaderRouter < Router
|
|||||||
next_page = page + IMGS_PER_PAGE
|
next_page = page + IMGS_PER_PAGE
|
||||||
next_url = next_entry_url = nil
|
next_url = next_entry_url = nil
|
||||||
exit_url = "#{base_url}book/#{title.id}"
|
exit_url = "#{base_url}book/#{title.id}"
|
||||||
next_entry = title.next_entry entry
|
next_entry = entry.next_entry
|
||||||
unless next_page > entry.pages
|
unless next_page > entry.pages
|
||||||
next_url = "#{base_url}reader/#{title.id}/#{entry.id}/#{next_page}"
|
next_url = "#{base_url}reader/#{title.id}/#{entry.id}/#{next_page}"
|
||||||
end
|
end
|
||||||
@ -53,7 +56,7 @@ class ReaderRouter < Router
|
|||||||
next_entry_url = "#{base_url}reader/#{title.id}/#{next_entry.id}"
|
next_entry_url = "#{base_url}reader/#{title.id}/#{next_entry.id}"
|
||||||
end
|
end
|
||||||
|
|
||||||
render "src/views/reader.ecr"
|
render "src/views/reader.html.ecr"
|
||||||
rescue e
|
rescue e
|
||||||
@context.error e
|
@context.error e
|
||||||
env.response.status_code = 404
|
env.response.status_code = 404
|
||||||
|
|||||||
@ -16,11 +16,11 @@ macro layout(name)
|
|||||||
is_admin = @context.storage.verify_admin token
|
is_admin = @context.storage.verify_admin token
|
||||||
end
|
end
|
||||||
page = {{name}}
|
page = {{name}}
|
||||||
render "src/views/#{{{name}}}.ecr", "src/views/layout.ecr"
|
render "src/views/#{{{name}}}.html.ecr", "src/views/layout.html.ecr"
|
||||||
rescue e
|
rescue e
|
||||||
message = e.to_s
|
message = e.to_s
|
||||||
@context.error message
|
@context.error message
|
||||||
render "src/views/message.ecr", "src/views/layout.ecr"
|
render "src/views/message.html.ecr", "src/views/layout.html.ecr"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -139,7 +139,7 @@ macro render_xml(path)
|
|||||||
end
|
end
|
||||||
|
|
||||||
macro render_component(filename)
|
macro render_component(filename)
|
||||||
render "src/views/components/#{{{filename}}}.ecr"
|
render "src/views/components/#{{{filename}}}.html.ecr"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Works in all Unix systems. Follows https://github.com/crystal-lang/crystal/
|
# Works in all Unix systems. Follows https://github.com/crystal-lang/crystal/
|
||||||
|
|||||||
@ -11,8 +11,9 @@
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<hr class="uk-divider-icon">
|
<hr class="uk-divider-icon">
|
||||||
|
<p class="uk-text-meta">Version: v<%= MANGO_VERSION %></p>
|
||||||
<a class="uk-button uk-button-danger" href="<%= base_url %>logout">Log Out</a>
|
<a class="uk-button uk-button-danger" href="<%= base_url %>logout">Log Out</a>
|
||||||
|
|
||||||
<% content_for "script" do %>
|
<% content_for "script" do %>
|
||||||
<script src="<%= base_url %>js/admin.js"></script>
|
<script src="<%= base_url %>js/admin.js"></script>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,49 +0,0 @@
|
|||||||
<% if item.is_a? NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32) %>
|
|
||||||
<% grouped_count = item[:grouped_count] %>
|
|
||||||
<% if grouped_count == 1 %>
|
|
||||||
<% item = item[:entry] %>
|
|
||||||
<% else %>
|
|
||||||
<% item = item[:entry].book %>
|
|
||||||
<% end %>
|
|
||||||
<% else %>
|
|
||||||
<% grouped_count = 1 %>
|
|
||||||
<% end %>
|
|
||||||
<div class="item" data-mtime="<%= item.mtime.to_unix %>" data-progress="<%= progress || 0.0 %>"
|
|
||||||
<% if item.is_a? Entry %>
|
|
||||||
id="<%= item.id %>"
|
|
||||||
<% end %>>
|
|
||||||
|
|
||||||
<a class="acard"
|
|
||||||
<% unless item.is_a? Entry %>
|
|
||||||
href="<%= base_url %>book/<%= item.id %>"
|
|
||||||
<% end %>>
|
|
||||||
|
|
||||||
<div class="uk-card uk-card-default"
|
|
||||||
<% if item.is_a? Entry %>
|
|
||||||
onclick="showModal("<%= item.encoded_path %>", '<%= item.pages %>', <%= (progress.not_nil! * 100).round(1) %>, "<%= item.book.encoded_display_name %>", "<%= item.encoded_display_name %>", '<%= item.title_id %>', '<%= item.id %>')"
|
|
||||||
<% end %>>
|
|
||||||
|
|
||||||
<div class="uk-card-media-top">
|
|
||||||
<img data-src="<%= item.cover_url %>" data-width data-height alt="" uk-img>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="uk-card-body">
|
|
||||||
<% unless (item.is_a? Title && item.entries.size == 0) || progress.nil? %>
|
|
||||||
<div class="uk-card-badge uk-label"><%= (progress * 100).round(1) %>%</div>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<h3 class="uk-card-title break-word" data-title="<%= item.display_name.gsub("\"", """) %>"><%= item.display_name %></h3>
|
|
||||||
<% if item.is_a? Entry %>
|
|
||||||
<p><%= item.pages %> pages</p>
|
|
||||||
<% end %>
|
|
||||||
<% if item.is_a? Title %>
|
|
||||||
<% if grouped_count == 1 %>
|
|
||||||
<p><%= item.size %> entries</p>
|
|
||||||
<% else %>
|
|
||||||
<p><%= grouped_count %> new entries</p>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
50
src/views/components/card.html.ecr
Normal file
50
src/views/components/card.html.ecr
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
<% if item.is_a? NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32) %>
|
||||||
|
<% grouped_count = item[:grouped_count] %>
|
||||||
|
<% if grouped_count == 1 %>
|
||||||
|
<% item = item[:entry] %>
|
||||||
|
<% else %>
|
||||||
|
<% item = item[:entry].book %>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<% grouped_count = 1 %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<div class="item" data-mtime="<%= item.mtime.to_unix %>" data-progress="<%= progress %>"
|
||||||
|
<% if item.is_a? Entry %>
|
||||||
|
id="<%= item.id %>"
|
||||||
|
<% end %>>
|
||||||
|
|
||||||
|
<a class="acard"
|
||||||
|
<% unless item.is_a? Entry %>
|
||||||
|
href="<%= base_url %>book/<%= item.id %>"
|
||||||
|
<% end %>>
|
||||||
|
|
||||||
|
<div class="uk-card uk-card-default"
|
||||||
|
<% if item.is_a? Entry %>
|
||||||
|
onclick="showModal("<%= item.encoded_path %>", '<%= item.pages %>', <%= (progress * 100).round(1) %>, "<%= item.book.encoded_display_name %>", "<%= item.encoded_display_name %>", '<%= item.title_id %>', '<%= item.id %>')"
|
||||||
|
<% end %>>
|
||||||
|
|
||||||
|
<div class="uk-card-media-top">
|
||||||
|
<img data-src="<%= item.cover_url %>" data-width data-height alt="" uk-img>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="uk-card-body">
|
||||||
|
<% unless progress < 0 || progress > 100 %>
|
||||||
|
<div class="uk-card-badge uk-label"><%= (progress * 100).round(1) %>%</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<h3 class="uk-card-title break-word" data-title="<%= item.display_name.gsub("\"", """) %>"><%= item.display_name %></h3>
|
||||||
|
<% if item.is_a? Entry %>
|
||||||
|
<p><%= item.pages %> pages</p>
|
||||||
|
<% end %>
|
||||||
|
<% if item.is_a? Title %>
|
||||||
|
<% if grouped_count == 1 %>
|
||||||
|
<p><%= item.size %> entries</p>
|
||||||
|
<% else %>
|
||||||
|
<p><%= grouped_count %> new entries</p>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
@ -4,15 +4,16 @@
|
|||||||
<div class="uk-modal-header">
|
<div class="uk-modal-header">
|
||||||
<div>
|
<div>
|
||||||
<% if page == "home" %>
|
<% if page == "home" %>
|
||||||
<h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
|
<h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
|
||||||
<% end %>
|
<% end %>
|
||||||
<h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span>
|
<h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span>
|
||||||
<% unless page == "home" %>
|
|
||||||
|
|
||||||
<% if is_admin %>
|
<% unless page == "home" %>
|
||||||
<a class="uk-icon-button" uk-icon="icon:pencil"></a>
|
<% if is_admin %>
|
||||||
<% end %>
|
<a id="modal-edit-btn" class="uk-icon-button" uk-icon="icon:pencil"></a>
|
||||||
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<a id="modal-download-btn" class="uk-icon-button" uk-icon="icon:download"></a>
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<p class="uk-text-meta uk-margin-remove-bottom break-word" id="path-text"></p>
|
<p class="uk-text-meta uk-margin-remove-bottom break-word" id="path-text"></p>
|
||||||
@ -21,13 +22,13 @@
|
|||||||
<div class="uk-modal-body">
|
<div class="uk-modal-body">
|
||||||
<p>Read</p>
|
<p>Read</p>
|
||||||
<p uk-margin>
|
<p uk-margin>
|
||||||
<a id="beginning-btn" class="uk-button uk-button-default">From beginning</a>
|
<a id="beginning-btn" class="uk-button uk-button-default">From beginning</a>
|
||||||
<a id="continue-btn" class="uk-button uk-button-primary"></a>
|
<a id="continue-btn" class="uk-button uk-button-primary"></a>
|
||||||
</p>
|
</p>
|
||||||
<p>Progress</p>
|
<p>Progress</p>
|
||||||
<p uk-margin>
|
<p uk-margin>
|
||||||
<button id="read-btn" class="uk-button uk-button-default">Mark as read (100%)</button>
|
<button id="read-btn" class="uk-button uk-button-default">Mark as read (100%)</button>
|
||||||
<button id="unread-btn" class="uk-button uk-button-default">Mark as unread (0%)</button>
|
<button id="unread-btn" class="uk-button uk-button-default">Mark as unread (0%)</button>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -4,7 +4,7 @@
|
|||||||
<title>Mango</title>
|
<title>Mango</title>
|
||||||
<meta name="description" content="Mango - Manga Server and Web Reader">
|
<meta name="description" content="Mango - Manga Server and Web Reader">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
|
<link rel="stylesheet" href="<%= base_url %>css/uikit.css" />
|
||||||
<link rel="stylesheet" href="<%= base_url %>css/mango.css" />
|
<link rel="stylesheet" href="<%= base_url %>css/mango.css" />
|
||||||
<link rel="icon" href="<%= base_url %>favicon.ico">
|
<link rel="icon" href="<%= base_url %>favicon.ico">
|
||||||
<script defer src="<%= base_url %>js/fontawesome.min.js"></script>
|
<script defer src="<%= base_url %>js/fontawesome.min.js"></script>
|
||||||
@ -1,8 +1,8 @@
|
|||||||
<div class="uk-form-horizontal">
|
<div class="uk-form-horizontal">
|
||||||
<select class="uk-select" id="sort-select">
|
<select class="uk-select" id="sort-select">
|
||||||
<% hash.each do |k, v| %>
|
<% hash.each do |k, v| %>
|
||||||
<option id="<%= k %>-up">▲ <%= v %></option>
|
<option id="<%= k %>-up">▲ <%= v %></option>
|
||||||
<option id="<%= k %>-down">▼ <%= v %></option>
|
<option id="<%= k %>-down">▼ <%= v %></option>
|
||||||
<% end %>
|
<% end %>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -23,10 +23,10 @@
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
<% content_for "script" do %>
|
<% content_for "script" do %>
|
||||||
<script>
|
<script>
|
||||||
var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
|
var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
|
||||||
</script>
|
</script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
|
||||||
<script src="<%= base_url %>js/alert.js"></script>
|
<script src="<%= base_url %>js/alert.js"></script>
|
||||||
<script src="<%= base_url %>js/download-manager.js"></script>
|
<script src="<%= base_url %>js/download-manager.js"></script>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -73,11 +73,11 @@
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
<% content_for "script" do %>
|
<% content_for "script" do %>
|
||||||
<script>
|
<script>
|
||||||
var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
|
var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
|
||||||
</script>
|
</script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
|
||||||
<script src="<%= base_url %>js/alert.js"></script>
|
<script src="<%= base_url %>js/alert.js"></script>
|
||||||
<script src="<%= base_url %>js/download.js"></script>
|
<script src="<%= base_url %>js/download.js"></script>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,69 +0,0 @@
|
|||||||
<%- if new_user && empty_library -%>
|
|
||||||
|
|
||||||
<div class="uk-container uk-text-center">
|
|
||||||
<i class="fas fa-plus" style="font-size: 80px;"></i>
|
|
||||||
<h2>Add your first manga</h2>
|
|
||||||
<p style="margin-bottom: 40px;">We can't find any files yet. Add some to your library and they'll appear here.</p>
|
|
||||||
<dl class="uk-description-list">
|
|
||||||
<dt style="font-weight: 500;">Current library path</dt>
|
|
||||||
<dd><code><%= Config.current.library_path %></code></dd>
|
|
||||||
<dt style="font-weight: 500;">Want to change your library path?</dt>
|
|
||||||
<dd>Update <code>config.yml</code> located at: <code><%= Config.current.path %></code></dd>
|
|
||||||
<dt style="font-weight: 500;">Can't see your files yet?</dt>
|
|
||||||
<dd>You must wait <%= Config.current.scan_interval %> minutes for the library scan to complete
|
|
||||||
<% if is_admin %>, or manually re-scan from <a href="<%= base_url %>admin">Admin</a><% end %>.</dd>
|
|
||||||
</dl>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<%- elsif new_user && empty_library == false -%>
|
|
||||||
|
|
||||||
<div class="uk-container uk-text-center">
|
|
||||||
<i class="fas fa-book-open" style="font-size: 80px;"></i>
|
|
||||||
<h2>Read your first manga</h2>
|
|
||||||
<p>Once you start reading, Mango will remember where you left off
|
|
||||||
and show your entries here.</p>
|
|
||||||
<a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<%- elsif new_user == false && empty_library == false -%>
|
|
||||||
|
|
||||||
<%- if continue_reading.empty? && recently_added.empty? -%>
|
|
||||||
<div class="uk-container uk-text-center">
|
|
||||||
<img src="<%= base_url %>img/banner.png" style="max-width: 400px; padding: 0 20px;">
|
|
||||||
<p>A self-hosted manga server and reader</p>
|
|
||||||
<a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
|
|
||||||
</div>
|
|
||||||
<%- end -%>
|
|
||||||
|
|
||||||
<%- unless continue_reading.empty? -%>
|
|
||||||
<h2 class="uk-title home-headings">Continue Reading</h2>
|
|
||||||
<div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
|
||||||
<%- continue_reading.each do |cr| -%>
|
|
||||||
<% item = cr[:entry] %>
|
|
||||||
<% progress = cr[:percentage] %>
|
|
||||||
<%= render_component "card" %>
|
|
||||||
<%- end -%>
|
|
||||||
</div>
|
|
||||||
<%- end -%>
|
|
||||||
|
|
||||||
<%- unless recently_added.empty? -%>
|
|
||||||
<h2 class="uk-title home-headings">Recently Added</h2>
|
|
||||||
<div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
|
||||||
<%- recently_added.each do |ra| -%>
|
|
||||||
<% item = ra %>
|
|
||||||
<% progress = ra[:percentage] %>
|
|
||||||
<%= render_component "card" %>
|
|
||||||
<%- end -%>
|
|
||||||
</div>
|
|
||||||
<%- end -%>
|
|
||||||
|
|
||||||
<%= render_component "entry-modal" %>
|
|
||||||
|
|
||||||
<%- end -%>
|
|
||||||
|
|
||||||
<% content_for "script" do %>
|
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
|
|
||||||
<script src="<%= base_url %>js/dots.js"></script>
|
|
||||||
<script src="<%= base_url %>js/alert.js"></script>
|
|
||||||
<script src="<%= base_url %>js/title.js"></script>
|
|
||||||
<% end %>
|
|
||||||
73
src/views/home.html.ecr
Normal file
73
src/views/home.html.ecr
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
<%- if new_user && empty_library -%>
|
||||||
|
|
||||||
|
<div class="uk-container uk-text-center">
|
||||||
|
<i class="fas fa-plus" style="font-size: 80px;"></i>
|
||||||
|
<h2>Add your first manga</h2>
|
||||||
|
<p style="margin-bottom: 40px;">We can't find any files yet. Add some to your library and they'll appear here.</p>
|
||||||
|
<dl class="uk-description-list">
|
||||||
|
<dt style="font-weight: 500;">Current library path</dt>
|
||||||
|
<dd><code><%= Config.current.library_path %></code></dd>
|
||||||
|
<dt style="font-weight: 500;">Want to change your library path?</dt>
|
||||||
|
<dd>Update <code>config.yml</code> located at: <code><%= Config.current.path %></code></dd>
|
||||||
|
<dt style="font-weight: 500;">Can't see your files yet?</dt>
|
||||||
|
<dd>
|
||||||
|
You must wait <%= Config.current.scan_interval %> minutes for the library scan to complete
|
||||||
|
<% if is_admin %>
|
||||||
|
, or manually re-scan from <a href="<%= base_url %>admin">Admin</a>
|
||||||
|
<% end %>.
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<%- elsif new_user && empty_library == false -%>
|
||||||
|
|
||||||
|
<div class="uk-container uk-text-center">
|
||||||
|
<i class="fas fa-book-open" style="font-size: 80px;"></i>
|
||||||
|
<h2>Read your first manga</h2>
|
||||||
|
<p>Once you start reading, Mango will remember where you left off
|
||||||
|
and show your entries here.</p>
|
||||||
|
<a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<%- elsif new_user == false && empty_library == false -%>
|
||||||
|
|
||||||
|
<%- if continue_reading.empty? && recently_added.empty? -%>
|
||||||
|
<div class="uk-container uk-text-center">
|
||||||
|
<img src="<%= base_url %>img/banner.png" style="max-width: 400px; padding: 0 20px;">
|
||||||
|
<p>A self-hosted manga server and reader</p>
|
||||||
|
<a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
|
||||||
|
</div>
|
||||||
|
<%- end -%>
|
||||||
|
|
||||||
|
<%- unless continue_reading.empty? -%>
|
||||||
|
<h2 class="uk-title home-headings">Continue Reading</h2>
|
||||||
|
<div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
||||||
|
<%- continue_reading.each do |cr| -%>
|
||||||
|
<% item = cr[:entry] %>
|
||||||
|
<% progress = cr[:percentage] %>
|
||||||
|
<%= render_component "card" %>
|
||||||
|
<%- end -%>
|
||||||
|
</div>
|
||||||
|
<%- end -%>
|
||||||
|
|
||||||
|
<%- unless recently_added.empty? -%>
|
||||||
|
<h2 class="uk-title home-headings">Recently Added</h2>
|
||||||
|
<div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
||||||
|
<%- recently_added.each do |ra| -%>
|
||||||
|
<% item = ra %>
|
||||||
|
<% progress = ra[:percentage] %>
|
||||||
|
<%= render_component "card" %>
|
||||||
|
<%- end -%>
|
||||||
|
</div>
|
||||||
|
<%- end -%>
|
||||||
|
|
||||||
|
<%= render_component "entry-modal" %>
|
||||||
|
|
||||||
|
<%- end -%>
|
||||||
|
|
||||||
|
<% content_for "script" do %>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
|
||||||
|
<script src="<%= base_url %>js/dots.js"></script>
|
||||||
|
<script src="<%= base_url %>js/alert.js"></script>
|
||||||
|
<script src="<%= base_url %>js/title.js"></script>
|
||||||
|
<% end %>
|
||||||
@ -1,68 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
|
|
||||||
<%= render_component "head" %>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="uk-offcanvas-content">
|
|
||||||
<div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
|
|
||||||
<div id="mobile-nav" uk-offcanvas="overlay: true">
|
|
||||||
<div class="uk-offcanvas-bar uk-flex uk-flex-column">
|
|
||||||
<ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical">
|
|
||||||
<li><a href="<%= base_url %>">Home</a></li>
|
|
||||||
<li><a href="<%= base_url %>library">Library</a></li>
|
|
||||||
<% if is_admin %>
|
|
||||||
<li><a href="<%= base_url %>admin">Admin</a></li>
|
|
||||||
<li><a href="<%= base_url %>download">Download</a></li>
|
|
||||||
<% end %>
|
|
||||||
<hr uk-divider>
|
|
||||||
<li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
|
|
||||||
<li><a href="<%= base_url %>logout">Logout</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-position-top">
|
|
||||||
<div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
|
|
||||||
<div class="uk-navbar-left uk-hidden@s">
|
|
||||||
<div class="uk-navbar-toggle" uk-navbar-toggle-icon="uk-navbar-toggle-icon" uk-toggle="target: #mobile-nav"></div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-navbar-left uk-visible@s">
|
|
||||||
<a class="uk-navbar-item uk-logo" href="<%= base_url %>"><img src="<%= base_url %>img/icon.png"></a>
|
|
||||||
<ul class="uk-navbar-nav">
|
|
||||||
<li><a href="<%= base_url %>">Home</a></li>
|
|
||||||
<li><a href="<%= base_url %>library">Library</a></li>
|
|
||||||
<% if is_admin %>
|
|
||||||
<li><a href="<%= base_url %>admin">Admin</a></li>
|
|
||||||
<li><a href="<%= base_url %>download">Download</a></li>
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div class="uk-navbar-right uk-visible@s">
|
|
||||||
<ul class="uk-navbar-nav">
|
|
||||||
<li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
|
|
||||||
<li><a href="<%= base_url %>logout">Logout</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-section uk-section-small">
|
|
||||||
</div>
|
|
||||||
<div class="uk-section uk-section-small">
|
|
||||||
<div class="uk-container uk-container-small">
|
|
||||||
<div id="alert"></div>
|
|
||||||
<%= content %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script>
|
|
||||||
setTheme(getTheme());
|
|
||||||
const base_url = "<%= base_url %>";
|
|
||||||
</script>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
|
|
||||||
|
|
||||||
<%= yield_content "script" %>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
68
src/views/layout.html.ecr
Normal file
68
src/views/layout.html.ecr
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
|
||||||
|
<%= render_component "head" %>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div class="uk-offcanvas-content">
|
||||||
|
<div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
|
||||||
|
<div id="mobile-nav" uk-offcanvas="overlay: true">
|
||||||
|
<div class="uk-offcanvas-bar uk-flex uk-flex-column">
|
||||||
|
<ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical">
|
||||||
|
<li><a href="<%= base_url %>">Home</a></li>
|
||||||
|
<li><a href="<%= base_url %>library">Library</a></li>
|
||||||
|
<% if is_admin %>
|
||||||
|
<li><a href="<%= base_url %>admin">Admin</a></li>
|
||||||
|
<li><a href="<%= base_url %>download">Download</a></li>
|
||||||
|
<% end %>
|
||||||
|
<hr uk-divider>
|
||||||
|
<li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
|
||||||
|
<li><a href="<%= base_url %>logout">Logout</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-position-top">
|
||||||
|
<div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
|
||||||
|
<div class="uk-navbar-left uk-hidden@s">
|
||||||
|
<div class="uk-navbar-toggle" uk-navbar-toggle-icon="uk-navbar-toggle-icon" uk-toggle="target: #mobile-nav"></div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-navbar-left uk-visible@s">
|
||||||
|
<a class="uk-navbar-item uk-logo" href="<%= base_url %>"><img src="<%= base_url %>img/icon.png"></a>
|
||||||
|
<ul class="uk-navbar-nav">
|
||||||
|
<li><a href="<%= base_url %>">Home</a></li>
|
||||||
|
<li><a href="<%= base_url %>library">Library</a></li>
|
||||||
|
<% if is_admin %>
|
||||||
|
<li><a href="<%= base_url %>admin">Admin</a></li>
|
||||||
|
<li><a href="<%= base_url %>download">Download</a></li>
|
||||||
|
<% end %>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="uk-navbar-right uk-visible@s">
|
||||||
|
<ul class="uk-navbar-nav">
|
||||||
|
<li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
|
||||||
|
<li><a href="<%= base_url %>logout">Logout</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-section uk-section-small">
|
||||||
|
</div>
|
||||||
|
<div class="uk-section uk-section-small">
|
||||||
|
<div class="uk-container uk-container-small">
|
||||||
|
<div id="alert"></div>
|
||||||
|
<%= content %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
setTheme(getTheme());
|
||||||
|
const base_url = "<%= base_url %>";
|
||||||
|
</script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
|
||||||
|
|
||||||
|
<%= yield_content "script" %>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
@ -18,14 +18,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
||||||
<% titles.each_with_index do |item, i| %>
|
<% titles.each_with_index do |item, i| %>
|
||||||
<% progress = percentage[i] %>
|
<% progress = percentage[i] %>
|
||||||
<%= render_component "card" %>
|
<%= render_component "card" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% content_for "script" do %>
|
<% content_for "script" do %>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
|
||||||
<script src="<%= base_url %>js/dots.js"></script>
|
<script src="<%= base_url %>js/dots.js"></script>
|
||||||
<script src="<%= base_url %>js/search.js"></script>
|
<script src="<%= base_url %>js/search.js"></script>
|
||||||
<script src="<%= base_url %>js/sort-items.js"></script>
|
<script src="<%= base_url %>js/sort-items.js"></script>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,36 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
|
|
||||||
<%= render_component "head" %>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="uk-section uk-flex uk-flex-middle uk-animation-fade" uk-height-viewport="">
|
|
||||||
<div class="uk-width-1-1">
|
|
||||||
<div class="uk-container">
|
|
||||||
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
|
|
||||||
<div class="uk-width-1-1@m">
|
|
||||||
<div class="uk-margin uk-width-large uk-margin-auto uk-card uk-card-default uk-card-body uk-box-shadow-large">
|
|
||||||
<h3 class="uk-card-title uk-text-center">Log In</h3>
|
|
||||||
<form action="<%= base_url %>login" method="post">
|
|
||||||
<div class="uk-margin">
|
|
||||||
<div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:user"></span><input class="uk-input uk-form-large" type="text" name="username"></div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-margin">
|
|
||||||
<div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:lock"></span><input class="uk-input uk-form-large" type="password" name="password"></div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-margin"><button class="uk-button uk-button-primary uk-button-large uk-width-1-1">Login</button></div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script>
|
|
||||||
setTheme(getTheme());
|
|
||||||
</script>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
36
src/views/login.html.ecr
Normal file
36
src/views/login.html.ecr
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
|
||||||
|
<%= render_component "head" %>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div class="uk-section uk-flex uk-flex-middle uk-animation-fade" uk-height-viewport="">
|
||||||
|
<div class="uk-width-1-1">
|
||||||
|
<div class="uk-container">
|
||||||
|
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
|
||||||
|
<div class="uk-width-1-1@m">
|
||||||
|
<div class="uk-margin uk-width-large uk-margin-auto uk-card uk-card-default uk-card-body uk-box-shadow-large">
|
||||||
|
<h3 class="uk-card-title uk-text-center">Log In</h3>
|
||||||
|
<form action="<%= base_url %>login" method="post">
|
||||||
|
<div class="uk-margin">
|
||||||
|
<div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:user"></span><input class="uk-input uk-form-large" type="text" name="username"></div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:lock"></span><input class="uk-input uk-form-large" type="password" name="password"></div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-margin"><button class="uk-button uk-button-primary uk-button-large uk-width-1-1">Login</button></div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
setTheme(getTheme());
|
||||||
|
</script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
@ -1 +0,0 @@
|
|||||||
<p class="uk-text-lead uk-text-center"><%= message %></p>
|
|
||||||
1
src/views/message.html.ecr
Normal file
1
src/views/message.html.ecr
Normal file
@ -0,0 +1 @@
|
|||||||
|
<p class="uk-text-lead uk-text-center"><%= message %></p>
|
||||||
@ -13,10 +13,10 @@
|
|||||||
</author>
|
</author>
|
||||||
|
|
||||||
<% titles.each do |t| %>
|
<% titles.each do |t| %>
|
||||||
<entry>
|
<entry>
|
||||||
<title><%= t.display_name %></title>
|
<title><%= t.display_name %></title>
|
||||||
<id>urn:mango:<%= t.id %></id>
|
<id>urn:mango:<%= t.id %></id>
|
||||||
<link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
|
<link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
|
||||||
</entry>
|
</entry>
|
||||||
<% end %>
|
<% end %>
|
||||||
</feed>
|
</feed>
|
||||||
@ -1,38 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
|
||||||
<id>urn:mango:<%= title.id %></id>
|
|
||||||
|
|
||||||
<link rel="self" href="<%= base_url %>opds/book/<%= title.id %>" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
|
|
||||||
<link rel="start" href="<%= base_url %>opds/" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
|
|
||||||
|
|
||||||
<title><%= title.display_name %></title>
|
|
||||||
|
|
||||||
<author>
|
|
||||||
<name>Mango</name>
|
|
||||||
<uri>https://github.com/hkalexling/Mango</uri>
|
|
||||||
</author>
|
|
||||||
|
|
||||||
<% title.titles.each do |t| %>
|
|
||||||
<entry>
|
|
||||||
<title><%= t.display_name %></title>
|
|
||||||
<id>urn:mango:<%= t.id %></id>
|
|
||||||
<link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
|
|
||||||
</entry>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<% title.entries.each do |e| %>
|
|
||||||
<entry>
|
|
||||||
<title><%= e.display_name %></title>
|
|
||||||
<id>urn:mango:<%= e.id %></id>
|
|
||||||
|
|
||||||
<link rel="http://opds-spec.org/image" href="<%= e.cover_url %>" />
|
|
||||||
<link rel="http://opds-spec.org/image/thumbnail" href="<%= e.cover_url %>" />
|
|
||||||
|
|
||||||
<link rel="http://opds-spec.org/acquisition" href="<%= base_url %>opds/download/<%= e.title_id %>/<%= e.id %>" title="Read" type="<%= MIME.from_filename e.zip_path %>" />
|
|
||||||
|
|
||||||
<link type="text/html" rel="alternate" title="Read in Mango" href="<%= base_url %>reader/<%= e.title_id %>/<%= e.id %>" />
|
|
||||||
<link type="text/html" rel="alternate" title="Open in Mango" href="<%= base_url %>book/<%= e.title_id %>" />
|
|
||||||
</entry>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
</feed>
|
|
||||||
38
src/views/opds/title.xml.ecr
Normal file
38
src/views/opds/title.xml.ecr
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||||
|
<id>urn:mango:<%= title.id %></id>
|
||||||
|
|
||||||
|
<link rel="self" href="<%= base_url %>opds/book/<%= title.id %>" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
|
||||||
|
<link rel="start" href="<%= base_url %>opds/" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
|
||||||
|
|
||||||
|
<title><%= title.display_name %></title>
|
||||||
|
|
||||||
|
<author>
|
||||||
|
<name>Mango</name>
|
||||||
|
<uri>https://github.com/hkalexling/Mango</uri>
|
||||||
|
</author>
|
||||||
|
|
||||||
|
<% title.titles.each do |t| %>
|
||||||
|
<entry>
|
||||||
|
<title><%= t.display_name %></title>
|
||||||
|
<id>urn:mango:<%= t.id %></id>
|
||||||
|
<link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
|
||||||
|
</entry>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<% title.entries.each do |e| %>
|
||||||
|
<entry>
|
||||||
|
<title><%= e.display_name %></title>
|
||||||
|
<id>urn:mango:<%= e.id %></id>
|
||||||
|
|
||||||
|
<link rel="http://opds-spec.org/image" href="<%= e.cover_url %>" />
|
||||||
|
<link rel="http://opds-spec.org/image/thumbnail" href="<%= e.cover_url %>" />
|
||||||
|
|
||||||
|
<link rel="http://opds-spec.org/acquisition" href="<%= base_url %>opds/download/<%= e.title_id %>/<%= e.id %>" title="Read" type="<%= MIME.from_filename e.zip_path %>" />
|
||||||
|
|
||||||
|
<link type="text/html" rel="alternate" title="Read in Mango" href="<%= base_url %>reader/<%= e.title_id %>/<%= e.id %>" />
|
||||||
|
<link type="text/html" rel="alternate" title="Open in Mango" href="<%= base_url %>book/<%= e.title_id %>" />
|
||||||
|
</entry>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
</feed>
|
||||||
@ -1,62 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html class="reader-bg">
|
|
||||||
|
|
||||||
<%= render_component "head" %>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<script src="<%= base_url %>js/theme.js"></script>
|
|
||||||
<div class="uk-section uk-section-default uk-section-small reader-bg">
|
|
||||||
<div class="uk-container uk-container-small">
|
|
||||||
<%- urls.each_with_index do |url, i| -%>
|
|
||||||
<img class="uk-align-center" data-src="<%= url %>" data-width data-height uk-img id="<%= reader_urls[i] %>" onclick="showControl(<%= pages.to_a[i] %>);">
|
|
||||||
<%- end -%>
|
|
||||||
<%- if next_url -%>
|
|
||||||
<a class="next-url" href="<%= next_url %>"></a>
|
|
||||||
<%- end -%>
|
|
||||||
</div>
|
|
||||||
<%- if next_entry_url -%>
|
|
||||||
<button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= next_entry_url %>')">Next Entry</button>
|
|
||||||
<%- else -%>
|
|
||||||
<button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= exit_url %>')">Exit Reader</button>
|
|
||||||
<%- end -%>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="hidden" hidden></div>
|
|
||||||
|
|
||||||
<div id="modal-sections" class="uk-flex-top" uk-modal>
|
|
||||||
<div class="uk-modal-dialog uk-margin-auto-vertical">
|
|
||||||
<button class="uk-modal-close-default" type="button" uk-close></button>
|
|
||||||
<div class="uk-modal-header">
|
|
||||||
<h3 class="uk-modal-title">Options</h3>
|
|
||||||
</div>
|
|
||||||
<div class="uk-modal-body">
|
|
||||||
<div class="uk-margin">
|
|
||||||
<p id="progress-label"></p>
|
|
||||||
</div>
|
|
||||||
<div class="uk-margin">
|
|
||||||
<label class="uk-form-label" for="form-stacked-select">Jump to page</label>
|
|
||||||
<div class="uk-form-controls">
|
|
||||||
<select id="page-select" class="uk-select">
|
|
||||||
<%- (1..entry.pages).each do |p| -%>
|
|
||||||
<option value="<%= p %>"><%= p %></option>
|
|
||||||
<%- end -%>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-modal-footer uk-text-right">
|
|
||||||
<button class="uk-button uk-button-danger" type="button" onclick="redirect('<%= exit_url %>')">Exit Reader</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script>
|
|
||||||
const base_url = "<%= base_url %>"
|
|
||||||
</script>
|
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
|
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
|
|
||||||
<script src="<%= base_url %>js/reader.js"></script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
62
src/views/reader.html.ecr
Normal file
62
src/views/reader.html.ecr
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html class="reader-bg">
|
||||||
|
|
||||||
|
<%= render_component "head" %>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div class="uk-section uk-section-default uk-section-small reader-bg">
|
||||||
|
<div class="uk-container uk-container-small">
|
||||||
|
<%- urls.each_with_index do |url, i| -%>
|
||||||
|
<img class="uk-align-center" data-src="<%= url %>" data-width data-height uk-img id="<%= reader_urls[i] %>" onclick="showControl(<%= pages.to_a[i] %>);">
|
||||||
|
<%- end -%>
|
||||||
|
<%- if next_url -%>
|
||||||
|
<a class="next-url" href="<%= next_url %>"></a>
|
||||||
|
<%- end -%>
|
||||||
|
</div>
|
||||||
|
<%- if next_entry_url -%>
|
||||||
|
<button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= next_entry_url %>')">Next Entry</button>
|
||||||
|
<%- else -%>
|
||||||
|
<button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= exit_url %>')">Exit Reader</button>
|
||||||
|
<%- end -%>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="hidden" hidden></div>
|
||||||
|
|
||||||
|
<div id="modal-sections" class="uk-flex-top" uk-modal>
|
||||||
|
<div class="uk-modal-dialog uk-margin-auto-vertical">
|
||||||
|
<button class="uk-modal-close-default" type="button" uk-close></button>
|
||||||
|
<div class="uk-modal-header">
|
||||||
|
<h3 class="uk-modal-title break-word"><%= entry.display_name %></h3>
|
||||||
|
<p class="uk-text-meta uk-margin-remove-bottom break-word"><%= entry.zip_path %></p>
|
||||||
|
</div>
|
||||||
|
<div class="uk-modal-body">
|
||||||
|
<div class="uk-margin">
|
||||||
|
<p id="progress-label"></p>
|
||||||
|
</div>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<label class="uk-form-label" for="form-stacked-select">Jump to page</label>
|
||||||
|
<div class="uk-form-controls">
|
||||||
|
<select id="page-select" class="uk-select">
|
||||||
|
<%- (1..entry.pages).each do |p| -%>
|
||||||
|
<option value="<%= p %>"><%= p %></option>
|
||||||
|
<%- end -%>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-modal-footer uk-text-right">
|
||||||
|
<button class="uk-button uk-button-danger" type="button" onclick="redirect('<%= exit_url %>')">Exit Reader</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
const base_url = "<%= base_url %>"
|
||||||
|
</script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
|
||||||
|
<script src="<%= base_url %>js/reader.js"></script>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
@ -2,14 +2,14 @@
|
|||||||
<h2 class=uk-title><span><%= title.display_name %></span>
|
<h2 class=uk-title><span><%= title.display_name %></span>
|
||||||
|
|
||||||
<% if is_admin %>
|
<% if is_admin %>
|
||||||
<a onclick="edit()" class="uk-icon-button" uk-icon="icon:pencil"></a>
|
<a onclick="edit()" class="uk-icon-button" uk-icon="icon:pencil"></a>
|
||||||
<% end %>
|
<% end %>
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
<ul class="uk-breadcrumb">
|
<ul class="uk-breadcrumb">
|
||||||
<li><a href="<%= base_url %>library">Library</a></li>
|
<li><a href="<%= base_url %>library">Library</a></li>
|
||||||
<%- title.parents.each do |t| -%>
|
<%- title.parents.each do |t| -%>
|
||||||
<li><a href="<%= base_url %>book/<%= t.id %>"><%= t.display_name %></a></li>
|
<li><a href="<%= base_url %>book/<%= t.id %>"><%= t.display_name %></a></li>
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
<li class="uk-disabled"><a><%= title.display_name %></a></li>
|
<li class="uk-disabled"><a><%= title.display_name %></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -33,12 +33,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
|
||||||
<% title.titles.each_with_index do |item, i| %>
|
<% title.titles.each_with_index do |item, i| %>
|
||||||
<% progress = nil %>
|
<% progress = title_percentage[i] %>
|
||||||
<%= render_component "card" %>
|
<%= render_component "card" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% title.entries.each_with_index do |item, i| %>
|
<% title.entries.each_with_index do |item, i| %>
|
||||||
<% progress = percentage[i] %>
|
<% progress = percentage[i] %>
|
||||||
<%= render_component "card" %>
|
<%= render_component "card" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -72,7 +72,7 @@
|
|||||||
<span uk-icon="icon: cloud-upload"></span>
|
<span uk-icon="icon: cloud-upload"></span>
|
||||||
<span class="uk-text-middle">Upload a cover image by dropping it here or</span>
|
<span class="uk-text-middle">Upload a cover image by dropping it here or</span>
|
||||||
<div uk-form-custom>
|
<div uk-form-custom>
|
||||||
<input type="file" accept="image/jpeg, image/png">
|
<input type="file" accept="<%= SUPPORTED_IMG_TYPES.join ", " %>">
|
||||||
<span class="uk-link">selecting one</span>
|
<span class="uk-link">selecting one</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -85,8 +85,8 @@
|
|||||||
<div id="title-progress-control" hidden>
|
<div id="title-progress-control" hidden>
|
||||||
<label class="uk-form-label">Progress</label>
|
<label class="uk-form-label">Progress</label>
|
||||||
<p class="uk-margin-remove-vertical">
|
<p class="uk-margin-remove-vertical">
|
||||||
<button id="read-btn" class="uk-button uk-button-default" onclick="updateProgress('<%= title.id %>', null, 1)">Mark all as read (100%)</button>
|
<button id="read-btn" class="uk-button uk-button-default" onclick="updateProgress('<%= title.id %>', null, 1)">Mark all as read (100%)</button>
|
||||||
<button id="unread-btn" class="uk-button uk-button-default" onclick="updateProgress('<%= title.id %>', null, 0)">Mark all as unread (0%)</button>
|
<button id="unread-btn" class="uk-button uk-button-default" onclick="updateProgress('<%= title.id %>', null, 0)">Mark all as unread (0%)</button>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -94,10 +94,10 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% content_for "script" do %>
|
<% content_for "script" do %>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
|
||||||
<script src="<%= base_url %>js/dots.js"></script>
|
<script src="<%= base_url %>js/dots.js"></script>
|
||||||
<script src="<%= base_url %>js/alert.js"></script>
|
<script src="<%= base_url %>js/alert.js"></script>
|
||||||
<script src="<%= base_url %>js/title.js"></script>
|
<script src="<%= base_url %>js/title.js"></script>
|
||||||
<script src="<%= base_url %>js/search.js"></script>
|
<script src="<%= base_url %>js/search.js"></script>
|
||||||
<script src="<%= base_url %>js/sort-items.js"></script>
|
<script src="<%= base_url %>js/sort-items.js"></script>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,46 +0,0 @@
|
|||||||
<form action="<%= base_url %>admin/user/edit" method="post" accept-charset="utf-8">
|
|
||||||
|
|
||||||
<div class="uk-margin">
|
|
||||||
<label class="uk-form-label" for="form-stacked-text">Username</label>
|
|
||||||
<input class="uk-input" type="text" name="username" <%- if username -%> value=<%= username %> <%- end -%>>
|
|
||||||
</div>
|
|
||||||
<%- if new_user -%>
|
|
||||||
<div class="uk-margin">
|
|
||||||
<label class="uk-form-label" for="form-stacked-text">Password</label>
|
|
||||||
<input class="uk-input" type="password" name="password">
|
|
||||||
</div>
|
|
||||||
<%- end -%>
|
|
||||||
<div class="uk-margin">
|
|
||||||
<label class="uk-form-label" for="form-stacked-text">Admin Access</label>
|
|
||||||
<input class="uk-checkbox" type="checkbox" name="admin" <%- if admin == true -%> checked <%- end -%>>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<%- if !new_user -%>
|
|
||||||
<div>
|
|
||||||
<button class="uk-button uk-button-default" type="button" uk-toggle="target: #change-password">Change Password</button>
|
|
||||||
<div id="change-password" class="uk-margin" hidden>
|
|
||||||
<label class="uk-form-label" for="form-stacked-text">New Password</label>
|
|
||||||
<input class="uk-input" type="password" name="password">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<%- end -%>
|
|
||||||
|
|
||||||
<hr class="uk-divider-icon">
|
|
||||||
|
|
||||||
<input type="submit" value="Save" class="uk-button uk-button-primary">
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<% content_for "script" do %>
|
|
||||||
<script>
|
|
||||||
var username;
|
|
||||||
var error;
|
|
||||||
<%- if !new_user -%>
|
|
||||||
username = '/<%= username %>';
|
|
||||||
<%- end -%>
|
|
||||||
<%- if error -%>
|
|
||||||
error = '<%= error %>';
|
|
||||||
<%- end -%>
|
|
||||||
</script>
|
|
||||||
<script src="<%= base_url %>js/alert.js"></script>
|
|
||||||
<script src="<%= base_url %>js/user-edit.js"></script>
|
|
||||||
<% end %>
|
|
||||||
46
src/views/user-edit.html.ecr
Normal file
46
src/views/user-edit.html.ecr
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
<form action="<%= base_url %>admin/user/edit" method="post" accept-charset="utf-8">
|
||||||
|
|
||||||
|
<div class="uk-margin">
|
||||||
|
<label class="uk-form-label" for="form-stacked-text">Username</label>
|
||||||
|
<input class="uk-input" type="text" name="username" <%- if username -%> value=<%= username %> <%- end -%>>
|
||||||
|
</div>
|
||||||
|
<%- if new_user -%>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<label class="uk-form-label" for="form-stacked-text">Password</label>
|
||||||
|
<input class="uk-input" type="password" name="password">
|
||||||
|
</div>
|
||||||
|
<%- end -%>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<label class="uk-form-label" for="form-stacked-text">Admin Access</label>
|
||||||
|
<input class="uk-checkbox" type="checkbox" name="admin" <%- if admin == true -%> checked <%- end -%>>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<%- unless new_user -%>
|
||||||
|
<div>
|
||||||
|
<button class="uk-button uk-button-default" type="button" uk-toggle="target: #change-password">Change Password</button>
|
||||||
|
<div id="change-password" class="uk-margin" hidden>
|
||||||
|
<label class="uk-form-label" for="form-stacked-text">New Password</label>
|
||||||
|
<input class="uk-input" type="password" name="password">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<%- end -%>
|
||||||
|
|
||||||
|
<hr class="uk-divider-icon">
|
||||||
|
|
||||||
|
<input type="submit" value="Save" class="uk-button uk-button-primary">
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<% content_for "script" do %>
|
||||||
|
<script>
|
||||||
|
var username;
|
||||||
|
var error;
|
||||||
|
<%- if !new_user -%>
|
||||||
|
username = '/<%= username %>';
|
||||||
|
<%- end -%>
|
||||||
|
<%- if error -%>
|
||||||
|
error = '<%= error %>';
|
||||||
|
<%- end -%>
|
||||||
|
</script>
|
||||||
|
<script src="<%= base_url %>js/alert.js"></script>
|
||||||
|
<script src="<%= base_url %>js/user-edit.js"></script>
|
||||||
|
<% end %>
|
||||||
@ -1,31 +0,0 @@
|
|||||||
<table class="uk-table uk-table-divider">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Username</th>
|
|
||||||
<th>Admin Access</th>
|
|
||||||
<th>Actions</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<%- users.each do |u| -%>
|
|
||||||
<tr>
|
|
||||||
<td><%= u[0] %></td>
|
|
||||||
<td><%= u[1] %></td>
|
|
||||||
<td>
|
|
||||||
<a href="<%= base_url %>admin/user/edit?username=<%= u[0] %>&admin=<%= u[1] %>" uk-icon="file-edit"></a>
|
|
||||||
<%- if u[0] != username %>
|
|
||||||
<a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a>
|
|
||||||
<%- end %>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<%- end -%>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<a href="<%= base_url %>admin/user/edit" class="uk-button uk-button-primary">New User</a>
|
|
||||||
|
|
||||||
|
|
||||||
<% content_for "script" do %>
|
|
||||||
<script src="<%= base_url %>js/alert.js"></script>
|
|
||||||
<script src="<%= base_url %>js/user.js"></script>
|
|
||||||
<% end %>
|
|
||||||
31
src/views/user.html.ecr
Normal file
31
src/views/user.html.ecr
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
<table class="uk-table uk-table-divider">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Username</th>
|
||||||
|
<th>Admin Access</th>
|
||||||
|
<th>Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<%- users.each do |u| -%>
|
||||||
|
<tr>
|
||||||
|
<td><%= u[0] %></td>
|
||||||
|
<td><%= u[1] %></td>
|
||||||
|
<td>
|
||||||
|
<a href="<%= base_url %>admin/user/edit?username=<%= u[0] %>&admin=<%= u[1] %>" uk-icon="file-edit"></a>
|
||||||
|
<%- if u[0] != username %>
|
||||||
|
<a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a>
|
||||||
|
<%- end %>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<%- end -%>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<a href="<%= base_url %>admin/user/edit" class="uk-button uk-button-primary">New User</a>
|
||||||
|
|
||||||
|
|
||||||
|
<% content_for "script" do %>
|
||||||
|
<script src="<%= base_url %>js/alert.js"></script>
|
||||||
|
<script src="<%= base_url %>js/user.js"></script>
|
||||||
|
<% end %>
|
||||||
Loading…
x
Reference in New Issue
Block a user