moodle2cc 0.2.35 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6deb93f985307e6ecc8e93ff19940ec9b53e45b6
-  data.tar.gz: 93dade76220dc4af4bb462a4fdbba7e02a4cd004
+  metadata.gz: 6ac44925322ecddaaf7cc19115d327c63f9e0234
+  data.tar.gz: 79ed3fe3389aa07eaa45a97b32df28d68af43ef1
 SHA512:
-  metadata.gz: 12f659aa570bcac66727ba9e2e954d175e8d2a6df592f80261abdc13e3bf7ede7ad713ed3d53b976b0ccbc657c6d7509098d2272f918f31ecc3126a88746641d
-  data.tar.gz: fd4dddc21e033f936963f160f6ff4ad2cb421c1372492f38008ab50a48ebd2c3d82a29a21d47b0a1670eda7f4985540dfcc9b1e6509bc49fcf4876f5ed7c1067
+  metadata.gz: f98c2b02672703f03784a9150a0b078fc5c682738906b8ce861ae3daf1b267d3fa04ef876da5b9de94d8a1255cd0e04aa4d82ca7727569973e1c0c70c117759c
+  data.tar.gz: fb4c28bfc4e8cd06864129c2d217a6fba7f83706a3b46631ce2e756f308633aa9a28f6f1de176f59c834c77fd4ee4eaa30b84ec030186e4c63cfd2021bb746a2

data/lib/moodle2cc/moodle2converter/file_converter.rb

@@ -4,7 +4,22 @@ module Moodle2CC::Moodle2Converter
 
     def convert(moodle_file)
       canvas_file = Moodle2CC::CanvasCC::Models::CanvasFile.new
-      canvas_file.identifier = moodle_file.content_hash
+
+      unique_id = moodle_file.content_hash
+      # we probably shouldn't have been using these as identifiers but if we change it now we'll break updates on re-import
+
+      id_set = Moodle2Converter::Migrator.unique_id_set
+      if id_set.include?(unique_id)
+        original_id = unique_id
+        index = 0
+        while id_set.include?(unique_id)
+          index += 1
+          unique_id = "#{original_id}#{index}"
+        end
+      end
+      id_set << unique_id
+
+      canvas_file.identifier = unique_id
       canvas_file.file_path = moodle_file.file_path + moodle_file.file_name
       canvas_file.file_location = moodle_file.file_location
       canvas_file

data/lib/moodle2cc/moodle2converter/migrator.rb

@@ -62,7 +62,7 @@ module Moodle2CC::Moodle2Converter
 
     def convert_files(files)
       file_converter = Moodle2CC::Moodle2Converter::FileConverter.new
-      Array.new(files.uniq { |f| f.content_hash }).map { |file| file_converter.convert(file) }
+      Array.new(files).map { |file| file_converter.convert(file) }
     end
 
     def convert_pages(pages)

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.35"
+  VERSION = "0.2.36"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.36
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip