poddb_client 0.1.0 → 0.1.1

data/MIT-LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright (c) 2010 Daniel Choi, http://danielchoi.com/software/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/lib/interactive.vim

@@ -1,5 +1,10 @@
 let s:client_cmd = "ruby -Ilib bin/poddb"  
-let s:base_url = "http://localhost:3000"
+if !exists($PODDB_SERVER)
+  let g:poddb_base_url = $PODDB_SERVER
+else
+  let g:poddb_base_url = "http://poddb.com"
+endif
+
 
 let s:download_and_play_cmd = s:client_cmd." --download-and-play "
 
@@ -31,7 +36,8 @@ function! s:main_window()
   noremap <buffer> <c-j> :call <SID>show_next_item(0)<CR> 
   noremap <buffer> <c-k> :call <SID>show_next_item(1)<CR> 
   noremap <buffer> f :call <SID>favorite_this_podcast()<CR> 
-  autocmd BufEnter <buffer> :setlocal nowrap
+  autocmd BufEnter <buffer> :setlocal nowrap | let s:listbufnr = bufnr('') 
+  autocmd BufWinEnter <buffer> :only
   noremap <buffer> <Leader>? :call <SID>help()<CR>
 endfunction
 
@@ -42,6 +48,8 @@ function! s:item_window()
   noremap <buffer> <c-j> :call <SID>show_next_item(0)<CR> 
   noremap <buffer> <c-k> :call <SID>show_next_item(1)<CR> 
   noremap <buffer> d :call <SID>mark_for_download()<cr>
+  nnoremap <buffer> o :call <SID>find_next_href_and_open()<CR>
+  nnoremap <buffer> O :call <SID>open_all_hrefs()<CR>
   close
 endfunction
 
@@ -56,11 +64,13 @@ function! s:show_item()
   if (itemId == '')
     return
   endif
-  let command = "curl -s '".s:base_url."/item/".itemId."'"
+  let command = "curl -s '".g:poddb_base_url."/item/".itemId."'"
   let res = system(command)
   call s:focus_window(s:itembufnr)
+  setlocal modifiable
   silent! 1,$delete
   silent! put! =res
+  setlocal nomodifiable
   normal 1G
   wincmd p
 endfunc
@@ -116,7 +126,7 @@ function! s:show_podcast_items(podcastId)
   if (podcastId == '')
     return
   endif
-  let command = "curl -s '".s:base_url."/podcast/".podcastId."/items'"
+  let command = "curl -s '".g:poddb_base_url."/podcast/".podcastId."/items'"
   let contents = system(command)
   if contents =~ 'No matches\c'
     echom "No items!"
@@ -197,14 +207,7 @@ function! s:show_next_item(previous)
   if s:is_podcast_list()
     return
   end
-  let origbufnr = bufnr('%') 
-  let fullscreen = (bufwinnr(s:listbufnr) == -1) " we're in full screen message mode
-  if fullscreen
-    split
-    exec 'b'. s:listbufnr
-  else
-    call s:focus_window(s:listbufnr)
-  end
+  call s:focus_window(s:listbufnr)
   if a:previous
     normal k
   else
@@ -212,9 +215,6 @@ function! s:show_next_item(previous)
   endif
   call s:show_item()
   normal zz
-  if origbufnr == s:itembufnr 
-    wincmd p
-  endif
   normal 0 
   redraw
 endfunction
@@ -225,9 +225,53 @@ function! s:help()
   echo res  
 endfunction
 
+" ------------------------------------------------------------------------ 
+" open links in external browser 
+
+if !exists("g:Poddb#browser_command")
+  for cmd in ["gnome-open", "open"] 
+    if executable(cmd)
+      let g:Poddb#browser_command = cmd
+      break
+    endif
+  endfor
+  if !exists("g:Poddb#browser_command")
+    echom "Can't find the to open your web browser."
+  endif
+endif
+
+let s:http_link_pattern = 'https\?:[^ >)\]]\+'
+
+func! s:open_href_under_cursor()
+  let href = matchstr(expand("<cWORD>") , s:http_link_pattern)
+  let command = g:Poddb#browser_command . " '" . shellescape(href) . "' "
+  call system(command)
+endfunc
+
+func! s:find_next_href_and_open()
+  let res = search(s:http_link_pattern, 'cw')
+  if res != 0
+    call s:open_href_under_cursor()
+  endif
+endfunc
+
+func! s:open_all_hrefs()
+  let n = 0
+  let line = search(s:http_link_pattern, 'cw')
+  while line
+    call s:open_href_under_cursor()
+    let n += 1
+    let line = search(s:http_link_pattern, 'W')
+  endwhile
+  echom 'opened '.n.' links' 
+endfunc
+
+" ------------------------------------------------------------------------
+
 
 call s:main_window()
 call s:item_window()
 
 normal 3G
 
+

data/lib/poddb_client/downloading.rb

@@ -20,7 +20,7 @@ class PoddbClient
 
       filename_suffix = File.extname(URI.parse(enclosure_url).path)
 
-      @filename = "%s.%s.poddb%s%s" % [podcast_fragment, title_fragment, item_id.to_s, filename_suffix]
+      @filename = "%s.%s.poddb_%d_%d%s" % [podcast_fragment, title_fragment, podcast[:podcast_id], item_id, filename_suffix]
       puts "Downloading #{enclosure_url} as #{@filename}"
       cmd = "wget -O #{@filename} '#{enclosure_url}' && touch #{@filename}"
       `#{cmd}`

data/lib/poddb_client/version.rb

@@ -1,3 +1,3 @@
 class PoddbClient
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/poddb_client.rb

@@ -1,12 +1,13 @@
 require 'poddb_client/downloading'
+require 'poddb_client/version'
 require 'cgi'
 require 'optparse'
 require 'net/http'
 
 class PoddbClient
 
-  # TODO: change to poddb.com
-  SERVER = "http://localhost:3000"
+  # TODO: set for production
+  SERVER = ENV['PODDB_SERVER'] || "http://poddb.com"
 
   PODDB_DIR = "%s/.poddb" % ENV['HOME']
   CACHE_DIR = "%s/.poddb/cache" % ENV['HOME']
@@ -23,7 +24,10 @@ class PoddbClient
   def initialize(args)
     @args = args
     @options = {}
+    @params = ["v=#{PoddbClient::VERSION}" ]
     @outfile = ITEM_LIST_OUTFILE # changed only for podcast list
+    @version = PoddbClient::VERSION
+    @query = []
     parse_options
   end
 
@@ -41,8 +45,11 @@ class PoddbClient
       opts.on("-a", "--add PODCAST_URL", "Add podcast with PODCAST_URL to the poddb database") do |podcast_url|
         @add_podcast = podcast_url
       end
-      opts.on("-l", "--list", "List all podcasts in the poddb database", "(If query is supplied, will return matching podcasts)") do 
+      opts.on("-l", "--list [QUERY]", "List all podcasts in the poddb database", "(If QUERY is supplied, will return matching podcasts)") do |query|
         @list_podcasts = true
+        if query
+          @query << query
+        end
       end
       opts.on("-F", "--favorite-podcasts", "Show favorite podcasts") do
         if ! File.size?(FAVORITE_PODCASTS_FILE)
@@ -51,8 +58,14 @@ class PoddbClient
         end
         @list_favorite_podcasts = true
       end
+      opts.on("-o", "--order ORDER", "Sort results by ORDER", "The only option right now is 'popular'. Default order is pubdate.") do |order|
+        @params << "o=#{order}"
+      end
+      opts.on("-d", "--days DAYS", "Limit results to items published since DAYS days ago") do |days|
+        @params << "d=#{days}"
+      end
       opts.on("-t", "--type MEDIA_TYPE", "Return items of MEDIA_TYPE only (audio,video)") do |media_type|
-        @media_type_param = "&media_type=#{media_type}"
+        @params << "t=#{media_type}"
       end
       opts.on("--download-and-play ITEM_ID", "Download item and play with PODDB_MEDIA_PLAYER") do |item_id|
         puts "Download and play #{item_id}"
@@ -66,12 +79,16 @@ class PoddbClient
         exit
       end
       opts.on_tail("-v", "--version", "Show version number") do
-        require 'poddb_client/version'
         puts "poddb #{VERSION}"
         exit
       end
     end.parse!(@args)
-    @query = CGI::escape(@args.join(' ').strip)
+    @query = @query.concat @args
+    q = CGI::escape(@query.join(' ').strip)
+    if q != '' 
+      @params << "q=#{q}"
+    end
+    @params = @params.empty? ? '' : @params.join('&')
   end
 
   def run
@@ -91,11 +108,14 @@ class PoddbClient
   end
 
   def add_podcast
-    puts "Adding podcast..."
-    res = Net::HTTP.post_form(URI.parse("#{SERVER}/podcasts"),
-                              'url' => @add_podcast)
-    # TODO improve response
-    puts res.body
+    puts "Adding podcast with url: #{@add_podcast}"
+    res = Net::HTTP.post_form(URI.parse("#{SERVER}/podcasts"), 'url' => @add_podcast).body
+    if res =~ /^Error/
+      puts res
+    else
+      podcast_id, title = res.split(/\s+/, 2)
+      add_to_favorite_podcasts(podcast_id)
+    end
   end
 
   def interactive
