MajenkoProjects/AudiobookRecorder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved archive routine

Browse Source
This commit is contained in:
Matt Jenkins
2021-01-22 14:13:27 +00:00
parent ead577521d
commit 28a3326a35
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
View File

@@ -2812,6 +2812,11 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
public void run() { public void run() {
Debug.trace(); Debug.trace();
try { try {
pd.setMessage("Purging backups...");
book.purgeBackups();
pd.setMessage("Archiving book...");
String name = book.getName(); String name = book.getName();
File storageDir = new File(Options.get("path.storage")); File storageDir = new File(Options.get("path.storage"));
File bookDir = book.getLocation(); File bookDir = book.getLocation();
@@ -2898,6 +2903,8 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
zos.flush(); zos.flush();
zos.close(); zos.close();
pd.setMessage("Cleaning up...");
while (fileList.size() > 0) { while (fileList.size() > 0) {
File f = fileList.remove(fileList.size() - 1); File f = fileList.remove(fileList.size() - 1);
f.delete(); f.delete();
@@ -2911,7 +2918,7 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
public void archiveBook(Book book) { public void archiveBook(Book book) {
Debug.trace(); Debug.trace();
int r = JOptionPane.showConfirmDialog(this, "This will stash the current book away\nin the archives folder in a compressed\nform. The existing book files will be deleted\nand the book closed.\n\nAre you sure you want to do this?", "Archive Book", JOptionPane.OK_CANCEL_OPTION); int r = JOptionPane.showConfirmDialog(this, "This will stash the current book away\nin the archives folder in a compressed\nform. All backups will be purged, the existing book files will be deleted\nand the book closed.\n\nAre you sure you want to do this?", "Archive Book", JOptionPane.OK_CANCEL_OPTION);
if (r == JOptionPane.OK_OPTION) { if (r == JOptionPane.OK_OPTION) {
@@ -2922,17 +2929,23 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
Thread t = new Thread(runnable); Thread t = new Thread(runnable);
t.start(); t.start();
pd.setVisible(true); pd.setVisible(true);
closeBook(book); closeBook(book, false);
} }
} }
public void closeBook(Book b) { public void closeBook(Book b) {
closeBook(b, true);
}
public void closeBook(Book b, boolean save) {
if (selectedBook == b) { if (selectedBook == b) {
setSelectedBook(null); setSelectedBook(null);
setSelectedSentence(null); setSelectedSentence(null);
setSelectedChapter(null); setSelectedChapter(null);
} }
saveBook(b); if (save) {
saveBook(b);
}
bookTreeModel.removeNodeFromParent(b); bookTreeModel.removeNodeFromParent(b);
updateOpenBookList(); updateOpenBookList();
} }