vitunes 0.4.6 → 0.4.7

data/.gitignore

@@ -11,3 +11,4 @@ xcuserdata
 src/
 pkg/
 other/
+dev/

data/README.markdown

@@ -11,7 +11,7 @@ Benefits:
 * Zen-minimalist textual UI works better on small screens than iTunes' complicated, multi-paned GUI
 * Control iTunes from another computer over ssh, across the room or across the world
 * Let multiple people control one instance of iTunes over ssh ([how][multi]) 
-* Control iTunes from GNU/Linux computers over ssh (I control the iTunes on my Mac Mini from two Linux Asus netbooks that I move around the apartment)
+* Control iTunes from a GNU/Linux client computer over ssh 
 
 [multi]:https://github.com/danchoi/vitunes/wiki
 
@@ -118,9 +118,10 @@ query), iTunes will stop playing after that track ends.
 If you want to use ViTunes to find and queue a bunch of tracks and have them play 
 in automatic succession, use the next feature...
 
-### Copying tracks
+### Copying and deleting tracks
 
 * `,c` copy track(s) to a playlist
+* `BACKSPACE` deletes track(s) from the playlist
 
 To copy tracks, put the cursor on a track or select a range of tracks,
 and then hit `,c` to select a playlist to copy them to. The tracks will be
@@ -129,6 +130,11 @@ added to the end of the playlist.
 If this target playlist is already playing, you can keep queuing tracks to it
 and let the mix play out automatically.
 
+To delete tracks from the currently displayed playlist, put the cursor on a
+track or select a range of tracks, and then hit `BACKSPACE` (the Apple delete
+key) to remove them from the playlist that you are looking at. 
+
+
 ### Managing playlists
 
 * `,P` goes to the current playlist, if there is one
@@ -137,17 +143,21 @@ and let the mix play out automatically.
 ### Tips
 
 If you want to see your entire library in a Vim buffer, load the `Library`
-playlist. If might take a few seconds to load your entire iTunes library, but
+playlist. It may take a few seconds to load your entire iTunes library. But
 once it's loaded you'll be able to page through it at blazing speed and play
 any tracks you want. The list will be sorted by artist.
 
+If you have cheap Linux netbooks, they make good ViTunes controllers.  I
+control the iTunes on my Mac Mini from two Linux Asus 1015PEM netbooks that I
+move around the apartment.
+
 
 ### Buy more music, support the ViTunes project
 
 * `,z` opens Amazon's MP3 Store in your web browser 
 
 At no additional cost to you, Amazon will give the ViTunes developer a small
-referral bonus (around 6%) when you buy MP3s via `,z`. 
+referral bonus (around 6%) when you buy MP3s via `,z`.  Thank you for your support!
 
 
 ## Bug reports and feature requests

data/Rakefile

@@ -20,7 +20,7 @@ task :bump do
   puts "Bumping version: #{oldver} => #{newver}"
   newfile = file.gsub("VERSION = '#{oldver}'", "VERSION = '#{newver}'") 
   File.open(basefile, 'w') {|f| f.write newfile}
-  `git commit -am 'Bump'`
+  #`git commit -am 'Bump'`
 end
 
 desc "build and push website"

data/coverage.markdown

@@ -1,3 +1,4 @@
+* [Hacker News](http://news.ycombinator.com/item?id=2836883)
 * [Macworld](http://www.macworld.com/article/160936/2011/07/vitunes.html)
 * [OSXDaily](http://osxdaily.com/2011/07/05/command-line-tunes-player-vitunes/)
 * [One Thing Well](http://onethingwell.org/post/7341797630/vitunes)

data/lib/vitunes.vim

@@ -8,7 +8,7 @@ if exists("g:vitunes_tool")
   let s:vitunes_tool = g:vitunes_tool
 else
   " This is the development version (specific to D Choi's setup)
-  let s:vitunes_tool = '/Users/choi/projects/vitunes/build/Release/vitunes '
+  let s:vitunes_tool = 'dev/vitunes '
   " Maybe I should make this a relative path
 endif
 if !exists("g:mapleader")
@@ -73,6 +73,7 @@ function! ViTunes()
   noremap <buffer> <Leader>g :call <SID>openGenreDropdown()<cr>
   noremap <buffer> <Leader>A :call <SID>openAlbumDropdown()<cr>
   noremap <buffer> <Leader>c :call <SID>openAddToPlaylistDropDown()<cr>
+  noremap <buffer> <BS> :call <SID>deleteTracksFromPlaylist()<CR> "
   noremap <buffer> <Leader>P :call <SID>gotoCurrentPlaylist()<cr>
 
   noremap <buffer> > :call <SID>nextTrack()<cr>
@@ -87,8 +88,6 @@ function! ViTunes()
   noremap <buffer> +  :call <SID>changeVolume("volumeUp")<cr>
   noremap <buffer> =  :call <SID>changeVolume("volumeUp")<cr>
 
-  " Not working yet
-  " noremap <buffer> <BS> :call <SID>deleteTracksFromPlaylist()<CR> "
   noremap <buffer> <Leader>i :close<CR>
   noremap <buffer> <Leader>? :call <SID>help()<CR>
   noremap <buffer> <Leader>z :call <SID>musicStore()<CR>
@@ -334,20 +333,19 @@ function! s:submitQueryOrSelection(command)
   endif
 endfunction
 
-" TODO does not work yet
-function! s:deleteTracksFromPlaylist() range
-  if (s:currentPlaylist == '')
-    echom "You can't delete tracks unless you're in a playlist"
-    return
-  endif
+function! s:deleteTracksFromPlaylist() range 
   let s:selectedTrackIds = s:collectTrackIds(a:firstline, a:lastline)
   let trackIds = join(s:selectedTrackIds, ',')
-  let bcommand = s:vitunes_tool.'rmTracksFromPlaylist '.trackIds." ".s:currentPlaylist 
+  let playlist = s:lastPlaylist
+  let bcommand = s:vitunes_tool."deleteTracksFromPlaylist ".trackIds." ".shellescape(playlist)
+  let res = s:runCommand(bcommand)
+  setlocal modifiable
+  exec "silent! ".a:firstline.",".a:lastline."delete"
+  redraw
+  setlocal nomodifiable
   echom bcommand
-  let res = system(bcommand)
-  " delete lines from buffer
-  echom res
-endfunction
+  return
+endfunc
 
 function! s:newPlaylist(name)
   let command = s:vitunes_tool.'newPlaylist '.shellescape(a:name)

data/lib/vitunes/version.rb

@@ -1,3 +1,3 @@
 module ViTunes
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

data/vitunes/main.m

@@ -119,19 +119,17 @@ void addTracksToPlaylistName(NSString *trackIds, NSString *playlistName) {
   }
 }
 
-// TODO This doesn't seem to work
-void rmTracksFromPlaylistName(NSString *trackIds, NSString *playlistName) {
+void deleteTracksFromPlaylistName(NSString *trackIds, NSString *playlistName) {
   iTunesPlaylist *playlist =  [[library playlists] objectWithName:playlistName];
-
   for (NSString *trackID in [trackIds componentsSeparatedByString:@","]) {
-    iTunesTrack* t = findTrackID(trackID);
+    NSNumber *databaseId = convertNSStringToNumber(trackID);
+    NSArray *xs = [[playlist tracks] filteredArrayUsingPredicate: [NSPredicate predicateWithFormat:@"databaseID == %@", databaseId]];
+    iTunesTrack* t = [xs objectAtIndex:0];
     NSLog(@"Removing track: %@ from playlist: %@", [t name], [playlist name]);
-    [[playlist tracks] removeObject:t];
+    [t delete];
   }
-
 }
 
-
 void groupTracksBy(NSString *property) {
   // gets list of all e.g. artists, genres
   // NOTE year won't work yet
@@ -275,8 +273,11 @@ int main (int argc, const char * argv[]) {
   } else if ([action isEqual: @"playPlaylist"]) {
     playPlaylist([args objectAtIndex:0]);
   } else if ([action isEqual: @"addTracksToPlaylist"]) { 
-    // make sure to quote args
+    // make sure to quote first arg
     addTracksToPlaylistName([args objectAtIndex:0], [args objectAtIndex:1]);
+  } else if ([action isEqual: @"deleteTracksFromPlaylist"]) { 
+    // make sure to quote first arg
+    deleteTracksFromPlaylistName([args objectAtIndex:0], [args objectAtIndex:1]);
   } else if ([action isEqual: @"volumeUp"]) {
     turnVolume(@"up");
   } else if ([action isEqual: @"volumeDown"]) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vitunes
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00.000000000Z
+date: 2011-08-03 00:00:00.000000000Z
 dependencies: []
 description: Control iTunes with Vim
 email: