card 1.16.3 → 1.16.4

data/mod/03_machines/lib/javascript/wagn.js.coffee

@@ -151,12 +151,15 @@ jQuery.fn.extend {
 
 setInterval (-> $('.card-form').setContentFieldsFromMap()), 20000
 
+
+
 $(window).ready ->
   $.ajaxSetup cache: false
 
   setTimeout (-> wagn.initializeEditors $('body')), 10
   #  dislike the timeout, but without this forms with multiple TinyMCE editors were failing to load properly
 
+
   $('body').on 'ajax:success', '.slotter', (event, data, c, d) ->
     unless event.slotSuccessful
       slot_top_pos = $(this).slot().offset().top

data/mod/03_machines/lib/javascript/wagn_mod.js.coffee

@@ -22,7 +22,7 @@ $.extend wagn,
     '.ace-editor-textarea'   : -> wagn.initAce $(this)
     '.tinymce-textarea'      : -> wagn.initTinyMCE @[0].id
     '.pointer-list-editor'   : -> @sortable({handle: '.handle', cancel: ''}); wagn.initPointerList @find('input')
-    '.file-upload'           : -> @fileupload( add: wagn.chooseFile )#, forceIframeTransport: true )
+    '.file-upload'           : -> @fileupload( dataType: 'html', done: wagn.doneFile, add: wagn.chooseFile, progressall: wagn.progressallFile )#, forceIframeTransport: true )
     '.etherpad-textarea'     : -> $(this).closest('form').find('.edit-submit-button').attr('class', 'etherpad-submit-button')
   }
 
@@ -105,23 +105,23 @@ $.extend wagn,
 #    initfunc()
 
   chooseFile: (e, data) ->
-    file = data.files[0]
-  #  $(this).fileupload '_normalizeFile', 0, file # so file objects have same fields in all browsers
-    $(this).closest('form').data 'file-data', data # stores data on form for use at submission time
-
-    if name_field = $(this).slot().find( '.name-editor input' )
-      # populates card name if blank
-      if name_field[0] and name_field.val() == ''
-        name_field.val file.name.replace( /\..*$/, '' ).replace( /_/g, ' ')
-
+    data.form.find('button[type=submit]').attr('disabled',true)
     editor = $(this).closest '.card-editor'
+    $('#progress').show()
+    editor.append '<input type="hidden" class="extra_upload_param" value="true" name="attachment_upload">'
+    editor.append '<input type="hidden" class="extra_upload_param" value="preview_editor" name="view">'
+    data.submit()
     editor.find('.choose-file').hide()
-    editor.find('.chosen-filename').text file.name
-    editor.find('.chosen-file').show()
+    editor.find('.extra_upload_param').remove()
 
-    contentFieldName = this.name.replace( /attach\]$/, 'content]' )
-    editor.append '<input type="hidden" value="CHOSEN" class="upload-card-content" name="' + contentFieldName + '">'
-    # we add and remove the contentField to insure that nothing is added / updated when nothing is chosen.
+  progressallFile: (e, data) ->
+    progress = parseInt(data.loaded / data.total * 100, 10)
+    $('#progress .progress-bar').css('width', progress + '%')
+
+  doneFile: (e, data) ->
+    editor = $(this).closest '.card-editor'
+    editor.find('.chosen-file').replaceWith data.result
+    data.form.find('button[type=submit]').attr('disabled',false)
 
   isTouchDevice: ->
     if 'ontouchstart' of window or window.DocumentTouch and document instanceof DocumentTouch
@@ -141,10 +141,12 @@ $(window).ready ->
 
   $('body').on 'click', '.cancel-upload', ->
     editor = $(this).closest '.card-editor'
-    editor.find('.chosen-file').hide()
     editor.find('.choose-file').show()
-    $(this).closest('form').data 'file-data', null
-    contentField = editor.find( '.upload-card-content' ).remove()
+    editor.find('.chosen-file').empty()
+    editor.find('.progress').show()
+    editor.find('#progress .progress-bar').css('width', '0%')
+    editor.find('#progress').hide()
+
 
   #navbox mod
   $('.navbox').autocomplete {

data/mod/03_machines/lib/stylesheets/style_cards.scss

@@ -206,6 +206,26 @@ Choosing (b) will mean your CSS will not be affected by automated updates.
   }
 }
 
+/* -- file upload -- */
+.fileupload-buttonbar .btn, .fileupload-buttonbar .toggle {
+  margin-bottom: 5px;
+}
+.fileinput-button {
+  position: relative;
+  overflow: hidden;
+  display: inline-block;
+}
+.fileinput-button input {
+    position: absolute;
+    top: 0;
+    right: 0;
+    margin: 0;
+    opacity: 0;
+    -ms-filter: 'alpha(opacity=0)';
+    font-size: 200px;
+    direction: ltr;
+    cursor: pointer;
+}
 
 
 /* -- template-editor (editing template rule inclusions inline) -- */
@@ -606,9 +626,16 @@ $act-gray:  #b7b7b7;
 .diff-red {
   text-decoration: line-through;
   color: $diff-red;
+  img {
+    border: 2px solid $diff-red;
+  }
 }
 .diff-green {
-    color: $diff-green;
+  color: $diff-green;
+  img {
+    margin: 0px 4px 0px 4px;
+    border: 2px solid $diff-green;
+  }
 }
 .diff-invisible {
   color: $action-white;

data/mod/05_email/set/all/notify.rb

@@ -63,7 +63,7 @@ def followable?
 end
 
 def notable_change?
-  !supercard && current_act && Card::Auth.current_id != WagnBotID && followable?
+  !silent_change && !supercard && current_act && Card::Auth.current_id != WagnBotID && followable?
 end
 
 event :notify_followers_after_save, :after=>:subsequent, :on=>:save, :when=>proc{ |ca| ca.notable_change? } do

data/mod/05_standard/lib/carrier_wave/cardmount.rb

@@ -18,9 +18,10 @@ module CarrierWave
       super
 
       class_eval <<-RUBY, __FILE__, __LINE__+1
-        event :store_#{column}_event, :on=>:save, :before=>:store do
+        event :store_#{column}_event, :on=>:save, :after=>:store do
           store_#{column}!
         end
+
         event :remove_#{column}_event, :on =>:delete, :after=>:stored do
           remove_#{column}!
         end
@@ -35,6 +36,14 @@ module CarrierWave
           #{column}
         end
 
+        def store_attachment!
+          store_#{column}!
+        end
+
+        def attachment_name
+          "#{column}".to_sym
+        end
+
         def read_uploader *args
           read_attribute *args
         end
@@ -42,14 +51,16 @@ module CarrierWave
           write_attribute *args
         end
         def #{column}=(new_file)
-          column = _mounter(:#{column}).serialization_column
-          send(:"\#{column}_will_change!")
+          send(:"#{column}_will_change!")
+          db_column = _mounter(:#{column}).serialization_column
+          send(:"\#{db_column}_will_change!")
           super
         end
 
         def remote_#{column}_url=(url)
-          column = _mounter(:#{column}).serialization_column
-          send(:"\#{column}_will_change!")
+          send(:"#{column}_will_change!")
+          db_column = _mounter(:#{column}).serialization_column
+          send(:"\#{db_column}_will_change!")
           super
         end
 
@@ -59,6 +70,14 @@ module CarrierWave
           _mounter(:#{column}).write_identifier
         end
 
+        def #{column}_will_change!
+          @#{column}_changed = true
+        end
+
+        def #{column}_changed?
+          @#{column}_changed
+        end
+
         def serializable_hash(options=nil)
           hash = {}
 
@@ -76,4 +95,4 @@ module CarrierWave
     end
 
   end
-end
+end

data/mod/05_standard/lib/file_uploader.rb

@@ -66,13 +66,18 @@ class FileUploader < CarrierWave::Uploader::Base
     end.downcase
   end
 
-  # the identifier gets stored in the card's db_content field
-  def db_content(args={})
+  # generate identifier that gets stored in the card's db_content field
+  def db_content opts={}
+    @mod = opts[:mod] || model.load_from_mod  # don't use mod_file? here
+    # mod_file? looks at the identifier in the db
+    # to figure out whether it's a mod file
+    # so it wouldn't be possible to turn a mod file card into a regular file card
+
     basename =
-      if (args[:mod])
-        "#{args[:mod]}#{extension}"
+      if @mod
+        "#{@mod}#{extension}"
       else
-        filename
+        "#{action_id}#{extension}"
       end
     "%s/%s" % [file_dir, basename]
   end
@@ -82,35 +87,46 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 
   def file_dir
-    if (mod = mod_file?)
+    if mod_file?
       ":#{model.codename}"
     elsif model.id
       "~#{model.id}"
     else
-      "#{model.key}" # FIXME what if the card has not a name yet?
+      "~#{model.upload_cache_card.id}"
     end
   end
 
   def cache_dir
-    Cardio.paths['files'].existent.first + '/tmp'
+    Cardio.paths['files'].existent.first + '/cache'
   end
 
-  # Carrierwave usually store the filename as identifier in the database
+  # Carrierwave usually stores the filename as identifier in the database
   # and retrieve_from_store! calls store_path with the identifier from the db
   # In our case the first part of our identifier is not part of the path
-  # but we construct the filename from db data. So we don't need the identifier.
+  # but we can construct the filename from db data. So we don't need the identifier.
   # We can just call store_path always with the filename
   def store_path(for_file=filename) #
     super(filename)
   end
 
+  def tmp_path
+    if !Dir.exists? model.tmp_store_dir
+      Dir.mkdir model.tmp_store_dir
+    end
+    File.join model.tmp_store_dir, filename
+  end
+
+  def create_versions? new_file
+    model.create_versions?
+  end
+
   # paperclip compatibility used in type/file.rb#core (base format)
   def path(version=nil)
     version ? versions[version].path : super()
   end
 
   def original_filename
-    @original_filename || model.selected_action.comment
+    @original_filename || (model.selected_action && model.selected_action.comment)
   end
 
   def store_dir

data/mod/05_standard/lib/image_uploader.rb

@@ -7,19 +7,22 @@ class ImageUploader < FileUploader
     (version && version != :original) ? versions[version].path : super()
   end
 
-  version :icon do #, :from_version=>:small do
+  version :icon, :if=>:create_versions?, :from_version=>:small do
     process :resize_and_pad => [16,16]
   end
-  version :small do #, :from_version=>:medium do
+  version :small, :if=>:create_versions?, :from_version=>:medium do
     process :resize_to_fit => [75,75]
   end
-  version :medium do
+  version :medium, :if=>:create_versions? do
     process :resize_to_fit => [200,200]
   end
-  version :large do
+  version :large, :if=>:create_versions? do
     process :resize_to_fit => [500,500]
   end
 
+  def identifier
+    full_filename(super())
+  end
   # add 'original' if no version is given
   def full_filename(for_file)
     name = super(for_file)

data/mod/05_standard/set/abstract/attachment.rb

@@ -1,32 +1,85 @@
 require 'carrier_wave/cardmount'
+
 def self.included host_class
   host_class.extend CarrierWave::CardMount
 end
 
+event :select_file_revision, :after=>:select_action do
+  attachment.retrieve_from_store!(attachment.identifier)
+end
 
-event :write_identifier, :after=>:assign_action do
-  self.content = attachment.db_content
+event :determine_store_place, :before=>:prepare, :on=>:update do
+  @store_place = load_from_mod || :deck
 end
 
-event :save_original_filename, :before=>:finalize_action do
-  if @current_action
-    @current_action.update_attributes! :comment=>original_filename
+event :upload_attachment, :before=>:validate_name, :on=>:save, :when=>proc { |c| c.preliminary_upload? } do
+  save_original_filename  # save original filename as comment in action
+  write_identifier        # set db_content (needs original filename to determine extension)
+  store_attachment!
+  finalize_action         # create Card::Change entry for db_content
+  @current_action.update_attributes! :draft => true, :card_id => (new_card? ? upload_cache_card.id : id)
+
+  success << {
+    :target => (new_card? ? upload_cache_card : '_self'),
+    :type=> type_name,
+    :view => 'preview_editor',
+    :rev_id => current_action.id
+  }
+  abort :success
+end
+
+event :assign_attachment_on_create, :after=>:prepare, :on=>:create do
+  if save_preliminary_upload? && (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
+    upload_cache_card.selected_action_id = action.id
+    upload_cache_card.select_file_revision
+    assign_attachment upload_cache_card.attachment.file, action.comment
+    action.delete # TODO: delete files too
   end
 end
 
-event :move_file_to_store_dir, :after=>:store, :on=>:create do
-  if ::File.exist? tmp_store_dir
-    if ::File.exist? store_dir
-      FileUtils.rm_rf store_dir
-    end
-    FileUtils.mv tmp_store_dir, store_dir
+event :assign_attachment_on_update, :after=>:prepare, :on=>:update do
+  if save_preliminary_upload? && (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
+    uploaded_file =
+       with_selected_action_id(action.id) do
+         attachment.file
+       end
+    assign_attachment uploaded_file, action.comment
+    action.delete
   end
-  if !(content =~ /^[:~]/)
-    update_column(:db_content,attachment.db_content)
-    expire
+end
+
+def assign_attachment file, original_filename
+  send "#{attachment_name}=", file
+  write_identifier
+  @current_action.update_attributes! :comment=>original_filename
+end
+
+# we need a card id for the path so we have to update db_content when we got an id
+event :correct_identifier, :after=>:store, :on=>:create do
+  update_column(:db_content,attachment.db_content(:mod=>load_from_mod))
+  expire
+end
+
+
+event :save_original_filename, :after=>:validate_name, :when => proc {|c| !c.preliminary_upload? && !c.save_preliminary_upload? && c.attachment_changed?} do
+  if @current_action
+    @current_action.update_attributes! :comment=>original_filename
   end
 end
 
+event :write_identifier, :after=>:save_original_filename do
+  self.content = attachment.db_content(:mod=>load_from_mod)
+end
+
+
+def upload_cache_card
+  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym ]
+end
+
+def tmp_store_dir action_id=nil
+  "#{ Card.paths['files'].existent.first }/#{upload_cache_card.id}"
+end
+
 def item_names(args={})  # needed for flexmail attachments.  hacky.
   [self.cardname]
 end
@@ -35,6 +88,60 @@ def original_filename
   attachment.original_filename
 end
 
+def preliminary_upload?
+  Card::Env && Card::Env.params[:attachment_upload]
+end
+
+def save_preliminary_upload?
+  Card::Env.params[:cached_upload].present?
+end
+
+def attachment_changed?
+  send "#{attachment_name}_changed?"
+end
+
+def create_versions?
+  true
+end
+
+def store_place
+  @store_place ||= mod_file? || :deck
+end
+
+def load_from_mod= value
+  @mod = value
+end
+
+def load_from_mod
+  @mod
+end
+
+def store_dir
+  if (store_place == :deck)
+    if id
+      "#{ Card.paths['files'].existent.first }/#{id}"
+    else
+      tmp_store_dir
+    end
+  else
+    "#{ Cardio.gem_root}/mod/#{store_place}/file/#{codename}"
+  end
+end
+
+def mod_file?
+  # when db_content was changed assume that it's no longer a mod file
+  if @store_place != :deck && !db_content_changed? && content.present?
+    case content
+    when /^:[^\/]+\/([^.]+)/ ; $1     # current mod_file format
+    when /^\~/               ; false  # current id file format
+    else
+      if lines = content.split("\n") and lines.size == 4 # old format, still used in card_changes.
+        lines.last
+      end
+    end
+  end
+end
+
 
 def assign_set_specific_attributes
   if @set_specific && @set_specific.present?
@@ -43,6 +150,17 @@ def assign_set_specific_attributes
   super
 end
 
+def clear_upload_tmp_dir
+  Dir.entries(tmp_store_dir).each do |filename|
+    if filename =~/^\d+/
+      path = File.join(tmp_store_dir, filename )
+      older_than_five_days = ( DateTime.now - File.ctime(path) > 432000)
+      if older_than_five_days
+        FileUtils.rm path
+      end
+    end
+  end
+end
 
 def symlink_to(prior_action_id) # create filesystem links to files from prior action
   if prior_action_id != last_action_id