/*
- * This file is part of NixNote
+ * This file is part of NixNote
* Copyright 2009 Randy Baumgarte
*
* This file may be licensed under the terms of of the
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.security.MessageDigest;
import com.trolltech.qt.gui.QToolBar;
import com.trolltech.qt.gui.QTreeWidgetItem;
import com.trolltech.qt.network.QNetworkAccessManager;
+import com.trolltech.qt.network.QNetworkProxy;
+import com.trolltech.qt.network.QNetworkProxy.ProxyType;
import com.trolltech.qt.network.QNetworkReply;
import com.trolltech.qt.network.QNetworkRequest;
import com.trolltech.qt.webkit.QWebPage.WebAction;
import cx.fbn.nevernote.dialog.FindDialog;
import cx.fbn.nevernote.dialog.IgnoreSync;
import cx.fbn.nevernote.dialog.LogFileDialog;
-import cx.fbn.nevernote.dialog.LoginDialog;
import cx.fbn.nevernote.dialog.NotebookArchive;
import cx.fbn.nevernote.dialog.NotebookEdit;
import cx.fbn.nevernote.dialog.OnlineNoteHistory;
import cx.fbn.nevernote.gui.Thumbnailer;
import cx.fbn.nevernote.gui.TrashTreeWidget;
import cx.fbn.nevernote.gui.controls.QuotaProgressBar;
+import cx.fbn.nevernote.oauth.OAuthTokenizer;
+import cx.fbn.nevernote.oauth.OAuthWindow;
import cx.fbn.nevernote.sql.DatabaseConnection;
import cx.fbn.nevernote.sql.WatchFolderRecord;
import cx.fbn.nevernote.threads.IndexRunner;
import cx.fbn.nevernote.utilities.SyncTimes;
import cx.fbn.nevernote.xml.ExportData;
import cx.fbn.nevernote.xml.ImportData;
+import cx.fbn.nevernote.xml.ImportEnex;
import cx.fbn.nevernote.xml.NoteFormatter;
QTimer authTimer; // Refresh authentication
QTimer externalFileSaveTimer; // Save files altered externally
QTimer thumbnailTimer; // Wakeup & scan for thumbnails
+ QTimer debugTimer;
List<String> externalFiles; // External files to save later
List<String> importFilesKeep; // Auto-import files to save later
List<String> importFilesDelete; // Auto-import files to save later
boolean encryptOnShutdown; // should I encrypt when I close?
boolean decryptOnShutdown; // should I decrypt on shutdown;
String encryptCipher; // What cipher should I use?
- Signal0 minimizeToTray;
+ //Signal0 minimizeToTray;
boolean windowMaximized = false; // Keep track of the window state for restores
List<String> pdfReadyQueue; // Queue of PDFs that are ready to be rendered.
List<QPixmap> syncIcons; // Array of icons used in sync animation
thumbnailTimer.setInterval(500*1000); // Thumbnail every minute
thumbnailTimer.start();
+// debugTimer = new QTimer();
+// debugTimer.timeout.connect(this, "debugDirty()");
+// debugTimer.start(1000*60);
+
logger.log(logger.EXTREME, "Starting authentication timer");
authTimer = new QTimer();
authTimer.timeout.connect(this, "authTimer()");
tagTree.showAllTags(true);
QIcon appIcon = new QIcon(iconPath+"nevernote.png");
- setWindowIcon(appIcon);
- trayIcon.setIcon(appIcon);
- if (Global.showTrayIcon())
- trayIcon.show();
- else
- trayIcon.hide();
+ if (QSystemTrayIcon.isSystemTrayAvailable()) {
+ setWindowIcon(appIcon);
+ trayIcon.setIcon(appIcon);
+ if (Global.showTrayIcon() || Global.minimizeOnClose())
+ trayIcon.show();
+ else
+ trayIcon.hide();
+ }
scrollToGuid(currentNoteGuid);
if (Global.automaticLogin()) {
int sortCol = Global.getSortColumn();
int sortOrder = Global.getSortOrder();
noteTableView.proxyModel.blocked = true;
+ // We sort the table twice to fix a bug. For some reaosn the table won't sort properly if it is in narrow
+ // list view and sorted descending on the date created. By sorting it twice it forces the proper sort. Ugly.
+ if (sortCol == 0 && sortOrder == 1 && Global.getListView() == Global.View_List_Narrow)
+ noteTableView.sortByColumn(sortCol, SortOrder.resolve(0));
noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
noteTableView.proxyModel.blocked = false;
noteTableView.proxyModel.sortChanged.connect(this, "tableSortOrderChanged(Integer,Integer)");
+ // Set the startup notebook
+ String defaultNotebook = Global.getStartupNotebook();
+ if (!defaultNotebook.equals("AllNotebooks") && !defaultNotebook.equals("")) {
+ for (int k=0; k<listManager.getNotebookIndex().size(); k++) {
+ if (listManager.getNotebookIndex().get(k).isDefaultNotebook()) {
+ notebookTree.clearSelection();
+ notebookTree.selectGuid(listManager.getNotebookIndex().get(k).getGuid());
+ notebookTree.selectionSignal.emit();
+ }
+ }
+ }
+
+
+
+
if (Global.checkVersionUpgrade())
checkForUpdates();
}
+
+
+ public void debugDirty() {
+ List<Note> dirty = conn.getNoteTable().getDirty();
+ logger.log(logger.LOW, "------ Dirty Notes List Begin ------");
+ for (int i=0; i<dirty.size(); i++) {
+ logger.log(logger.LOW, "GUID: " +dirty.get(i).getGuid() + " Title:" + dirty.get(i).getTitle());
+ }
+ logger.log(logger.LOW, "------ Dirty Notes List End ------");
+ }
// Main entry point
public static void main(String[] args) {
QMessageBox.critical(null, "Startup error", "Aborting: " + e.getMessage());
return;
}
+
+ // Setup proxy crap
+ String proxyUrl = Global.getProxyValue("url");
+ String proxyPort = Global.getProxyValue("port");
+ String proxyUserid = Global.getProxyValue("userid");
+ String proxyPassword = Global.getProxyValue("password");
+ boolean proxySet = false;
+ QNetworkProxy proxy = new QNetworkProxy();
+ proxy.setType(ProxyType.HttpProxy);
+ if (!proxyUrl.trim().equals("")) {
+ System.out.println("Proxy URL found: " +proxyUrl);
+ proxySet = true;
+ proxy.setHostName(proxyUrl);
+ }
+ if (!proxyPort.trim().equals("")) {
+ System.out.println("Proxy Port found: " +proxyPort);
+ proxySet = true;
+ proxy.setPort(Integer.parseInt(proxyPort));
+ }
+ if (!proxyUserid.trim().equals("")) {
+ System.out.println("Proxy Userid found: " +proxyUserid);
+ proxySet = true;
+ proxy.setUser(proxyUserid);
+ }
+ if (!proxyPassword.trim().equals("")) {
+ System.out.println("Proxy URL found: " +proxyPassword);
+ proxySet = true;
+ proxy.setPassword(proxyPassword);
+ }
+ if (proxySet) {
+ QNetworkProxy.setApplicationProxy(proxy);
+ }
+
NeverNote application = new NeverNote(dbConn);
+ if (Global.syncOnly) {
+ System.out.println("Performing synchronization only.");
+ application.remoteConnect();
+ if (Global.isConnected) {
+ application.syncRunner.syncNeeded = true;
+ application.syncRunner.addWork("SYNC");
+ application.syncRunner.addWork("STOP");
+ while(!application.syncRunner.isIdle());
+ application.closeNeverNote();
+ }
+ return;
+ }
application.setAttribute(WidgetAttribute.WA_DeleteOnClose, true);
if (Global.startMinimized())
startupConfig.setHomeDirPath(arg.substring(arg.indexOf('=') + 1));
if (lower.startsWith("--disable-viewing"))
startupConfig.setDisableViewing(true);
+ if (lower.startsWith("--sync-only=true"))
+ startupConfig.setSyncOnly(true);
}
- Global.setup(startupConfig);
+ Global.setup(startupConfig);
+
}
// Exit point
@Override
public void closeEvent(QCloseEvent event) {
- if (Global.minimizeOnClose() && !closeAction && Global.showTrayIcon()) {
+ if (Global.minimizeOnClose() && !closeAction) {
event.ignore();
hide();
return;
waitCursor(true);
if (currentNote!= null & browserWindow!=null) {
- if (!currentNote.getTitle().equals(browserWindow.getTitle()))
+ if (currentNote.getTitle() != null && browserWindow != null
+ && !currentNote.getTitle().equals(browserWindow.getTitle()))
conn.getNoteTable().updateNoteTitle(currentNote.getGuid(), browserWindow.getTitle());
}
saveNote();
logger.log(logger.HIGH, "Leaving NeverNote.closeEvent");
}
- @SuppressWarnings("unused")
+
private void closeNeverNote() {
closeAction = true;
close();
}
public void setMessage(String s) {
- logger.log(logger.HIGH, "Entering NeverNote.setMessage");
-
- statusBar.show();
- logger.log(logger.HIGH, "Message: " +s);
- statusBar.showMessage(s);
- emitLog.add(s);
-
-
- messageTimer.stop();
- messageTimer.setSingleShot(true);
- messageTimer.start();
-
-
- logger.log(logger.HIGH, "Leaving NeverNote.setMessage");
+ if (logger != null)
+ logger.log(logger.HIGH, "Entering NeverNote.setMessage");
+ else
+ System.out.println("*** ERROR *** " +s);
+
+ if (statusBar != null) {
+ statusBar.show();
+ if (logger != null)
+ logger.log(logger.HIGH, "Message: " +s);
+ statusBar.showMessage(s);
+ if (emitLog != null)
+ emitLog.add(s);
+
+ if (messageTimer != null) {
+ messageTimer.stop();
+ messageTimer.setSingleShot(true);
+ messageTimer.start();
+ }
+ }
+
+ if (logger != null)
+ logger.log(logger.HIGH, "Leaving NeverNote.setMessage");
}
private void clearMessage() {
indexRunner.indexNoteTitle = Global.indexNoteTitle();
indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
indexRunner.indexImageRecognition = Global.indexImageRecognition();
- if (Global.showTrayIcon())
+ if (Global.showTrayIcon() || Global.minimizeOnClose())
trayIcon.show();
else
trayIcon.hide();
Global.setColumnWidth("noteTableThumbnailPosition", width);
width = noteTableView.getColumnWidth(Global.noteTableGuidPosition);
Global.setColumnWidth("noteTableGuidPosition", width);
+ width = noteTableView.getColumnWidth(Global.noteTablePinnedPosition);
+ Global.setColumnWidth("noteTablePinnedPosition", width);
}
@SuppressWarnings("unused")
clearSavedSearchFilter();
if (Global.mimicEvernoteInterface) {
clearTagFilter();
- searchField.clear();
+ //searchField.clear();
+ searchField.clearEditText();
}
menuBar.noteRestoreAction.setVisible(false);
menuBar.notebookEditAction.setEnabled(true);
if (tagTree.selectedItems().size() > 0)
filter = true;
tagTree.showAllTags(!filter);
+ tagIndexUpdated(false);
logger.log(logger.HIGH, "Leaving NeverNote.reloadTagTree");
}
// Edit an existing tag
if (currentNote != null && currentNote.getTagGuids().contains(guid))
browserWindow.setTag(getTagNamesForNote(currentNote));
logger.log(logger.HIGH, "Leaving NeverNote.editTag");
- return;
+ //return;
}
}
+ listManager.reloadNoteTagNames(guid, edit.getTag());
+ noteIndexUpdated(true);
+ refreshEvernoteNote(true);
browserWindow.setTag(getTagNamesForNote(currentNote));
logger.log(logger.HIGH, "Leaving NeverNote.editTag...");
}
QTextEdit textBox = new QTextEdit();
layout.addWidget(textBox);
textBox.setReadOnly(true);
- QFile file = new QFile(Global.getFileManager().getHomeDirPath("release.txt"));
+ QFile file = new QFile(Global.getFileManager().getProgramDirPath("release.txt"));
if (!file.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.ReadOnly,
QIODevice.OpenModeFlag.Text)))
return;
tr("About NixNote"),
tr("<h4><center><b>NixNote</b></center></h4><hr><center>Version ")
+Global.version
- +tr("<hr></center>Evernote"
- +"An Open Source Evernote Client.<br><br>"
+ //+"1.2.120724"
+ +tr("<hr>"
+ +"Open Source Evernote Client.<br><br>"
+"Licensed under GPL v2. <br><hr><br>"
- +"Evernote is copyright 2001-2010 by Evernote Corporation<br>"
+ +"</center>Evernote is copyright 2001-2012 by Evernote Corporation<br>"
+"Jambi and QT are the licensed trademark of Nokia Corporation<br>"
+"PDFRenderer is licened under the LGPL<br>"
+"JTidy is copyrighted under the World Wide Web Consortium<br>"
listManager.setEnSearch(text.trim());
listManager.loadNotesIndex();
noteIndexUpdated(false);
+
refreshEvernoteNote(true);
searchPerformed = true;
+ waitCursor(false);
logger.log(logger.HIGH, "Leaving NeverNote.searchFieldChanged");
}
menuBar.noteRestoreAction.setVisible(false);
}
else {
+ trashNoteGuid = tempGuid;
currentNoteGuid = trashNoteGuid;
- trashNoteGuid = tempGuid;
menuBar.noteRestoreAction.setEnabled(true);
menuBar.noteRestoreAction.setVisible(true);
Global.showDeleted = true;
}
// Do a manual connect/disconnect
private void remoteConnect() {
+
logger.log(logger.HIGH, "Entering NeverNote.remoteConnect");
+ // If we are already connected, we just disconnect
if (Global.isConnected) {
Global.isConnected = false;
syncRunner.enDisconnect();
return;
}
+ OAuthTokenizer tokenizer = new OAuthTokenizer();
AESEncrypter aes = new AESEncrypter();
try {
- aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("secure.txt")));
+ aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("oauth.txt")));
} catch (FileNotFoundException e) {
// File not found, so we'll just get empty strings anyway.
}
-
+
+
if (Global.getProxyValue("url").equals("")) {
System.setProperty("http.proxyHost","") ;
System.setProperty("http.proxyPort", "") ;
syncRunner.userStoreUrl = Global.userStoreUrl;
syncRunner.noteStoreUrl = Global.noteStoreUrl;
syncRunner.noteStoreUrlBase = Global.noteStoreUrlBase;
-
- String userid = aes.getUserid();
- String password = aes.getPassword();
- if (!userid.equals("") && !password.equals("")) {
- Global.username = userid;
- Global.password = password;
- syncRunner.username = Global.username;
- syncRunner.password = Global.password;
+
+
+
+ String authString = aes.getString();
+ if (!authString.equals("")) {
+ tokenizer.tokenize(authString);
+ syncRunner.authToken = tokenizer.oauth_token;
syncRunner.enConnect();
}
Global.isConnected = syncRunner.isConnected;
if (!Global.isConnected) {
- // Show the login dialog box
- if (!Global.automaticLogin() || userid.equals("")|| password.equals("")) {
- LoginDialog login = new LoginDialog();
- login.exec();
-
- if (!login.okPressed()) {
- return;
- }
-
- Global.username = login.getUserid();
- Global.password = login.getPassword();
+ OAuthWindow window = new OAuthWindow(logger);
+ if (window.error) {
+ setMessage(window.errorMessage);
+ return;
+ }
+ window.exec();
+ if (window.error) {
+ setMessage(window.errorMessage);
+ return;
}
- syncRunner.username = Global.username;
- syncRunner.password = Global.password;
+ tokenizer.tokenize(window.response);
+ if (tokenizer.oauth_token.equals("")) {
+ setMessage(tr("Invalid authorization token received."));
+ return;
+ }
+ aes.setString(window.response);
+ try {
+ aes.encrypt(new FileOutputStream(Global.getFileManager().getHomeDirFile("oauth.txt")));
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ syncRunner.authToken = tokenizer.oauth_token;
syncRunner.enConnect();
Global.isConnected = syncRunner.isConnected;
}
-
+// Global.username = syncRunner.username;
+
if (!Global.isConnected)
return;
setupOnlineMenu();
setupConnectMenuOptions();
logger.log(logger.HIGH, "Leaving NeverNote.remoteConnect");
+
+
}
private void setupConnectMenuOptions() {
logger.log(logger.HIGH, "entering NeverNote.setupConnectMenuOptions");
saveNote();
+ // If we have more than one selection, then set the merge note action to true.
+ List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
+ if (selections.size() > 1)
+ menuBar.noteMergeAction.setEnabled(true);
+ else
+ menuBar.noteMergeAction.setEnabled(false);
+
// If the ctrl key is pressed, then they are selecting multiple
// entries and we don't want to change the currently viewed note.
if (QApplication.keyboardModifiers().isSet(KeyboardModifier.ControlModifier) &&
}
noteTableView.showColumn(Global.noteTableGuidPosition);
- List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
if (!Global.isColumnVisible("guid"))
noteTableView.hideColumn(Global.noteTableGuidPosition);
browserWindow.setDisabled(true);
}
+ if (Global.showDeleted && listManager.getNotebookIndex().size() > 0 && saveCurrentNoteGuid.equals("")) {
+ currentNoteGuid = listManager.getNoteIndex().get(0).getGuid();
+ saveCurrentNoteGuid = currentNoteGuid;
+ refreshEvernoteNote(true);
+ }
+
if (!saveCurrentNoteGuid.equals("")) {
refreshEvernoteNote(false);
} else {
- currentNoteGuid = "";
+ currentNoteGuid = "";
}
reloadTagTree(false);
noteTableView.setColumnHidden(Global.noteTableSynchronizedPosition, !Global.isColumnVisible("synchronized"));
noteTableView.setColumnHidden(Global.noteTableGuidPosition, !Global.isColumnVisible("guid"));
noteTableView.setColumnHidden(Global.noteTableThumbnailPosition, !Global.isColumnVisible("thumbnail"));
- noteTableView.setColumnHidden(Global.noteTableTitlePosition, !Global.isColumnVisible("title"));
+ noteTableView.setColumnHidden(Global.noteTableTitlePosition, !Global.isColumnVisible("title"));
+ noteTableView.setColumnHidden(Global.noteTablePinnedPosition, !Global.isColumnVisible("pinned"));
}
// Title color has changed
@SuppressWarnings("unused")
private void titleColorChanged(Integer color) {
logger.log(logger.HIGH, "Entering NeverNote.titleColorChanged");
+ setNoteDirty();
QColor backgroundColor = new QColor();
QColor foregroundColor = new QColor(QColor.black);
backgroundColor.setRgb(color);
logger.log(logger.HIGH, "Leaving NeverNote.titleColorChanged");
}
// A note has been pinned or unpinned
+ @SuppressWarnings("unused")
private void notePinned() {
logger.log(logger.EXTREME, "Entering NeverNote.notePinned()");
+ setNoteDirty();
for (int j=0; j<selectedNoteGUIDs.size(); j++) {
NoteMetadata meta = listManager.getNoteMetadata().get(selectedNoteGUIDs.get(j));
loadNoteBrowserInformation(newBrowser.getBrowserWindow(), guid, note);
setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false);
newBrowser.windowClosing.connect(this, "externalWindowClosing(String)");
- newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
+ //newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
newBrowser.getBrowserWindow().noteSignal.tagsChanged.connect(this, "externalWindowTagsEdited(String, List)");
newBrowser.contentsChanged.connect(this, "saveNoteExternalBrowser(String, String, Boolean, BrowserWindow)");
newBrowser.getBrowserWindow().blockApplication.connect(this, "blockApplication(BrowserWindow)");
newBrowser.show();
}
- @SuppressWarnings("unused")
- private void externalWindowTitleEdited(String guid, String text) {
- if (guid.equals(currentNoteGuid)) {
- browserWindow.setTitle(text);
- }
- }
@SuppressWarnings({ "rawtypes", "unused" })
private void externalWindowTagsEdited(String guid, List values) {
StringBuffer line = new StringBuffer(100);
//** These functions deal with Note specific things
//***************************************************************
//***************************************************************
- @SuppressWarnings("unused")
private void setNoteDirty() {
logger.log(logger.EXTREME, "Entering NeverNote.setNoteDirty()");
Global.cryptCounter =0;
if (readOnly) {
browserWindow.setReadOnly(true);
- return;
}
if (!reload)
js.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");
js.append("<style type=\"text/css\">.en-crypt-temp { border-collapse:collapse; border-style:solid; border-color:blue; padding:0.0mm 0.0mm 0.0mm 0.0mm; }</style>");
js.append("<style type=\"text/css\">en-hilight { background-color: rgb(255,255,0) }</style>");
- js.append("<style> img { max-width:100%; }</style>");
+ js.append("<style> img { height:auto; width:auto; max-height:auto; max-width:100%; }</style>");
+ if (Global.displayRightToLeft())
+ js.append("<style> body { direction:rtl; }</style>");
js.append("<style type=\"text/css\">en-spell { text-decoration: none; border-bottom: dotted 1px #cc0000; }</style>");
js.append("</head>");
formatter.setNote(note, Global.pdfPreview());
if (conn.getNoteTable().isThumbnailNeeded(guid)) {
thumbnailHTMLReady(guid, js, Global.calculateThumbnailZoom(js.toString()));
}
- if (readOnly || inkNote)
+ if (readOnly || inkNote ||
+ (note.getAttributes() != null && note.getAttributes().getContentClass() != null && note.getAttributes().getContentClass() != ""))
browser.getBrowser().page().setContentEditable(false); // We don't allow editing of ink notes
else
browser.getBrowser().page().setContentEditable(true);
@SuppressWarnings("unused")
private void updateNoteTitle(String guid, String title) {
listManager.setNoteSynchronized(guid, false);
+
+ // We do this manually because if we've edited the note in an
+ // external window we run into the possibility of signal recursion
+ // looping.
+ if (guid.equals(currentNoteGuid)) {
+ browserWindow.titleLabel.blockSignals(true);
+ browserWindow.titleLabel.setText(title);
+ browserWindow.titleLabel.blockSignals(false);
+ }
}
// Signal received that note content has changed. Normally we just need the guid to remove
// it from the cache.
currentNote = conn.getNoteTable().getNote(currentNoteGuid, false, false, false, false, true);
}
listManager.refreshNoteMetadata();
- noteIndexUpdated(false);
+ noteIndexUpdated(true);
noteTableView.selectionModel().blockSignals(true);
scrollToGuid(currentNoteGuid);
noteTableView.selectionModel().blockSignals(false);
conn.getLinkedNotebookTable().expungeNotebook(guid, false);
evernoteSync();
}
-/* if (syncDialog.convertToLocal.isChecked()) {
- conn.getNotebookTable().convertFromSharedNotebook(notebookGuid, true);
- conn.getLinkedNotebookTable().expungeNotebook(guid, false);
- evernoteSync();
- }
- if (syncDialog.convertToShared.isChecked()) {
- conn.getLinkedNotebookTable().expungeNotebook(guid, false);
- conn.getNotebookTable().convertFromSharedNotebook(notebookGuid, false);
- evernoteSync();
- } */
refreshLists();
return;
}
fd.setFileMode(FileMode.ExistingFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Import Notes"));
- fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptOpen);
if (saveLastPath == null || saveLastPath.equals(""))
fd.setDirectory(System.getProperty("user.home"));
if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals(""))
selectedNoteGUIDs.add(currentNoteGuid);
- ImportData noteReader = new ImportData(conn, false);
String fileName = fd.selectedFiles().get(0);
// saveLastPath.substring(0,fileName.lastIndexOf("/"));
- if (!fileName.endsWith(".nnex"))
- fileName = fileName +".nnex";
- if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
- noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
- else
- noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
+ if (fileName.endsWith(".nnex")) {
+ ImportData noteReader = new ImportData(conn, false);
+ if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
+ noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
+ else
+ noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
- noteReader.importData(fileName);
+ noteReader.importData(fileName);
- if (noteReader.lastError != 0) {
- setMessage(noteReader.getErrorMessage());
- logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
- waitCursor(false);
- return;
+ if (noteReader.lastError != 0) {
+ setMessage(noteReader.getErrorMessage());
+ logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
+ waitCursor(false);
+ return;
+ }
+ } else {
+ if (fileName.endsWith(".enex")) {
+ ImportEnex noteReader = new ImportEnex(conn, false);
+ if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
+ noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
+ else
+ noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
+
+ waitCursor(false);
+ if (QMessageBox.question(this, tr("Confirmation"),
+ tr("Create new tags from import?"),
+ QMessageBox.StandardButton.Yes,
+ QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
+ noteReader.createNewTags = true;
+ } else
+ noteReader.createNewTags = false;
+ waitCursor(true);
+ noteReader.importData(fileName);
+
+ if (noteReader.lastError != 0) {
+ setMessage(noteReader.getErrorMessage());
+ logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
+ waitCursor(false);
+ return;
+ }
+ }
}
listManager.loadNoteTitleColors();
// importKeepWatcher.addPath(records.get(i).folder.replace('\\', '/'));
for (int i=0; i<records.size(); i++) {
+ logger.log(logger.LOW, "Adding file monitor: " +records.get(i).folder);
if (records.get(i).keep)
importKeepWatcher.addPath(records.get(i).folder);
else
importDeleteWatcher.addPath(records.get(i).folder);
}
+ logger.log(logger.EXTREME, "List of directories being watched (kept)...");
+ List<String> monitorDelete = importKeepWatcher.directories();
+ for (int i=0; i<monitorDelete.size(); i++) {
+ logger.log(logger.EXTREME, monitorDelete.get(i));
+ }
+ logger.log(logger.EXTREME, "<end of list>");
+ logger.log(logger.EXTREME, "List of directories being watched (delete)...");
+ monitorDelete = importDeleteWatcher.directories();
+ for (int i=0; i<monitorDelete.size(); i++) {
+ logger.log(logger.EXTREME, monitorDelete.get(i));
+ }
+ logger.log(logger.EXTREME, "<end of list>");
+
importKeepWatcher.directoryChanged.connect(this, "folderImportKeep(String)");
importDeleteWatcher.directoryChanged.connect(this, "folderImportDelete(String)");
}
}
}
+
+ // Menu folderImport action triggered
public void folderImport() {
List<WatchFolderRecord> recs = conn.getWatchFolderTable().getAll();
WatchFolder dialog = new WatchFolder(recs, listManager.getNotebookIndex());
setupFolderImports();
}
+
public void folderImportKeep(String dirName) throws NoSuchAlgorithmException {
-
+ logger.log(logger.LOW, "Inside folderImportKeep");
String whichOS = System.getProperty("os.name");
if (whichOS.contains("Windows"))
dirName = dirName.replace('/','\\');
String notebook = conn.getWatchFolderTable().getNotebook(dirName);
for (int i=0; i<list.size(); i++){
-
+ logger.log(logger.LOW, "File found: " +list.get(i).fileName());
boolean redundant = false;
// Check if we've already imported this one or if it existed before
for (int j=0; j<importedFiles.size(); j++) {
+ logger.log(logger.LOW, "redundant file list: " +list.get(i).absoluteFilePath());
if (importedFiles.get(j).equals(list.get(i).absoluteFilePath()))
redundant = true;
}
+ logger.log(logger.LOW, "Checking if redundant: " +redundant);
if (!redundant) {
importer.setFileInfo(list.get(i));
importer.setFileName(list.get(i).absoluteFilePath());
+ logger.log(logger.LOW, "File importing is a file: " +list.get(i).isFile());
+ logger.log(logger.LOW, "File importing is a valid: " +importer.isValidType());
if (list.get(i).isFile() && importer.isValidType()) {
if (!importer.importFile()) {
// If we can't get to the file, it is probably locked. We'll try again later.
logger.log(logger.LOW, "Unable to save externally edited file. Saving for later.");
importFilesKeep.add(list.get(i).absoluteFilePath());
- return;
+ } else {
+
+ Note newNote = importer.getNote();
+ newNote.setNotebookGuid(notebook);
+ newNote.setTitle(dir.at(i));
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setDirty(true);
+ metadata.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metadata);
+ conn.getNoteTable().addNote(newNote, true);
+ noteTableView.insertRow(newNote, metadata, true, -1);
+ listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
+ listManager.countNotebookResults(listManager.getNoteIndex());
+ importedFiles.add(list.get(i).absoluteFilePath());
}
-
- Note newNote = importer.getNote();
- newNote.setNotebookGuid(notebook);
- newNote.setTitle(dir.at(i));
- NoteMetadata metadata = new NoteMetadata();
- metadata.setDirty(true);
- metadata.setGuid(newNote.getGuid());
- listManager.addNote(newNote, metadata);
- conn.getNoteTable().addNote(newNote, true);
- noteTableView.insertRow(newNote, metadata, true, -1);
- listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
- listManager.countNotebookResults(listManager.getNoteIndex());
- importedFiles.add(list.get(i).absoluteFilePath());
}
}
}
}
public void folderImportDelete(String dirName) {
-
+ logger.log(logger.LOW, "Inside folderImportDelete");
String whichOS = System.getProperty("os.name");
if (whichOS.contains("Windows"))
dirName = dirName.replace('/','\\');
String notebook = conn.getWatchFolderTable().getNotebook(dirName);
for (int i=0; i<list.size(); i++){
+ logger.log(logger.LOW, "File found: " +list.get(i).fileName());
importer.setFileInfo(list.get(i));
importer.setFileName(list.get(i).absoluteFilePath());
+ logger.log(logger.LOW, "File importing is a file: " +list.get(i).isFile());
+ logger.log(logger.LOW, "File importing is a valid: " +importer.isValidType());
if (list.get(i).isFile() && importer.isValidType()) {
if (!importer.importFile()) {
// If we can't get to the file, it is probably locked. We'll try again later.
logger.log(logger.LOW, "Unable to save externally edited file. Saving for later.");
importFilesKeep.add(list.get(i).absoluteFilePath());
- return;
- }
+ } else {
- Note newNote = importer.getNote();
- newNote.setNotebookGuid(notebook);
- newNote.setTitle(dir.at(i));
- NoteMetadata metadata = new NoteMetadata();
- metadata.setDirty(true);
- metadata.setGuid(newNote.getGuid());
- listManager.addNote(newNote, metadata);
- conn.getNoteTable().addNote(newNote, true);
- noteTableView.insertRow(newNote, metadata, true, -1);
- listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
- listManager.countNotebookResults(listManager.getNoteIndex());
- dir.remove(dir.at(i));
+ Note newNote = importer.getNote();
+ newNote.setNotebookGuid(notebook);
+ newNote.setTitle(dir.at(i));
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setDirty(true);
+ metadata.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metadata);
+ conn.getNoteTable().addNote(newNote, true);
+ noteTableView.insertRow(newNote, metadata, true, -1);
+ listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
+ listManager.countNotebookResults(listManager.getNoteIndex());
+ dir.remove(dir.at(i));
+ }
}
}
}
@Override
public void changeEvent(QEvent e) {
if (e.type() == QEvent.Type.WindowStateChange) {
- if (isMinimized() && Global.showTrayIcon()) {
- e.accept();
- QTimer.singleShot(10, this, "hide()");
- return;
+ if (QSystemTrayIcon.isSystemTrayAvailable()) {
+ if (isMinimized() && (Global.showTrayIcon() || Global.showTrayIcon())) {
+ e.accept();
+ QTimer.singleShot(10, this, "hide()");
+ return;
+ }
+ if (isMaximized())
+ windowMaximized = true;
+ else
+ windowMaximized = false;
}
- if (isMaximized())
- windowMaximized = true;
- else
- windowMaximized = false;
}
}