simoon
/
parallel-library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Search for custom columns implemented #494

Browse Source 
Search for ratings related to #559
Search description #572
code cosmetics
pull/675/head
OzzieIsaacs 6 years ago
parent 791f4a8078
commit 5ef70890d9
7 changed files with 273 additions and 184 deletions
Show Stats Download Patch File Download Diff File

74
cps/static/js/unrar.js
Unescape Escape View File

@ -160,7 +160,8 @@ var RarVolumeHeader = function(bstream) {
// read in filename // read in filename
this.filename = bstream.readBytes(this.nameSize); this.filename = bstream.readBytes(this.nameSize);
for (var _i = 0, _s = ""; _i < this.filename.length ; _i++) { var _s = ""
for (var _i = 0; _i < this.filename.length ; _i++) {
_s += String.fromCharCode(this.filename[_i]); _s += String.fromCharCode(this.filename[_i]);
} }
@ -209,7 +210,7 @@ var RarVolumeHeader = function(bstream) {
} }
}; };
var BLOCK_LZ = 0; //var BLOCK_LZ = 0;
var rLDecode = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224], var rLDecode = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224],
rLBits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5], rLBits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5],
@ -227,17 +228,17 @@ var rDBits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14,
15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16]; 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16];
var rLOW_DIST_REP_COUNT = 16; var rLowDistRepCount = 16;
var rNC = 299, var rNC = 299,
rDC = 60, rDC = 60,
rLDC = 17, rLDC = 17,
rRC = 28, rRC = 28,
rBC = 20, rBC = 20,
rHUFF_TABLE_SIZE = (rNC + rDC + rRC + rLDC); rHuffTableSize = (rNC + rDC + rRC + rLDC);
//var UnpBlockType = BLOCK_LZ; //var UnpBlockType = BLOCK_LZ;
var UnpOldTable = new Array(rHUFF_TABLE_SIZE); var UnpOldTable = new Array(rHuffTableSize);
var BD = { //bitdecode var BD = { //bitdecode
DecodeLen: new Array(16), DecodeLen: new Array(16),
@ -270,8 +271,8 @@ var rBuffer;
// read in Huffman tables for RAR // read in Huffman tables for RAR
function RarReadTables(bstream) { function RarReadTables(bstream) {
var BitLength = new Array(rBC), var BitLength = new Array(rBC),
Table = new Array(rHUFF_TABLE_SIZE); Table = new Array(rHuffTableSize);
var i;
// before we start anything we need to get byte-aligned // before we start anything we need to get byte-aligned
bstream.readBits( (8 - bstream.bitPtr) & 0x7 ); bstream.readBits( (8 - bstream.bitPtr) & 0x7 );
@ -281,7 +282,6 @@ function RarReadTables(bstream) {
} }
if (!bstream.readBits(1)) { //discard old table if (!bstream.readBits(1)) { //discard old table
var i;
for (i = UnpOldTable.length; i--;) UnpOldTable[i] = 0; for (i = UnpOldTable.length; i--;) UnpOldTable[i] = 0;
} }
@ -307,24 +307,25 @@ function RarReadTables(bstream) {
// now all 20 bit lengths are obtained, we construct the Huffman Table: // now all 20 bit lengths are obtained, we construct the Huffman Table:
RarMakeDecodeTables(BitLength, 0, BD, rBC); rarMakeDecodeTables(BitLength, 0, BD, rBC);
var TableSize = rHUFF_TABLE_SIZE; var TableSize = rHuffTableSize;
//console.log(DecodeLen, DecodePos, DecodeNum); //console.log(DecodeLen, DecodePos, DecodeNum);
for (i = 0; i < TableSize;) { for (i = 0; i < TableSize;) {
var N;
var num = RarDecodeNumber(bstream, BD); var num = RarDecodeNumber(bstream, BD);
if (num < 16) { if (num < 16) {
Table[i] = (num + UnpOldTable[i]) & 0xf; Table[i] = (num + UnpOldTable[i]) & 0xf;
i++; i++;
} else if (num < 18) { } else if (num < 18) {
var N = (num === 16) ? (bstream.readBits(3) + 3) : (bstream.readBits(7) + 11); N = (num === 16) ? (bstream.readBits(3) + 3) : (bstream.readBits(7) + 11);
while (N-- > 0 && i < TableSize) { while (N-- > 0 && i < TableSize) {
Table[i] = Table[i - 1]; Table[i] = Table[i - 1];
i++; i++;
} }
} else { } else {
var N = (num === 18) ? (bstream.readBits(3) + 3) : (bstream.readBits(7) + 11); N = (num === 18) ? (bstream.readBits(3) + 3) : (bstream.readBits(7) + 11);
while (N-- > 0 && i < TableSize) { while (N-- > 0 && i < TableSize) {
Table[i++] = 0; Table[i++] = 0;
@ -332,10 +333,10 @@ function RarReadTables(bstream) {
} }
} }
RarMakeDecodeTables(Table, 0, LD, rNC); rarMakeDecodeTables(Table, 0, LD, rNC);
RarMakeDecodeTables(Table, rNC, DD, rDC); rarMakeDecodeTables(Table, rNC, DD, rDC);
RarMakeDecodeTables(Table, rNC + rDC, LDD, rLDC); rarMakeDecodeTables(Table, rNC + rDC, LDD, rLDC);
RarMakeDecodeTables(Table, rNC + rDC + rLDC, RD, rRC); rarMakeDecodeTables(Table, rNC + rDC + rLDC, RD, rRC);
for (i = UnpOldTable.length; i--;) { for (i = UnpOldTable.length; i--;) {
UnpOldTable[i] = Table[i]; UnpOldTable[i] = Table[i];
@ -348,20 +349,20 @@ function RarDecodeNumber(bstream, dec) {
var DecodeLen = dec.DecodeLen, DecodePos = dec.DecodePos, DecodeNum = dec.DecodeNum; var DecodeLen = dec.DecodeLen, DecodePos = dec.DecodePos, DecodeNum = dec.DecodeNum;
var bitField = bstream.getBits() & 0xfffe; var bitField = bstream.getBits() & 0xfffe;
//some sort of rolled out binary search //some sort of rolled out binary search
var bits = ((bitField < DecodeLen[8])? var bits = ((bitField < DecodeLen[8]) ?
((bitField < DecodeLen[4]) ? ((bitField < DecodeLen[4]) ?
((bitField < DecodeLen[2]) ? ((bitField < DecodeLen[2]) ?
((bitField < DecodeLen[1]) ? 1 : 2) ((bitField < DecodeLen[1]) ? 1 : 2)
: ((bitField < DecodeLen[3]) ? 3 : 4)) : ((bitField < DecodeLen[3]) ? 3 : 4))
: (bitField < DecodeLen[6])? : (bitField < DecodeLen[6]) ?
((bitField < DecodeLen[5]) ? 5 : 6) ((bitField < DecodeLen[5]) ? 5 : 6)
:((bitField < DecodeLen[7]) ? 7 : 8)) : ((bitField < DecodeLen[7]) ? 7 : 8))
: ((bitField < DecodeLen[12]) ? : ((bitField < DecodeLen[12]) ?
((bitField < DecodeLen[10]) ? ((bitField < DecodeLen[10]) ?
((bitField < DecodeLen[9]) ? 9 : 10) ((bitField < DecodeLen[9]) ? 9 : 10)
:((bitField < DecodeLen[11]) ? 11 : 12)) : ((bitField < DecodeLen[11]) ? 11 : 12))
: (bitField < DecodeLen[14]) ? : (bitField < DecodeLen[14]) ?
((bitField < DecodeLen[13]) ? 13 : 14) ((bitField < DecodeLen[13]) ? 13 : 14)
: 15)); : 15));
bstream.readBits(bits); bstream.readBits(bits);
var N = DecodePos[bits] + ((bitField - DecodeLen[bits -1]) >>> (16 - bits)); var N = DecodePos[bits] + ((bitField - DecodeLen[bits -1]) >>> (16 - bits));
@ -370,7 +371,7 @@ function RarDecodeNumber(bstream, dec) {
} }
function RarMakeDecodeTables(BitLength, offset, dec, size) { function rarMakeDecodeTables(BitLength, offset, dec, size) {
var DecodeLen = dec.DecodeLen, DecodePos = dec.DecodePos, DecodeNum = dec.DecodeNum; var DecodeLen = dec.DecodeLen, DecodePos = dec.DecodePos, DecodeNum = dec.DecodeNum;
var LenCount = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], var LenCount = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
TmpPos = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], TmpPos = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
@ -385,7 +386,7 @@ function RarMakeDecodeTables(BitLength, offset, dec, size) {
DecodeLen[0] = 0; DecodeLen[0] = 0;
for (var I = 1; I < 16; ++I) { for (var I = 1; I < 16; ++I) {
N = 2 * (N+LenCount[I]); N = 2 * (N + LenCount[I]);
M = (N << (15-I)); M = (N << (15-I));
if (M > 0xFFFF) if (M > 0xFFFF)
M = 0xFFFF; M = 0xFFFF;
@ -393,9 +394,11 @@ function RarMakeDecodeTables(BitLength, offset, dec, size) {
DecodePos[I] = DecodePos[I-1] + LenCount[I-1]; DecodePos[I] = DecodePos[I-1] + LenCount[I-1];
TmpPos[I] = DecodePos[I]; TmpPos[I] = DecodePos[I];
} }
for (I = 0; I < size; ++I) for (I = 0; I < size; ++I) {
if (BitLength[I + offset] != 0) if (BitLength[I + offset] != 0) {
DecodeNum[ TmpPos[ BitLength[offset + I] & 0xF ]++] = I; DecodeNum[ TmpPos[ BitLength[offset + I] & 0xF ]++] = I;
}
}
} }
// TODO: implement // TODO: implement
@ -504,7 +507,7 @@ function RarReadTables20(bstream) {
TableSize = rNC20 + rDC20 + rRC20; TableSize = rNC20 + rDC20 + rRC20;
for (var I = 0; I < rBC20; I++) for (var I = 0; I < rBC20; I++)
BitLength[I] = bstream.readBits(4); BitLength[I] = bstream.readBits(4);
RarMakeDecodeTables(BitLength, 0, BD, rBC20); rarMakeDecodeTables(BitLength, 0, BD, rBC20);
I = 0; I = 0;
while (I < TableSize) { while (I < TableSize) {
var num = RarDecodeNumber(bstream, BD); var num = RarDecodeNumber(bstream, BD);
@ -528,9 +531,9 @@ function RarReadTables20(bstream) {
} }
} }
} }
RarMakeDecodeTables(Table, 0, LD, rNC20); rarMakeDecodeTables(Table, 0, LD, rNC20);
RarMakeDecodeTables(Table, rNC20, DD, rDC20); rarMakeDecodeTables(Table, rNC20, DD, rDC20);
RarMakeDecodeTables(Table, rNC20 + rDC20, RD, rRC20); rarMakeDecodeTables(Table, rNC20 + rDC20, RD, rRC20);
for (var i = UnpOldTable20.length; i--;) UnpOldTable20[i] = Table[i]; for (var i = UnpOldTable20.length; i--;) UnpOldTable20[i] = Table[i];
} }
@ -596,7 +599,7 @@ function Unpack29(bstream, Solid) {
} else { } else {
var LowDist = RarDecodeNumber(bstream, LDD); var LowDist = RarDecodeNumber(bstream, LDD);
if (LowDist === 16) { if (LowDist === 16) {
lowDistRepCount = rLOW_DIST_REP_COUNT - 1; lowDistRepCount = rLowDistRepCount - 1;
Distance += prevLowDist; Distance += prevLowDist;
} else { } else {
Distance += LowDist; Distance += LowDist;
@ -774,8 +777,7 @@ var RarLocalFile = function(bstream) {
if (this.header.headType != FILE_HEAD && this.header.headType != ENDARC_HEAD) { if (this.header.headType != FILE_HEAD && this.header.headType != ENDARC_HEAD) {
this.isValid = false; this.isValid = false;
info("Error! RAR Volume did not include a FILE_HEAD header "); info("Error! RAR Volume did not include a FILE_HEAD header ");
} } else {
else {
// read in the compressed data // read in the compressed data
this.fileData = null; this.fileData = null;
if (this.header.packSize > 0) { if (this.header.packSize > 0) {

14
cps/static/js/untar.js
Unescape Escape View File

@ -7,7 +7,7 @@
* *
* TAR format: http://www.gnu.org/software/automake/manual/tar/Standard.html * TAR format: http://www.gnu.org/software/automake/manual/tar/Standard.html
*/ */
/* global bitjs, importScripts, Uint8Array */ /* global bitjs, importScripts, Uint8Array */
// This file expects to be invoked as a Worker (see onmessage below). // This file expects to be invoked as a Worker (see onmessage below).
importScripts("io.js"); importScripts("io.js");
@ -72,9 +72,9 @@ var TarLocalFile = function(bstream) {
if (this.prefix.length) { if (this.prefix.length) {
this.name = this.prefix + this.name; this.name = this.prefix + this.name;
} }
bstream.readBytes(12); // 512 - 500 bstream.readBytes(12); // 512 - 500
} else { } else {
bstream.readBytes(255); // 512 - 257 bstream.readBytes(255); // 512 - 257
} }
// Done header, now rest of blocks are the file contents. // Done header, now rest of blocks are the file contents.
@ -88,7 +88,7 @@ var TarLocalFile = function(bstream) {
// A regular file. // A regular file.
if (this.typeflag === 0) { if (this.typeflag === 0) {
info(" This is a regular file."); info(" This is a regular file.");
var sizeInBytes = parseInt(this.size); // var sizeInBytes = parseInt(this.size);
this.fileData = new Uint8Array(bstream.bytes.buffer, bstream.ptr, this.size); this.fileData = new Uint8Array(bstream.bytes.buffer, bstream.ptr, this.size);
if (this.name.length > 0 && this.size > 0 && this.fileData && this.fileData.buffer) { if (this.name.length > 0 && this.size > 0 && this.fileData && this.fileData.buffer) {
this.isValid = true; this.isValid = true;
@ -100,9 +100,9 @@ var TarLocalFile = function(bstream) {
var remaining = 512 - this.size % 512; var remaining = 512 - this.size % 512;
if (remaining > 0 && remaining < 512) { if (remaining > 0 && remaining < 512) {
bstream.readBytes(remaining); bstream.readBytes(remaining);
} }
} else if (this.typeflag === 5) { } else if (this.typeflag === 5) {
info(" This is a directory.") info(" This is a directory.");
} }
}; };
@ -127,7 +127,7 @@ var untar = function(arrayBuffer) {
if (oneLocalFile && oneLocalFile.isValid) { if (oneLocalFile && oneLocalFile.isValid) {
localFiles.push(oneLocalFile); localFiles.push(oneLocalFile);
totalUncompressedBytesInArchive += oneLocalFile.size; totalUncompressedBytesInArchive += oneLocalFile.size;
} }
} }
totalFilesInArchive = localFiles.length; totalFilesInArchive = localFiles.length;

24
cps/static/js/unzip.js
Unescape Escape View File

@ -119,8 +119,7 @@ ZipLocalFile.prototype.unzip = function() {
// version == 20, compression method == 8 (DEFLATE) // version == 20, compression method == 8 (DEFLATE)
info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)"); info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)");
this.fileData = inflate(this.fileData, this.uncompressedSize); this.fileData = inflate(this.fileData, this.uncompressedSize);
} } else {
else {
err("UNSUPPORTED VERSION/FORMAT: ZIP v" + this.version + ", compression method=" + this.compressionMethod + ": " + this.filename + " (" + this.compressedSize + " bytes)"); err("UNSUPPORTED VERSION/FORMAT: ZIP v" + this.version + ", compression method=" + this.compressionMethod + ": " + this.filename + " (" + this.compressedSize + " bytes)");
this.fileData = null; this.fileData = null;
} }
@ -510,30 +509,30 @@ function inflate(compressedData, numDecompressedBytes) {
var buffer = new bitjs.io.ByteBuffer(numDecompressedBytes); var buffer = new bitjs.io.ByteBuffer(numDecompressedBytes);
//var numBlocks = 0; //var numBlocks = 0;
var blockSize = 0; var blockSize = 0;
var bFinal;
// block format: http://tools.ietf.org/html/rfc1951#page-9 // block format: http://tools.ietf.org/html/rfc1951#page-9
do { do {
var bFinal = bstream.readBits(1); bFinal = bstream.readBits(1);
var bType = bstream.readBits(2); var bType = bstream.readBits(2);
blockSize = 0; blockSize = 0;
// ++numBlocks; // ++numBlocks;
// no compression // no compression
if (bType === 0) { if (bType === 0) {
// skip remaining bits in this byte // skip remaining bits in this byte
while (bstream.bitPtr != 0) bstream.readBits(1); while (bstream.bitPtr !== 0) bstream.readBits(1);
var len = bstream.readBits(16), var len = bstream.readBits(16),
nlen = bstream.readBits(16); // nlen = bstream.readBits(16);
// TODO: check if nlen is the ones-complement of len? // TODO: check if nlen is the ones-complement of len?
if(len > 0) buffer.insertBytes(bstream.readBytes(len)); if (len > 0) buffer.insertBytes(bstream.readBytes(len));
blockSize = len; blockSize = len;
} }
// fixed Huffman codes // fixed Huffman codes
else if(bType === 1) { else if (bType === 1) {
blockSize = inflateBlockData(bstream, getFixedLiteralTable(), getFixedDistanceTable(), buffer); blockSize = inflateBlockData(bstream, getFixedLiteralTable(), getFixedDistanceTable(), buffer);
} }
// dynamic Huffman codes // dynamic Huffman codes
else if(bType === 2) { else if (bType === 2) {
var numLiteralLengthCodes = bstream.readBits(5) + 257; var numLiteralLengthCodes = bstream.readBits(5) + 257;
var numDistanceCodes = bstream.readBits(5) + 1, var numDistanceCodes = bstream.readBits(5) + 1,
numCodeLengthCodes = bstream.readBits(4) + 4; numCodeLengthCodes = bstream.readBits(4) + 4;
@ -567,24 +566,25 @@ function inflate(compressedData, numDecompressedBytes) {
var prevCodeLength = 0; var prevCodeLength = 0;
while (literalCodeLengths.length < numLiteralLengthCodes + numDistanceCodes) { while (literalCodeLengths.length < numLiteralLengthCodes + numDistanceCodes) {
var symbol = decodeSymbol(bstream, codeLengthsCodes); var symbol = decodeSymbol(bstream, codeLengthsCodes);
var repeat;
if (symbol <= 15) { if (symbol <= 15) {
literalCodeLengths.push(symbol); literalCodeLengths.push(symbol);
prevCodeLength = symbol; prevCodeLength = symbol;
} }
else if (symbol === 16) { else if (symbol === 16) {
var repeat = bstream.readBits(2) + 3; repeat = bstream.readBits(2) + 3;
while (repeat--) { while (repeat--) {
literalCodeLengths.push(prevCodeLength); literalCodeLengths.push(prevCodeLength);
} }
} }
else if (symbol === 17) { else if (symbol === 17) {
var repeat = bstream.readBits(3) + 3; repeat = bstream.readBits(3) + 3;
while (repeat--) { while (repeat--) {
literalCodeLengths.push(0); literalCodeLengths.push(0);
} }
} }
else if (symbol === 18) { else if (symbol === 18) {
var repeat = bstream.readBits(7) + 11; repeat = bstream.readBits(7) + 11;
while (repeat--) { while (repeat--) {
literalCodeLengths.push(0); literalCodeLengths.push(0);
} }

4
cps/templates/search.html
Unescape Escape View File

@ -8,6 +8,10 @@
{% else %} {% else %}
<h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2> <h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2>
{%endif%} {%endif%}
{% if g.user.is_authenticated %}
<!--a href="{{ url_for('read_books') }}" class="btn btn-primary">{{ _('Search result to shelf') }} </a-->
{% endif %}
<div class="row"> <div class="row">

94
cps/templates/search_form.html
Unescape Escape View File

@ -14,22 +14,21 @@
<label for="Publisher">{{_('Publisher')}}</label> <label for="Publisher">{{_('Publisher')}}</label>
<input type="text" class="form-control" name="publisher" id="publisher" value=""> <input type="text" class="form-control" name="publisher" id="publisher" value="">
</div> </div>
<!--div class="form-group"--> <div class="row">
<div class="row"> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label for="Publishstart">{{_('Publishing date from')}}</label>
<label for="Publishstart">{{_('Publishing date from')}}</label> <div style="position: relative">
<div style="position: relative"> <input type="date" class="form-control" name="Publishstart" id="Publishstart" value="">
<input type="date" class="form-control" name="Publishstart" id="Publishstart" value=""> <input type="text" class="form-control fake-input hidden" id="fake_Publishstart" value="">
<input type="text" class="form-control fake-input hidden" id="fake_Publishstart" value=""> </div>
</div> </div>
</div> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label for="Publishend">{{_('Publishing date to')}}</label>
<label for="Publishend">{{_('Publishing date to')}}</label> <div style="position: relative">
<div style="position: relative"> <input type="date" class="form-control" name="Publishend" id="Publishend" value="">
<input type="date" class="form-control" name="Publishend" id="Publishend" value=""> <input type="text" class="form-control fake-input hidden" id="fake_Publishend" value="">
<input type="text" class="form-control fake-input hidden" id="fake_Publishend" value=""> </div>
</div> </div>
</div>
</div> </div>
<label for="include_tag">{{_('Tags')}}</label> <label for="include_tag">{{_('Tags')}}</label>
<div class="form-group" id="test"> <div class="form-group" id="test">
@ -71,7 +70,7 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% if languages %} {% if languages %}
<label for="include_language">{{_('Languages')}}</label> <label for="include_language">{{_('Languages')}}</label>
<div class="form-group"> <div class="form-group">
<div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons"> <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
@ -92,7 +91,65 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% endif%} {% endif%}
<div class="row">
<div class="form-group col-sm-6">
<label for="ratinghigh">{{_('Rating bigger than')}}</label>
<input type="number" name="ratinghigh" id="ratinghigh" class="rating input-lg" data-clearable="" >
</div>
<div class="form-group col-sm-6">
<label for="ratinglow">{{_('Rating less than')}}</label>
<input type="number" name="ratinglow" id="ratinglow" class="rating input-lg" data-clearable="" >
</div>
</div>
<div class="form-group">
<label for="comment">{{_('Description')}}</label>
<input type="text" class="form-control" name="comment" id="comment" value="">
</div>
{% if cc|length > 0 %}
{% for c in cc %}
<div class="form-group">
<label for="{{ 'custom_column_' ~ c.id }}">{{ c.name }}</label>
{% if c.datatype == 'bool' %}
<select name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}" class="form-control">
<option value="" selected></option>
<option value="True" >{{_('Yes')}}</option>
<option value="False" >{{_('No')}}</option>
</select>
{% endif %}
{% if c.datatype == 'int' %}
<input type="number" step="1" class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}" value="">
{% endif %}
{% if c.datatype in ['text', 'series'] and not c.is_multiple %}
<input type="text" class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}" value="">
{% endif %}
{% if c.datatype in ['text', 'series'] and c.is_multiple %}
<input type="text" class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}" value="">
{% endif %}
{% if c.datatype == 'enumeration' %}
<select class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}">
<option></option>
{% for opt in c.get_display_dict().enum_values %}
<option>{{ opt }}</option>
{% endfor %}
</select>
{% endif %}
{% if c.datatype == 'rating' %}
<input type="number" min="1" max="5" step="1" class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}"
{% if book['custom_column_' ~ c.id]|length > 0 %}
value="{{ '%d' % (book['custom_column_' ~ c.id][0].value / 2) }}"
{% endif %}>
{% endif %}
</div>
{% endfor %}
{% endif %}
<button type="submit" class="btn btn-default">{{_('Submit')}}</button> <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
</form> </form>
</div> </div>
@ -107,6 +164,7 @@
{% if not g.user.locale == 'en' %} {% if not g.user.locale == 'en' %}
<script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + g.user.locale + '.min.js') }}" charset="UTF-8"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
{% endif %} {% endif %}
<script src="{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
<script src="{{ url_for('static', filename='js/edit_books.js') }}"></script> <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
<script> <script>

243
cps/web.py
Unescape Escape View File

@ -914,32 +914,6 @@ def get_email_status_json():
if 'starttime' not in task: if 'starttime' not in task:
task['starttime'] = "" task['starttime'] = ""
answer = tasks answer = tasks
'''answer.append({'user': 'Test', 'starttime': '07.3.2018 15:23', 'progress': " 0 %", 'type': 'E-Mail',
'runtime': '0 s', 'rt': 0, 'status': _('Waiting'),'id':1 })
answer.append({'user': 'Admin', 'starttime': '07.3.2018 15:33', 'progress': " 11 %", 'type': 'E-Mail',
'runtime': '2 s', 'rt':2, 'status': _('Waiting'),'id':2})
answer.append({'user': 'Nanny', 'starttime': '8.3.2018 15:23', 'progress': " 2 %", 'type': 'E-Mail',
'runtime': '32 s','rt':32, 'status': _('Waiting'),'id':3})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 14:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '7 s','rt':7, 'status': _('Waiting'),'id':4})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 14:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '22 s','rt':22, 'status': _('Waiting'),'id':5})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 14:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '17 s','rt':17, 'status': _('Waiting'),'id':6})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 14:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '72 s','rt':72, 'status': _('Waiting'),'id':7})
answer.append({'user': 'Guest', 'starttime': '19.3.2018 14:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '1:07 s','rt':67, 'status': _('Waiting'),'id':8})
answer.append({'user': 'Guest', 'starttime': '18.2.2018 12:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '2:07 s','rt':127, 'status': _('Waiting'),'id':9})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 14:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '27 s','rt':27, 'status': _('Waiting'),'id':10})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 16:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '73 s','rt':73, 'status': _('Waiting'),'id':11})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 14:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '71 s','rt':71, 'status': _('Waiting'),'id':12})
answer.append({'user': 'Guest', 'starttime': '09.3.2018 17:23', 'progress': " 44 %", 'type': 'E-Mail',
'runtime': '27 s','rt':27, 'status': _('Waiting'),'id':13})'''
js=json.dumps(answer) js=json.dumps(answer)
response = make_response(js) response = make_response(js)
response.headers["Content-Type"] = "application/json; charset=utf-8" response.headers["Content-Type"] = "application/json; charset=utf-8"
@ -1364,7 +1338,6 @@ def toggle_read(book_id):
book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first() book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first()
read_status = getattr(book, 'custom_column_' + str(config.config_read_column)) read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
if len(read_status): if len(read_status):
#setattr(getattr(book,'custom_column_' + str(cc_id), 'value', (not read_status))
read_status[0].value = not read_status[0].value read_status[0].value = not read_status[0].value
db.session.commit() db.session.commit()
else: else:
@ -1722,89 +1695,140 @@ def search():
return render_title_template('search.html', searchterm="", page="search") return render_title_template('search.html', searchterm="", page="search")
@app.route("/advanced_search", methods=["GET"]) @app.route("/advanced_search", methods=['GET'])
@login_required_if_no_ano @login_required_if_no_ano
def advanced_search(): def advanced_search():
if request.method == 'GET': # Build custom columns names
db.session.connection().connection.connection.create_function("lower", 1, db.lcase) tmpcc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
q = db.session.query(db.Books) if config.config_columns_to_ignore:
include_tag_inputs = request.args.getlist('include_tag') cc = []
exclude_tag_inputs = request.args.getlist('exclude_tag') for col in tmpcc:
include_series_inputs = request.args.getlist('include_serie') r = re.compile(config.config_columns_to_ignore)
exclude_series_inputs = request.args.getlist('exclude_serie') if r.match(col.label):
include_languages_inputs = request.args.getlist('include_language') cc.append(col)
exclude_languages_inputs = request.args.getlist('exclude_language') else:
cc = tmpcc
author_name = request.args.get("author_name")
book_title = request.args.get("book_title") db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
publisher = request.args.get("publisher") q = db.session.query(db.Books)
pub_start = request.args.get("Publishstart") # postargs = request.form.to_dict()
pub_end = request.args.get("Publishend")
if author_name: author_name = author_name.strip().lower().replace(',','|') include_tag_inputs = request.args.getlist('include_tag')
if book_title: book_title = book_title.strip().lower() exclude_tag_inputs = request.args.getlist('exclude_tag')
if publisher: publisher = publisher.strip().lower() include_series_inputs = request.args.getlist('include_serie')
if include_tag_inputs or exclude_tag_inputs or include_series_inputs or exclude_series_inputs or \ exclude_series_inputs = request.args.getlist('exclude_serie')
include_languages_inputs or exclude_languages_inputs or author_name or book_title or \ include_languages_inputs = request.args.getlist('include_language')
publisher or pub_start or pub_end: exclude_languages_inputs = request.args.getlist('exclude_language')
searchterm = []
searchterm.extend((author_name.replace('|',','), book_title, publisher)) author_name = request.args.get("author_name")
if pub_start: book_title = request.args.get("book_title")
try: publisher = request.args.get("publisher")
searchterm.extend([_(u"Published after %s" % pub_start = request.args.get("Publishstart")
format_date(datetime.datetime.strptime(pub_start,"%Y-%m-%d"), pub_end = request.args.get("Publishend")
format='medium', locale=get_locale()))]) rating_low = request.args.get("ratinghigh")
except ValueError: rating_high = request.args.get("ratinglow")
pub_start = u"" description = request.args.get("comment")
if pub_end: if author_name: author_name = author_name.strip().lower().replace(',','|')
try: if book_title: book_title = book_title.strip().lower()
searchterm.extend([_(u"Published before ") + if publisher: publisher = publisher.strip().lower()
format_date(datetime.datetime.strptime(pub_end,"%Y-%m-%d"),
format='medium', locale=get_locale())]) searchterm = []
except ValueError: cc_present = False
pub_start = u"" for c in cc:
tag_names = db.session.query(db.Tags).filter(db.Tags.id.in_(include_tag_inputs)).all() if request.args.get('custom_column_' + str(c.id)):
searchterm.extend(tag.name for tag in tag_names) searchterm.extend([_(u"%s: %s" % (c.name, request.args.get('custom_column_' + str(c.id))))])
# searchterm = " + ".join(filter(None, searchterm)) cc_present = True
serie_names = db.session.query(db.Series).filter(db.Series.id.in_(include_series_inputs)).all()
searchterm.extend(serie.name for serie in serie_names) if include_tag_inputs or exclude_tag_inputs or include_series_inputs or exclude_series_inputs or \
language_names = db.session.query(db.Languages).filter(db.Languages.id.in_(include_languages_inputs)).all() include_languages_inputs or exclude_languages_inputs or author_name or book_title or \
for lang in language_names: publisher or pub_start or pub_end or rating_low or rating_high or description or cc_present:
try: searchterm = []
cur_l = LC.parse(lang.lang_code) searchterm.extend((author_name.replace('|',','), book_title, publisher))
lang.name = cur_l.get_language_name(get_locale()) if pub_start:
except Exception: try:
lang.name = _(isoLanguages.get(part3=lang.lang_code).name) searchterm.extend([_(u"Published after %s" %
searchterm.extend(language.name for language in language_names) format_date(datetime.datetime.strptime(pub_start,"%Y-%m-%d"),
searchterm = " + ".join(filter(None, searchterm)) format='medium', locale=get_locale()))])
q = q.filter() except ValueError:
if author_name: pub_start = u""
q = q.filter(db.Books.authors.any(db.Authors.name.ilike("%" + author_name + "%"))) if pub_end:
if book_title: try:
q = q.filter(db.Books.title.ilike("%" + book_title + "%")) searchterm.extend([_(u"Published before ") +
if pub_start: format_date(datetime.datetime.strptime(pub_end,"%Y-%m-%d"),
q = q.filter(db.Books.pubdate >= pub_start) format='medium', locale=get_locale())])
if pub_end: except ValueError:
q = q.filter(db.Books.pubdate <= pub_end) pub_start = u""
if publisher: tag_names = db.session.query(db.Tags).filter(db.Tags.id.in_(include_tag_inputs)).all()
q = q.filter(db.Books.publishers.any(db.Publishers.name.ilike("%" + publisher + "%"))) searchterm.extend(tag.name for tag in tag_names)
for tag in include_tag_inputs: serie_names = db.session.query(db.Series).filter(db.Series.id.in_(include_series_inputs)).all()
q = q.filter(db.Books.tags.any(db.Tags.id == tag)) searchterm.extend(serie.name for serie in serie_names)
for tag in exclude_tag_inputs: language_names = db.session.query(db.Languages).filter(db.Languages.id.in_(include_languages_inputs)).all()
q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag))) for lang in language_names:
for serie in include_series_inputs: try:
q = q.filter(db.Books.series.any(db.Series.id == serie)) cur_l = LC.parse(lang.lang_code)
for serie in exclude_series_inputs: lang.name = cur_l.get_language_name(get_locale())
q = q.filter(not_(db.Books.series.any(db.Series.id == serie))) except Exception:
if current_user.filter_language() != "all": lang.name = _(isoLanguages.get(part3=lang.lang_code).name)
q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language())) searchterm.extend(language.name for language in language_names)
else: if rating_high:
for language in include_languages_inputs: searchterm.extend([_(u"Rating <= %s" % rating_high)])
q = q.filter(db.Books.languages.any(db.Languages.id == language)) if rating_low:
for language in exclude_languages_inputs: searchterm.extend([_(u"Rating >= %s" % rating_low)])
q = q.filter(not_(db.Books.series.any(db.Languages.id == language))) # handle custom columns
q = q.all() for c in cc:
return render_title_template('search.html', searchterm=searchterm, if request.args.get('custom_column_' + str(c.id)):
entries=q, title=_(u"search"), page="search") searchterm.extend([_(u"%s: %s" % (c.name, request.args.get('custom_column_' + str(c.id))))])
searchterm = " + ".join(filter(None, searchterm))
q = q.filter()
if author_name:
q = q.filter(db.Books.authors.any(db.Authors.name.ilike("%" + author_name + "%")))
if book_title:
q = q.filter(db.Books.title.ilike("%" + book_title + "%"))
if pub_start:
q = q.filter(db.Books.pubdate >= pub_start)
if pub_end:
q = q.filter(db.Books.pubdate <= pub_end)
if publisher:
q = q.filter(db.Books.publishers.any(db.Publishers.name.ilike("%" + publisher + "%")))
for tag in include_tag_inputs:
q = q.filter(db.Books.tags.any(db.Tags.id == tag))
for tag in exclude_tag_inputs:
q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
for serie in include_series_inputs:
q = q.filter(db.Books.series.any(db.Series.id == serie))
for serie in exclude_series_inputs:
q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
if current_user.filter_language() != "all":
q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
else:
for language in include_languages_inputs:
q = q.filter(db.Books.languages.any(db.Languages.id == language))
for language in exclude_languages_inputs:
q = q.filter(not_(db.Books.series.any(db.Languages.id == language)))
if rating_high:
q = q.filter(db.Books.ratings.any(db.Ratings.id <= rating_high))
if rating_low:
q = q.filter(db.Books.ratings.any(db.Ratings.id >= rating_low))
if description:
q = q.filter(db.Books.comments.any(db.Comments.text.ilike("%" + description + "%")))
# search custom culumns
for c in cc:
custom_query = request.args.get('custom_column_' + str(c.id))
if custom_query:
if c.datatype == 'bool':
getattr(db.Books, 'custom_column_1')
q = q.filter(getattr(db.Books, 'custom_column_'+str(c.id)).any(
db.cc_classes[c.id].value == (custom_query== "True") ))
elif c.datatype == 'int':
q = q.filter(getattr(db.Books, 'custom_column_'+str(c.id)).any(
db.cc_classes[c.id].value == custom_query ))
else:
q = q.filter(getattr(db.Books, 'custom_column_'+str(c.id)).any(
db.cc_classes[c.id].value.ilike("%" + custom_query + "%")))
q = q.all()
return render_title_template('search.html', searchterm=searchterm,
entries=q, title=_(u"search"), page="search")
tags = db.session.query(db.Tags).order_by(db.Tags.name).all() tags = db.session.query(db.Tags).order_by(db.Tags.name).all()
series = db.session.query(db.Series).order_by(db.Series.name).all() series = db.session.query(db.Series).order_by(db.Series.name).all()
if current_user.filter_language() == u"all": if current_user.filter_language() == u"all":
@ -1817,8 +1841,9 @@ def advanced_search():
lang.name = _(isoLanguages.get(part3=lang.lang_code).name) lang.name = _(isoLanguages.get(part3=lang.lang_code).name)
else: else:
languages = None languages = None
return render_title_template('search_form.html', tags=tags, languages=languages, return render_title_template('search_form.html', tags=tags, languages=languages,
series=series, title=_(u"search"), page="advsearch") series=series, title=_(u"search"), cc=cc, page="advsearch")

4
cps/worker.py
Unescape Escape View File

@ -360,7 +360,7 @@ class WorkerThread(threading.Thread):
self.UIqueue[self.current]['message'] = error_message self.UIqueue[self.current]['message'] = error_message
return # error_message, RET_FAIL return # error_message, RET_FAIL
def add_convert(self, file_path, bookid, user_name, type, settings, kindle_mail): def add_convert(self, file_path, bookid, user_name, typ, settings, kindle_mail):
addLock = threading.Lock() addLock = threading.Lock()
addLock.acquire() addLock.acquire()
if self.last >= 20: if self.last >= 20:
@ -369,7 +369,7 @@ class WorkerThread(threading.Thread):
self.id += 1 self.id += 1
self.queue.append({'file_path':file_path, 'bookid':bookid, 'starttime': 0, 'kindle':kindle_mail, self.queue.append({'file_path':file_path, 'bookid':bookid, 'starttime': 0, 'kindle':kindle_mail,
'status': STAT_WAITING, 'typ': TASK_CONVERT, 'settings':settings}) 'status': STAT_WAITING, 'typ': TASK_CONVERT, 'settings':settings})
self.UIqueue.append({'user': user_name, 'formStarttime': '', 'progress': " 0 %", 'type': type, self.UIqueue.append({'user': user_name, 'formStarttime': '', 'progress': " 0 %", 'type': typ,
'runtime': '0 s', 'status': _('Waiting'),'id': self.id } ) 'runtime': '0 s', 'status': _('Waiting'),'id': self.id } )
self.id += 1 self.id += 1

Write Preview
Loading…
Cancel
Save