Fixes syncing.

Reintroduces environment variable for God, makes all methods public in Resource model (Review) and refines update_sequence_number check.
joegattnet · May 25, 2013 · f0b8afd · f0b8afd
1 parent 0b91ba7
commit f0b8afd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/models/evernote_note.rb b/app/models/evernote_note.rb
@@ -74,7 +74,7 @@ def syncdown_one
         logger.info I18n.t('notes.sync.rejected.ignore', error_details)
         undirtify
 
-      elsif cloud_note_updated?(cloud_note_metadata.updated)
+      elsif cloud_note_not_updated?(cloud_note_metadata.updateSequenceNum)
         logger.info  I18n.t('notes.sync.rejected.not_latest', error_details)
         undirtify
 
@@ -125,8 +125,8 @@ def cloud_note_ignorable?(cloud_note_tags)
     (!(Settings.evernote.instructions.ignore & cloud_note_tags).empty?)
   end
 
-  def cloud_note_updated?(note_metadata_updated)
-    (note && note.update_sequence_number >= note_data.updateSequenceNum)
+  def cloud_note_not_updated?(cloud_note_data_update_sequence_number)
+    (note && update_sequence_number >= cloud_note_data_update_sequence_number)
   end
 
   def update_with_data_from_cloud(note_data)

diff --git a/app/models/resource.rb b/app/models/resource.rb
@@ -42,7 +42,7 @@ def blank_location
     File.join(Rails.root, 'public', 'resources', 'cut', "blank.#{ file_ext }")
   end
 
-  private
+  # private
 
   def make_local_file_name
     if mime && mime !~ /image/

diff --git a/script/daemons/sync_all.rb b/script/daemons/sync_all.rb
@@ -1,4 +1,4 @@
-#require ENV["RAILS_ENV_PATH"]
+require ENV["RAILS_ENV_PATH"]
 require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'config', 'environment'))
 require 'rubygems'