Added djv file format to djvu reader
This commit is contained in:
		
							parent
							
								
									dba83a2900
								
							
						
					
					
						commit
						e2785c3985
					
				| 
						 | 
				
			
			@ -147,7 +147,7 @@ EXTENSIONS_CONVERT_FROM = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2',
 | 
			
		|||
                           'txt', 'htmlz', 'rtf', 'odt', 'cbz', 'cbr']
 | 
			
		||||
EXTENSIONS_CONVERT_TO = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2',
 | 
			
		||||
                         'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt']
 | 
			
		||||
EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu',
 | 
			
		||||
EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'djv',
 | 
			
		||||
                     'prc', 'doc', 'docx', 'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3', 'mp4', 'ogg',
 | 
			
		||||
                     'opus', 'wav', 'flac', 'm4a', 'm4b'}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -191,7 +191,7 @@ def check_send_to_ereader(entry):
 | 
			
		|||
# Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
 | 
			
		||||
# list with supported formats
 | 
			
		||||
def check_read_formats(entry):
 | 
			
		||||
    extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
 | 
			
		||||
    extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU', 'DJV'}
 | 
			
		||||
    book_formats = list()
 | 
			
		||||
    if len(entry.data):
 | 
			
		||||
        for ele in iter(entry.data):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,6 +18,6 @@
 | 
			
		|||
    <script src="{{ url_for('static', filename='js/reading/djvu_reader.js') }}"></script>
 | 
			
		||||
  </head>
 | 
			
		||||
  <body>
 | 
			
		||||
	<div id="djvuContainer" file="{{ url_for('web.serve_book', book_id=djvufile, book_format='djvu') }}"></div>
 | 
			
		||||
	<div id="djvuContainer" file="{{ url_for('web.serve_book', book_id=djvufile, book_format=extension) }}"></div>
 | 
			
		||||
  </body>
 | 
			
		||||
</html>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1540,9 +1540,9 @@ def read_book(book_id, book_format):
 | 
			
		|||
    elif book_format.lower() == "txt":
 | 
			
		||||
        log.debug("Start txt reader for %d", book_id)
 | 
			
		||||
        return render_title_template('readtxt.html', txtfile=book_id, title=book.title)
 | 
			
		||||
    elif book_format.lower() == "djvu":
 | 
			
		||||
    elif book_format.lower() in ["djvu", "djv"]:
 | 
			
		||||
        log.debug("Start djvu reader for %d", book_id)
 | 
			
		||||
        return render_title_template('readdjvu.html', djvufile=book_id, title=book.title)
 | 
			
		||||
        return render_title_template('readdjvu.html', djvufile=book_id, title=book.title, extension=book_format.lower())
 | 
			
		||||
    else:
 | 
			
		||||
        for fileExt in constants.EXTENSIONS_AUDIO:
 | 
			
		||||
            if book_format.lower() == fileExt:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user