rbpod 0.0.6 → 0.0.7

data/ext/rbpod/track.c

@@ -115,7 +115,7 @@ static VALUE rbpod_track_ipod_path_set(VALUE self, VALUE value)
     gchar *buffer = NULL;
 
     if (track->ipod_path != NULL)
-        g_free(track);
+        g_free(track->ipod_path);
 
     buffer = g_strdup(new_path);
 
@@ -202,12 +202,27 @@ static VALUE rbpod_track_mark_unplayed_set(VALUE self, VALUE value)
 
 /*
  * call-seq:
- *     initialize() -> RbPod::Track
+ *     initialize(source = nil) -> RbPod::Track
  *
  * Creates a detached track. (Not managed by a database.)
  */
-static VALUE rbpod_track_initialize(VALUE self)
+static VALUE rbpod_track_initialize(int argc, VALUE *argv, VALUE self)
 {
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
+    gchar *buffer = NULL;
+    VALUE source = Qnil;
+
+    if (rb_scan_args(argc, argv, "01", &source) == 1) {
+        buffer = StringValueCStr(source);
+
+        if (g_file_test(buffer, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_SYMLINK) == FALSE) {
+            rb_raise(eRbPodError, "Invalid Argument: Source must be a path to an existing file.");
+            return Qnil;
+        }
+
+        track->userdata = buffer;
+    }
+
     return self;
 }
 
@@ -226,6 +241,11 @@ static void rbpod_track_deallocate(void *handle)
 static VALUE rbpod_track_allocate(VALUE self)
 {
     Itdb_Track *track = itdb_track_new();
+
+    track->userdata = NULL;
+    track->userdata_destroy = (ItdbUserDataDestroyFunc) g_free;
+    track->userdata_duplicate = (ItdbUserDataDuplicateFunc) g_strdup;
+
     return Data_Wrap_Struct(cRbPodTrack, NULL, rbpod_track_deallocate, (void *) track);
 }
 
@@ -238,7 +258,7 @@ void Init_rbpod_track(void)
 
     rb_define_alloc_func(cRbPodTrack, rbpod_track_allocate);
 
-    rb_define_method(cRbPodTrack, "initialize", rbpod_track_initialize, 0);
+    rb_define_method(cRbPodTrack, "initialize", rbpod_track_initialize, -1);
 
     sMEDIA_TYPE_AUDIO_VIDEO   = rb_intern("MEDIA_TYPE_AUDIO_VIDEO");
     sMEDIA_TYPE_AUDIO         = rb_intern("MEDIA_TYPE_AUDIO");

data/ext/rbpod/track_collection.c

@@ -76,6 +76,7 @@ static VALUE rbpod_track_collection_insert(int argc, VALUE *argv, VALUE self)
     VALUE track = Qnil, position = Qnil;
     Itdb_Track *_track = NULL;
     gint32 _position = 0;
+    GError *error = NULL;
 
     if (rb_scan_args(argc, argv, "11", &track, &position) < 1) {
         rb_raise(eRbPodError, "Invalid arguments: Expected >= 1 argument!");
@@ -91,8 +92,27 @@ static VALUE rbpod_track_collection_insert(int argc, VALUE *argv, VALUE self)
         return Qnil;
     }
 
+    /* Has this track already been transferred? If so, just add it to the playlist and be done. */
+    if (_track->transferred == TRUE) {
+        itdb_playlist_add_track(_playlist, _track, _position);
+        return Qnil;
+    }
+
+    /* Do we have a source path for this track? */
+    if (_track->userdata != NULL && g_file_test(_track->userdata, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_SYMLINK) == FALSE) {
+        rb_raise(eRbPodError, "Invalid argument: Cannot add a track without a source file.");
+        return Qnil;
+    }
+
     itdb_playlist_add_track(_playlist, _track, _position);
 
+    /* Copy the track to the iPod. XXX: Unlock the GVL instead, stupid. */
+    if (itdb_cp_track_to_ipod(_track, _track->userdata, &error) == FALSE) {
+        itdb_playlist_remove_track(_playlist, _track);
+        return rbpod_raise_error(error);
+    }
+
+
     return Qnil;
 }
 

data/lib/rbpod/version.rb

@@ -1,3 +1,3 @@
 module RbPod # :nodoc:
-  VERSION = "0.0.6" # :nodoc:
+  VERSION = "0.0.7" # :nodoc:
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbpod
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -656903251
+      hash: 696726817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -656903251
+      hash: 696726817
 requirements:
 - libgpod-1.0
 rubyforge_project: