yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00
Code Issues Releases Wiki Activity

updated BookCollection class from library-service branch

Browse source
This commit is contained in:
Nikolay Pultsin 2013-01-26 10:17:01 +04:00
parent cd2c45f685
commit 0b1f7c5ab0
1 changed files with 84 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

128
src/org/geometerplus/fbreader/book/BookCollection.java
View file

@ -28,6 +28,7 @@ import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.fbreader.Paths; import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.bookmodel.BookReadingException; import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.*;
public class BookCollection extends AbstractBookCollection { public class BookCollection extends AbstractBookCollection {
private final BooksDatabase myDatabase; private final BooksDatabase myDatabase;
@ -35,6 +36,8 @@ public class BookCollection extends AbstractBookCollection {
Collections.synchronizedMap(new LinkedHashMap<ZLFile,Book>()); Collections.synchronizedMap(new LinkedHashMap<ZLFile,Book>());
private final Map<Long,Book> myBooksById = private final Map<Long,Book> myBooksById =
Collections.synchronizedMap(new HashMap<Long,Book>()); Collections.synchronizedMap(new HashMap<Long,Book>());
private final List<String> myFilesToRescan =
Collections.synchronizedList(new LinkedList<String>());
private static enum BuildStatus { private static enum BuildStatus {
NotStarted, NotStarted,
@ -55,6 +58,15 @@ public class BookCollection extends AbstractBookCollection {
if (bookFile == null) { if (bookFile == null) {
return null; return null;
} }
final FormatPlugin plugin = PluginCollection.Instance().getPlugin(bookFile);
if (plugin == null) {
return null;
}
try {
bookFile = plugin.realBookFile(bookFile);
} catch (BookReadingException e) {
return null;
}
Book book = myBooksByFile.get(bookFile); Book book = myBooksByFile.get(bookFile);
if (book != null) { if (book != null) {
@ -90,7 +102,6 @@ public class BookCollection extends AbstractBookCollection {
} }
saveBook(book, false); saveBook(book, false);
addBook(book, false);
return book; return book;
} }
@ -156,8 +167,9 @@ public class BookCollection extends AbstractBookCollection {
return false; return false;
} }
final boolean result = book.save(myDatabase, force);
addBook(book, true); addBook(book, true);
return book.save(myDatabase, force); return result;
} }
public void removeBook(Book book, boolean deleteFromDisk) { public void removeBook(Book book, boolean deleteFromDisk) {
@ -257,7 +269,10 @@ public class BookCollection extends AbstractBookCollection {
fireBuildEvent(Listener.BuildEvent.Failed); fireBuildEvent(Listener.BuildEvent.Failed);
} finally { } finally {
fireBuildEvent(Listener.BuildEvent.Completed); fireBuildEvent(Listener.BuildEvent.Completed);
myBuildStatus = BuildStatus.Finished; synchronized (myFilesToRescan) {
myBuildStatus = BuildStatus.Finished;
processFilesQueue();
}
} }
} }
}; };
@ -265,6 +280,31 @@ public class BookCollection extends AbstractBookCollection {
builder.start(); builder.start();
} }
public void rescan(String path) {
synchronized (myFilesToRescan) {
myFilesToRescan.add(path);
processFilesQueue();
}
}
private void processFilesQueue() {
synchronized (myFilesToRescan) {
if (myBuildStatus != BuildStatus.Finished) {
return;
}
for (ZLFile file : collectPhysicalFiles(myFilesToRescan)) {
// TODO:
// collect books from archives
// rescan files and check book id
final Book book = getBookByFile(file);
if (book != null) {
saveBook(book, false);
}
}
myFilesToRescan.clear();
}
}
private void build() { private void build() {
// Step 0: get database books marked as "existing" // Step 0: get database books marked as "existing"
final FileInfoSet fileInfos = new FileInfoSet(myDatabase); final FileInfoSet fileInfos = new FileInfoSet(myDatabase);
@ -294,34 +334,32 @@ public class BookCollection extends AbstractBookCollection {
final Set<ZLPhysicalFile> physicalFiles = new HashSet<ZLPhysicalFile>(); final Set<ZLPhysicalFile> physicalFiles = new HashSet<ZLPhysicalFile>();
int count = 0; int count = 0;
for (Book book : savedBooksByFileId.values()) { for (Book book : savedBooksByFileId.values()) {
synchronized (this) { final ZLPhysicalFile file = book.File.getPhysicalFile();
final ZLPhysicalFile file = book.File.getPhysicalFile(); if (file != null) {
if (file != null) { physicalFiles.add(file);
physicalFiles.add(file); }
} if (file != book.File && file != null && file.getPath().endsWith(".epub")) {
if (file != book.File && file != null && file.getPath().endsWith(".epub")) { continue;
}
if (book.File.exists()) {
boolean doAdd = true;
if (file == null) {
continue; continue;
} }
if (book.File.exists()) { if (!fileInfos.check(file, true)) {
boolean doAdd = true; try {
if (file == null) { book.readMetaInfo();
continue; saveBook(book, false);
} catch (BookReadingException e) {
doAdd = false;
} }
if (!fileInfos.check(file, true)) { file.setCached(false);
try {
book.readMetaInfo();
saveBook(book, false);
} catch (BookReadingException e) {
doAdd = false;
}
file.setCached(false);
}
if (doAdd) {
addBook(book, false);
}
} else {
orphanedBooks.add(book);
} }
if (doAdd) {
addBook(book, false);
}
} else {
orphanedBooks.add(book);
} }
} }
myDatabase.setExistingFlag(orphanedBooks, false); myDatabase.setExistingFlag(orphanedBooks, false);
@ -331,7 +369,7 @@ public class BookCollection extends AbstractBookCollection {
final Map<Long,Book> orphanedBooksByFileId = myDatabase.loadBooks(fileInfos, false); final Map<Long,Book> orphanedBooksByFileId = myDatabase.loadBooks(fileInfos, false);
final Set<Book> newBooks = new HashSet<Book>(); final Set<Book> newBooks = new HashSet<Book>();
final List<ZLPhysicalFile> physicalFilesList = collectPhysicalFiles(); final List<ZLPhysicalFile> physicalFilesList = collectPhysicalFiles(bookDirectories());
for (ZLPhysicalFile file : physicalFilesList) { for (ZLPhysicalFile file : physicalFilesList) {
if (physicalFiles.contains(file)) { if (physicalFiles.contains(file)) {
continue; continue;
@ -365,7 +403,6 @@ public class BookCollection extends AbstractBookCollection {
public void run() { public void run() {
for (Book book : newBooks) { for (Book book : newBooks) {
saveBook(book, false); saveBook(book, false);
addBook(book, false);
} }
} }
}); });
@ -376,28 +413,31 @@ public class BookCollection extends AbstractBookCollection {
return Collections.singletonList(Paths.BooksDirectoryOption().getValue()); return Collections.singletonList(Paths.BooksDirectoryOption().getValue());
} }
private List<ZLPhysicalFile> collectPhysicalFiles() { private List<ZLPhysicalFile> collectPhysicalFiles(List<String> directories) {
final Queue<ZLFile> dirQueue = new LinkedList<ZLFile>(); final Queue<ZLPhysicalFile> fileQueue = new LinkedList<ZLPhysicalFile>();
final HashSet<ZLFile> dirSet = new HashSet<ZLFile>(); final HashSet<ZLPhysicalFile> dirSet = new HashSet<ZLPhysicalFile>();
final LinkedList<ZLPhysicalFile> fileList = new LinkedList<ZLPhysicalFile>(); final LinkedList<ZLPhysicalFile> fileList = new LinkedList<ZLPhysicalFile>();
for (String path : bookDirectories()) { for (String path : directories) {
dirQueue.offer(new ZLPhysicalFile(new File(path))); fileQueue.offer(new ZLPhysicalFile(new File(path)));
} }
while (!dirQueue.isEmpty()) { while (!fileQueue.isEmpty()) {
for (ZLFile file : dirQueue.poll().children()) { final ZLPhysicalFile entry = fileQueue.poll();
if (file.isDirectory()) { if (entry.isDirectory()) {
if (!dirSet.contains(file)) { if (dirSet.contains(entry)) {
dirQueue.add(file); continue;
dirSet.add(file);
}
} else {
file.setCached(true);
fileList.add((ZLPhysicalFile)file);
} }
dirSet.add(entry);
for (ZLFile file : entry.children()) {
fileQueue.add((ZLPhysicalFile)file);
}
} else {
entry.setCached(true);
fileList.add(entry);
} }
} }
return fileList; return fileList;
} }