OSDN Git Service

Fix architecture check in upgrade notice.
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / NeverNote.java
index d754850..5f98c75 100644 (file)
@@ -128,6 +128,9 @@ import com.trolltech.qt.gui.QTableWidgetItem;
 import com.trolltech.qt.gui.QTextEdit;
 import com.trolltech.qt.gui.QToolBar;
 import com.trolltech.qt.gui.QTreeWidgetItem;
+import com.trolltech.qt.network.QNetworkAccessManager;
+import com.trolltech.qt.network.QNetworkReply;
+import com.trolltech.qt.network.QNetworkRequest;
 import com.trolltech.qt.webkit.QWebPage.WebAction;
 import com.trolltech.qt.webkit.QWebSettings;
 
@@ -139,6 +142,7 @@ import cx.fbn.nevernote.dialog.DBEncryptDialog;
 import cx.fbn.nevernote.dialog.DatabaseLoginDialog;
 import cx.fbn.nevernote.dialog.DatabaseStatus;
 import cx.fbn.nevernote.dialog.FindDialog;
+import cx.fbn.nevernote.dialog.IgnoreSync;
 import cx.fbn.nevernote.dialog.LoginDialog;
 import cx.fbn.nevernote.dialog.NotebookArchive;
 import cx.fbn.nevernote.dialog.NotebookEdit;
@@ -150,6 +154,7 @@ import cx.fbn.nevernote.dialog.ShareNotebook;
 import cx.fbn.nevernote.dialog.StackNotebook;
 import cx.fbn.nevernote.dialog.TagEdit;
 import cx.fbn.nevernote.dialog.ThumbnailViewer;
+import cx.fbn.nevernote.dialog.UpgradeAvailableDialog;
 import cx.fbn.nevernote.dialog.WatchFolder;
 import cx.fbn.nevernote.filters.FilterEditorNotebooks;
 import cx.fbn.nevernote.filters.FilterEditorTags;