@@ -103,13 +123,12 @@ class PoddbClient
       puts @output
       exit
     end
-    if @output =~ /^No matches/i
+    if @output =~ /^No matches/i || @output =~ /^Error/
       puts @output
       exit
     end
-
     File.open(@outfile, 'w') {|f| f.puts @output }
-    cmd = "vim -S #{VIMSCRIPT} #{@outfile} #{@poddb_env}"
+    cmd = "export PODDB_SERVER=#{SERVER} && vim -S #{VIMSCRIPT} #{@outfile} "
     puts cmd
     system(cmd)
     if download_and_play?
@@ -123,9 +142,9 @@ class PoddbClient
   def list_podcasts
     @outfile = PODCAST_LIST_OUTFILE
     @output = if @list_podcasts
-                `curl -s #{SERVER}/podcasts?q=#{@query}`
+                `curl -s '#{SERVER}/podcasts?#@params'`
               elsif @list_favorite_podcasts 
-                `curl -s #{SERVER}/podcasts?podcast_ids=#{favorite_podcast_ids.join(',')}`
+                `curl -s '#{SERVER}/podcasts?podcast_ids=#{favorite_podcast_ids.join(',')}'`
               end
     if File.size?(FAVORITE_PODCASTS_FILE)
       @output = @output.split("\n").map {|line|
@@ -140,12 +159,12 @@ class PoddbClient
   end
 
   def items_from_favorites
-    @output = `curl -s '#{SERVER}/items?podcast_ids=#{favorite_podcast_ids.join(',')}#{@media_type_param}'`
+    @output = `curl -s '#{SERVER}/items?podcast_ids=#{favorite_podcast_ids.join(',')}&#@params'`
     mark_already_downloaded
   end
 
   def search
-    @output = `curl -s '#{SERVER}/search?q=#{@query}#{@media_type_param}'`
+    @output = `curl -s '#{SERVER}/search?#@params'`
     mark_already_downloaded
   end
 
@@ -157,14 +176,28 @@ private
 
   def favorite_podcast_ids
     if File.size?(FAVORITE_PODCASTS_FILE)
-      File.readlines(FAVORITE_PODCASTS_FILE).map(&:strip).select {|x| x != ''}
+      File.readlines(FAVORITE_PODCASTS_FILE).map(&:strip).select {|x| x =~ /\d+/}.map {|x| x.to_i}
     else
       []
     end
   end
 
+  def add_to_favorite_podcasts(podcast_id)
+    if File.size?(FAVORITE_PODCASTS_FILE) && File.read(FAVORITE_PODCASTS_FILE).split("\n").any? {|line| line.strip == podcast_id.to_s}
+      return
+    end
+    if podcast_id !~ /\d/
+      return
+    end
+    podcast_id = podcast_id.to_i
+    File.open(FAVORITE_PODCASTS_FILE, 'a') {|f|
+      f.puts podcast_id
+    }
+    puts "Added '#{title}' [##{podcast_id}] to your favorite podcasts. Type `poddb -F` to show your favorites."
+  end
+
   def mark_already_downloaded
-    @downloaded_item_ids = Dir['*poddb*'].map { |f| f[/poddb(\d+)/,1] }.compact
+    @downloaded_item_ids = Dir['*poddb_*'].map { |f| f[/poddb_\d+_(\d+)/,1] }.compact
     @output = @output.split(/\n/).map {|line| 
       item_id = line[/\d+$/,0] 
       if @downloaded_item_ids.include?(item_id)

metadata

@@ -1,29 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: poddb_client
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Daniel Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-13 00:00:00 -04:00
-default_executable: 
+date: 2011-09-15 00:00:00.000000000Z
 dependencies: []
-
 description: Podcast aggregation from the command line
-email: 
+email:
 - dhchoi@gmail.com
-executables: 
+executables:
 - poddb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- MIT-LICENSE.txt
 - NOTES
 - README.markdown
 - Rakefile
@@ -33,36 +29,32 @@ files:
 - lib/poddb_client/downloading.rb
 - lib/poddb_client/version.rb
 - poddb_client.gemspec
-has_rdoc: true
 homepage: http://danielchoi.com/software/poddb_client.html
 licenses: []
+post_install_message: ! '*******************************************************************
 
-post_install_message: |-
-  *******************************************************************
   ** Now please run poddb_client-install to install the Vim plugin **
-  *******************************************************************
-rdoc_options: []
 
-require_paths: 
+  *******************************************************************'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: poddb_client
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Podcast aggregation from the command line
 test_files: []
-