@@ -195,6 +200,7 @@ public class NeverNote extends QMainWindow{
        QAction                                 trayExitAction;                         // Exit the application
        QAction                                 trayShowAction;                         // toggle the show/hide action          
        QAction                                 trayAddNoteAction;                      // Add a note from the system tray
+       QNetworkAccessManager   versionChecker;                         // Used when checking for new versions
        
     NotebookTreeWidget                 notebookTree;                           // List of notebooks
     AttributeTreeWidget                attributeTree;                          // List of note attributes
@@ -690,10 +696,10 @@ public class NeverNote extends QMainWindow{
        int sortCol = Global.getSortColumn();
                int sortOrder = Global.getSortOrder();
                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
-
+               if (Global.checkVersionUpgrade())
+                       checkForUpdates();
        }
-
-       
+               
        // Main entry point
        public static void main(String[] args) {
                log.setLevel(Level.FATAL);
@@ -1122,8 +1128,15 @@ public class NeverNote extends QMainWindow{
        }    
        // Load the style sheet
        private void loadStyleSheet() {
-               String fileName = Global.getFileManager().getQssDirPath("default.qss");
+               String fileName = Global.getFileManager().getQssDirPathUser("default.qss");
+               fileName = Global.getFileManager().getQssDirPath("default.qss");
                QFile file = new QFile(fileName);
+               
+               // If a user default.qss doesn't exist, we use the one shipped with NeverNote
+               if (!file.exists()) {
+                       fileName = Global.getFileManager().getQssDirPath("default.qss");
+                       file = new QFile(fileName);
+               }
                file.open(OpenModeFlag.ReadOnly);
                String styleSheet = file.readAll().toString();
                file.close();
@@ -1695,7 +1708,7 @@ public class NeverNote extends QMainWindow{
                        if (!found)
                                nbooks.add(listManager.getNotebookIndex().get(i));
                }
-               waitCursor(false);
+               
                FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger);
                List<Notebook> filteredBooks = notebookFilter.getValidNotebooks(currentNote, listManager.getNotebookIndex());
                browserWindow.setNotebookList(filteredBooks);
@@ -1704,6 +1717,8 @@ public class NeverNote extends QMainWindow{
                Iterator<String> set = externalWindows.keySet().iterator();
                while(set.hasNext())
                        externalWindows.get(set.next()).getBrowserWindow().setNotebookList(filteredBooks);
+               
+               waitCursor(false);
        }
        // Change the notebook's icon
        @SuppressWarnings("unused")
@@ -2487,7 +2502,74 @@ public class NeverNote extends QMainWindow{
                Global.saveWindowVisible("leftPanel", hidden);
                
        }
+       public void checkForUpdates() {
+               // Send off thread to check for a new version
+               versionChecker = new QNetworkAccessManager(this);
+               versionChecker.finished.connect(this, "upgradeFileRead(QNetworkReply)");
+               QNetworkRequest request = new QNetworkRequest();
+               request.setUrl(new QUrl(Global.getUpdatesAvailableUrl()));
+               versionChecker.get(request);
+       }
+       @SuppressWarnings("unused")
+       private void upgradeFileRead(QNetworkReply reply) {
+               if (!reply.isReadable())
+                       return;
+               
+               String winVersion = Global.version;
+               String osxVersion = Global.version;
+               String linuxVersion = Global.version;
+               String linux64Version = Global.version;
+               String version = Global.version;
+               
+               // Determine the versions available
+               QByteArray data = reply.readLine();
+               while (data != null && !reply.atEnd()) {
+                       String line = data.toString();
+                       String lineVersion;
+                       if (line.contains(":")) 
+                               lineVersion = line.substring(line.indexOf(":")+1).replace(" ", "").replace("\n", "");
+                       else
+                               lineVersion = "";
+                       if (line.toLowerCase().contains("windows")) 
+                               winVersion = lineVersion;
+                       else if (line.toLowerCase().contains("os-x")) 
+                               osxVersion = lineVersion;
+                       else if (line.toLowerCase().contains("linux amd64")) 
+                               linux64Version = lineVersion;
+                       else if (line.toLowerCase().contains("linux i386")) 
+                               linuxVersion = lineVersion;
+                       else if (line.toLowerCase().contains("default")) 
+                               version = lineVersion;
                        
+                       // Read the next line
+                       data = reply.readLine();
+               }
+               
+               // Now we need to determine what system we are on.
+               if (System.getProperty("os.name").toLowerCase().contains("windows"))
+                       version = winVersion;
+               if (System.getProperty("os.name").toLowerCase().contains("mac os"))
+                       version = osxVersion;
+               if (System.getProperty("os.name").toLowerCase().contains("Linux")) {
+                       if (System.getProperty("os.arch").contains("amd64") ||
+                               System.getProperty("os.arch").contains("x86_64"))
+                                       version = linux64Version;
+                       else
+                               version = linuxVersion;
+               }
+               
+               
+               if (Global.version.equals(version))
+                       return;
+               
+               UpgradeAvailableDialog dialog = new UpgradeAvailableDialog();
+               dialog.exec();
+               if (dialog.remindMe())
+                       Global.setCheckVersionUpgrade(true);
+               else
+                       Global.setCheckVersionUpgrade(false);
+       }
+               
        
     //***************************************************************
     //***************************************************************
@@ -3001,6 +3083,7 @@ public class NeverNote extends QMainWindow{
                menuBar.connectAction.setText(tr("Connect"));
                menuBar.connectAction.setToolTip(tr("Connect to Evernote"));
                menuBar.synchronizeAction.setEnabled(false);
+               Global.isConnected = false;
                synchronizeAnimationTimer.stop();
                return;
        }
@@ -4654,9 +4737,11 @@ public class NeverNote extends QMainWindow{
     private void setupOnlineMenu() {
        if (!Global.isConnected) {
                menuBar.noteOnlineHistoryAction.setEnabled(false);
+               menuBar.selectiveSyncAction.setEnabled(false);
                return;
        } else {
                menuBar.noteOnlineHistoryAction.setEnabled(true);
+               menuBar.selectiveSyncAction.setEnabled(true);
        }
     }
     @SuppressWarnings("unused")
@@ -4788,7 +4873,138 @@ public class NeverNote extends QMainWindow{
        refreshEvernoteNote(true);
        setMessage(tr("Note has been restored."));
     }
-    
+    @SuppressWarnings("unused")
+       private void setupSelectiveSync() {
+       
+       // Get a list of valid notebooks
+       List<Notebook> notebooks = null; 
+       List<Tag> tags = null;
+       List<LinkedNotebook> linkedNotebooks = null;
+       try {
+                       notebooks = syncRunner.noteStore.listNotebooks(syncRunner.authToken);
+                       tags = syncRunner.noteStore.listTags(syncRunner.authToken);
+                       linkedNotebooks = syncRunner.noteStore.listLinkedNotebooks(syncRunner.authToken);
+               } catch (EDAMUserException e) {
+                       setMessage("EDAMUserException: " +e.getMessage());
+                       return;
+               } catch (EDAMSystemException e) {
+                       setMessage("EDAMSystemException: " +e.getMessage());
+                       return;
+               } catch (TException e) {
+                       setMessage("EDAMTransactionException: " +e.getMessage());
+                       return;
+               } catch (EDAMNotFoundException e) {
+                       setMessage("EDAMNotFoundException: " +e.getMessage());
+                       return;
+               }
+       
+               // Split up notebooks into synchronized & non-synchronized
+       List<Notebook> ignoredBooks = new ArrayList<Notebook>();
+       List<String> dbIgnoredNotebooks = conn.getSyncTable().getIgnoreRecords("NOTEBOOK");
+       
+       for (int i=notebooks.size()-1; i>=0; i--) {
+               for (int j=0; j<dbIgnoredNotebooks.size(); j++) {
+                       if (notebooks.get(i).getGuid().equalsIgnoreCase(dbIgnoredNotebooks.get(j))) {
+                               ignoredBooks.add(notebooks.get(i));
+                               j=dbIgnoredNotebooks.size();
+                       }
+               }
+       }
+       
+       // split up tags into synchronized & non-synchronized
+       List<Tag> ignoredTags = new ArrayList<Tag>();
+       List<String> dbIgnoredTags = conn.getSyncTable().getIgnoreRecords("TAG");
+       
+       for (int i=tags.size()-1; i>=0; i--) {
+               for (int j=0; j<dbIgnoredTags.size(); j++) {
+                       if (tags.get(i).getGuid().equalsIgnoreCase(dbIgnoredTags.get(j))) {
+                               ignoredTags.add(tags.get(i));
+                               j=dbIgnoredTags.size();
+                       }
+               }
+       }
+       
+       // split up linked notebooks into synchronized & non-synchronized
+       List<LinkedNotebook> ignoredLinkedNotebooks = new ArrayList<LinkedNotebook>();
+       List<String> dbIgnoredLinkedNotebooks = conn.getSyncTable().getIgnoreRecords("LINKEDNOTEBOOK");
+       for (int i=linkedNotebooks.size()-1; i>=0; i--) {
+               String notebookGuid = linkedNotebooks.get(i).getGuid();
+               for (int j=0; j<dbIgnoredLinkedNotebooks.size(); j++) {
+                       if (notebookGuid.equalsIgnoreCase(dbIgnoredLinkedNotebooks.get(j))) {
+                               ignoredLinkedNotebooks.add(linkedNotebooks.get(i));
+                               j=dbIgnoredLinkedNotebooks.size();
+                       }
+               }
+       }
+       
+               IgnoreSync ignore = new IgnoreSync(notebooks, ignoredBooks, tags, ignoredTags, linkedNotebooks, ignoredLinkedNotebooks);
+               ignore.exec();
+               if (!ignore.okClicked())
+                       return;
+               
+               waitCursor(true);
+               
+               // Clear out old notebooks & add  the new ones
+               List<String> oldIgnoreNotebooks = conn.getSyncTable().getIgnoreRecords("NOTEBOOK");
+               for (int i=0; i<oldIgnoreNotebooks.size(); i++) {
+                       conn.getSyncTable().deleteRecord("IGNORENOTEBOOK-"+oldIgnoreNotebooks.get(i));
+               }
+               
+               List<String> newNotebooks = new ArrayList<String>();
+               for (int i=ignore.getIgnoredBookList().count()-1; i>=0; i--) {
+                       String text = ignore.getIgnoredBookList().takeItem(i).text();
+                       for (int j=0; j<notebooks.size(); j++) {
+                               if (notebooks.get(j).getName().equalsIgnoreCase(text)) {
+                                       Notebook n = notebooks.get(j);
+                                       conn.getSyncTable().addRecord("IGNORENOTEBOOK-"+n.getGuid(), n.getGuid());
+                                       j=notebooks.size();
+                                       newNotebooks.add(n.getGuid());
+                               }
+                       }
+               }
+               
+               // Clear out old tags & add new ones
+               List<String> oldIgnoreTags = conn.getSyncTable().getIgnoreRecords("TAG");
+               for (int i=0; i<oldIgnoreTags.size(); i++) {
+                       conn.getSyncTable().deleteRecord("IGNORETAG-"+oldIgnoreTags.get(i));
+               }
+               
+               List<String> newTags = new ArrayList<String>();
+               for (int i=ignore.getIgnoredTagList().count()-1; i>=0; i--) {
+                       String text = ignore.getIgnoredTagList().takeItem(i).text();
+                       for (int j=0; j<tags.size(); j++) {
+                               if (tags.get(j).getName().equalsIgnoreCase(text)) {
+                                       Tag t = tags.get(j);
+                                       conn.getSyncTable().addRecord("IGNORETAG-"+t.getGuid(), t.getGuid());
+                                       newTags.add(t.getGuid());
+                                       j=tags.size();
+                               }
+                       }
+               }
+               
+               // Clear out old tags & add new ones
+               List<String> oldIgnoreLinkedNotebooks = conn.getSyncTable().getIgnoreRecords("LINKEDNOTEBOOK");
+               for (int i=0; i<oldIgnoreLinkedNotebooks.size(); i++) {
+                       conn.getSyncTable().deleteRecord("IGNORELINKEDNOTEBOOK-"+oldIgnoreLinkedNotebooks.get(i));
+               }
+               
+               List<String> newLinked = new ArrayList<String>();
+               for (int i=ignore.getIgnoredLinkedNotebookList().count()-1; i>=0; i--) {
+                       String text = ignore.getIgnoredLinkedNotebookList().takeItem(i).text();
+                       for (int j=0; j<linkedNotebooks.size(); j++) {
+                               if (linkedNotebooks.get(j).getShareName().equalsIgnoreCase(text)) {
+                                       LinkedNotebook t = linkedNotebooks.get(j);
+                                       conn.getSyncTable().addRecord("IGNORELINKEDNOTEBOOK-"+t.getGuid(), t.getGuid());
+                                       newLinked.add(t.getGuid());
+                                       j=linkedNotebooks.size();
+                               }
+                       }
+               }
+               
+               conn.getNoteTable().expungeIgnoreSynchronizedNotes(newNotebooks, newTags, newLinked);
+               waitCursor(false);
+               refreshLists();
+    }
     
     
        //**********************************************************