irecorder 0.0.5-linux → 0.0.6-linux

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 ruby.twiddler@gmail.com
+Copyright (c) 2010 ruby.twiddler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "irecorder"), to deal

data/README

@@ -3,7 +3,7 @@ You can browse BBC Radio programmes and click to download stream file.
 files will be converted to mp3 files automatically.
 irecorder allow to play without any other browser or play on your prefered browser.
 
-== KDE ruby
+ KDE ruby
 ==============
 irecorder require kdebindings.
 please check your distro package to install it.
@@ -11,7 +11,7 @@ or you can compile from source.
 http://download.kde.org/download.php?url=stable/4.5.0/src/kdebindings-4.5.0.tar.bz2
 
 
-== Installation
+ Installation
 ==================
 install most important package kdebindings4.
  on Mandriva Linux use urpmi command.
@@ -36,7 +36,7 @@ launch irecorder just type irecorder.rb
   # irecorder.rb
 
 
-== Build Gem
+ Build Gem
 =================
 if you want to gem package from source, use rake command.
 

data/Rakefile

@@ -6,10 +6,10 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
     s.name = "irecorder"
-    s.version = "0.0.5"
+    s.version = "0.0.6"
     s.author = "ruby.twiddler"
     s.email = "ruby.twiddler at gmail.com"
-    s.homepage = "http://wiki.github.com/rubytwiddler/irecorder/"
+    s.homepage = "http://github.com/rubytwiddler/irecorder/wiki"
     s.platform = "linux"
     s.summary = "BBC iPlayer like audio recorder with KDE GUI."
     s.files = FileList["{bin,lib}/**/*"].to_a
@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
     s.executables = [ 'irecorder.rb' ]
     s.license  = "MIT-LICENSE"
     s.require_path = "lib"
-    s.requirements = %w{ korundum4 qtwebkit kio }
+    s.requirements = %w{ korundum4 qtwebkit kio ktexteditor }
     s.add_runtime_dependency( 'nokogiri', '>= 1.4.0' )
     s.description = <<-EOF
 BBC iPlayer like audio recorder with KDE GUI.

data/bin/irecorder.rb

@@ -2,7 +2,7 @@
 #
 #    2010 by ruby.twiddler@gmail.com
 #
-#     iPlayer interface
+#     iPlayer like stream recorder
 #      record real/wma (rtsp/mms) audio stream
 #
 
@@ -12,14 +12,13 @@ require 'ftools'
 APP_NAME = File.basename(__FILE__).sub(/\.rb/, '')
 APP_DIR = File::dirname(File.expand_path(File.dirname(__FILE__)))
 LIB_DIR = File::join(APP_DIR, "lib")
-APP_VERSION = "0.0.5"
+APP_VERSION = "0.0.6"
 
 # standard libs
 require 'rubygems'
 require 'uri'
 require 'net/http'
 require 'open-uri'
-require 'rss'
 require 'shellwords'
 require 'fileutils'
 require 'singleton'
@@ -48,9 +47,6 @@ require "settings"
 #  Main Window Class
 #
 class MainWindow < KDE::MainWindow
-    slots   :startDownload, :updateTask, :getList, :reloadStyleSheet, :clearStyleSheet
-    slots   :mediaFilterChanged, :playProgramme
-    slots   'programmeCellClicked(int,int)'
 
     GroupName = "MainWindow"
 
@@ -72,7 +68,7 @@ class MainWindow < KDE::MainWindow
 #         BBCNet.setProxy('http://194.36.10.154:3127')
         # initialize values
         $log = MyLogger.new(@logWin)
-        $log.level = MyLogger::INFO
+        $log.level = MyLogger::DEBUG
         $log.info { 'Log Start.' }
 
         # assign from config file.
@@ -132,20 +128,42 @@ class MainWindow < KDE::MainWindow
 
 
         # Help menu
-        about = i18n(<<-ABOUT
-#{APP_NAME} #{APP_VERSION}
-
-BBC iPlayer like audio (mms/rtsp) stream recorder.
-        ABOUT
-        )
-        helpMenu = KDE::HelpMenu.new(self, about)
+        aboutDlg = KDE::AboutApplicationDialog.new($about)
+        openAboutAction = KDE::Action.new(KDE::Icon.new('irecorder'),
+                                          i18n('About iRecorder'), self)
+        connect(openAboutAction, SIGNAL(:triggered), aboutDlg, SLOT(:exec))
+
+        #
+        openDocUrlAction = KDE::Action.new(KDE::Icon.new('help-contents'),
+                                           i18n('Open Document Wiki'), self)
+        connect(openDocUrlAction, SIGNAL(:triggered), self, SLOT(:openDocUrl))
+
+        #
+        openReportIssueUrlAction = KDE::Action.new(
+            KDE::Icon.new('tools-report-bug'), i18n('Report Bug'), self)
+        connect(openReportIssueUrlAction, SIGNAL(:triggered), self,
+                SLOT(:openReportIssueUrl))
+
+        #
+        openSourceAction = KDE::Action.new(KDE::Icon.new('document-open-folder'),
+                                           i18n('Open Source Folder'), self)
+        connect(openSourceAction, SIGNAL(:triggered), self, SLOT(:openSource))
+
+        helpMenu = KDE::Menu.new(i18n('&Help'), self)
+        helpMenu.addAction(openDocUrlAction)
+#         helpMenu.addAction(openHomeUrlAction)
+        helpMenu.addAction(openReportIssueUrlAction)
+#         helpMenu.addAction(openRDocAction)
+        helpMenu.addAction(openSourceAction)
+        helpMenu.addSeparator
+        helpMenu.addAction(openAboutAction)
 
         # insert menus in MenuBar
         menu = KDE::MenuBar.new
         menu.addMenu( fileMenu )
         menu.addMenu( settingsMenu )
         menu.addSeparator
-        menu.addMenu( helpMenu.menu )
+        menu.addMenu( helpMenu )
         setMenuBar(menu)
     end
 
@@ -194,6 +212,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
     #-------------------------------------------------------------
     #
+    TvType, RadioType, RadioCategoryType = [-1,0,1]    # TvType = -1 (hide)
     TVChannelRssTbl = [
         ['BBC One', 'bbc_one' ],
         ['BBC Two', 'bbc_two' ],
@@ -252,11 +271,15 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
             w.objectName = 'channelToolBox'
         end
 
+        # default value
+        toolBox.currentIndex = 2
+
         # TV & Radio Channels selector
-        @tvChannelListBox = KDE::ListWidget.new
-        # TV Channels
-        @tvChannelListBox.addItems( TVChannelRssTbl.map do |w| w[0] end )
-        toolBox.addItem( @tvChannelListBox, 'TV Channels' )
+#         @tvChannelListBox = KDE::ListWidget.new
+#         # TV Channels
+#         @tvChannelListBox.addItems( TVChannelRssTbl.map do |w| w[0] end )
+#         toolBox.addItem( @tvChannelListBox, 'TV Channels' )
+
 
         # Radio Channels
         @radioChannelListBox = KDE::ListWidget.new
@@ -266,7 +289,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         # Category selector
         @categoryListBox = KDE::ListWidget.new
         @categoryListBox.addItems( CategoryRssTbl.map do |w| w[0] end )
-        toolBox.addItem( @categoryListBox, 'Categories' )
+        toolBox.addItem( @categoryListBox, 'Radio Categories' )
 
         toolBox
     end
@@ -339,6 +362,8 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                             connect(w,SIGNAL('textChanged(const QString &)'),
                                     @programmeTable, SLOT('filterChanged(const QString &)'))
                             w.setClearButtonShown(true)
+                            connect(@programmeTable, SIGNAL('filterRequest(const QString &)'),
+                                w, SLOT('setText(const QString &)'))
                         end
                     )
                 end
@@ -346,35 +371,20 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
             vbxw.addWidget( @listTitleLabel = Qt::Label.new('') )
             vbxw.addWidget(@programmeTable)
 
-            # 'Start Download' Button
-            @tvFilterBtn = KDE::PushButton.new(i18n("TV")) do |w|
-                w.objectName = 'mediaButton'
-                w.checkable = true
-                w.autoExclusive = true
-                connect( w, SIGNAL(:clicked), self, SLOT(:mediaFilterChanged) )
-            end
-
-            @radioFilterBtn = KDE::PushButton.new(i18n("Radio")) do |w|
-                w.objectName = 'mediaButton'
-                w.checkable = true
-                w.autoExclusive = true
-                w.checked = true
-                connect( w, SIGNAL(:clicked), self, SLOT(:mediaFilterChanged) )
-            end
-
             playIcon = KDE::Icon.new(':images/play-22.png')
             playBtn = KDE::PushButton.new( playIcon, i18n("Play")) do |w|
                 w.objectName = 'playButton'
                 connect( w, SIGNAL(:clicked), self, SLOT(:playProgramme) )
             end
 
+            # 'Start Download' Button
             downloadIcon = KDE::Icon.new(':images/download-22.png')
             downloadBtn = KDE::PushButton.new( downloadIcon, i18n("Download")) do |w|
                 w.objectName = 'downloadButton'
                 connect( w, SIGNAL(:clicked), self, SLOT(:startDownload) )
             end
 
-            vbxw.addWidgets( @tvFilterBtn, @radioFilterBtn, nil, playBtn, nil, downloadBtn, nil )
+            vbxw.addWidgets( nil, playBtn, nil, downloadBtn, nil )
         end
     end
 
@@ -468,7 +478,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
     end
 
     # ------------------------------------------------------------------------
-    # slot :
+    slots  :reloadStyleSheet
     def reloadStyleSheet
         styleStr = IO.read(APP_DIR + '/resources/bbcstyle.qss')
         $app.styleSheet = styleStr
@@ -476,7 +486,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         $log.info { 'Reloaded StyleSheet.' }
     end
 
-    # slot :
+    slots   :clearStyleSheet
     def clearStyleSheet
         $app.styleSheet = nil
         $log.info { 'Cleared StyleSheet.' }
@@ -484,6 +494,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
 
     # slot :
+    slots   'programmeCellClicked(int,int)'
     def programmeCellClicked(row, column)
         prog = @programmeTable[row]
         color = "#%06x" % (@programmeSummaryWebView.palette.color(Qt::Palette::Text).rgb & 0xffffff)
@@ -500,25 +511,21 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         @programmeSummaryWebView.setHtml(html)
     end
 
-    # slot :
-    def mediaFilterChanged
-        setMediaFilter
-        @programmeTable.filterChanged(@filterLineEdit.text)
-    end
 
 
-    # slot
+    def makeProcCommand(command, url)
+        cmd, args = command.split(/\s+/, 2)
+        args = args.split(/\s+/).map do |a|
+            a.gsub(/%\w/, url)
+        end
+        [ cmd, args ]
+    end
+
+    slots   :playProgramme
     def playProgramme
         items = @programmeTable.selectedItems
         return unless items.size > 0
 
-        def makeProcCommand(command, url)
-            cmd, args = command.split(/\s+/, 2)
-            args = args.split(/\s+/).map do |a|
-                a.gsub(/%\w/, url)
-            end
-            [ cmd, args ]
-        end
 
         def getIplayerUrl(prog)
             # big type console
@@ -563,6 +570,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                 $log.info { "episode Url : #{url}" }
                 minfo = BBCNet::CacheMetaInfoDevice.read(url)
                 $log.debug { "#{minfo.inspect}" }
+                raise "No stream Url" unless minfo.wma
                 url = minfo.wma.url
 
                 cmd, args = makeProcCommand(directPlayerCommand, url)
@@ -572,17 +580,51 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                 proc.start(cmd, args)
             end
         rescue => e
-            $log.error { e }
-            KDE::MessageBox::information(self, i18n("There is not direct stream for this programme."))
+            if e.kind_of? RuntimeError
+                $log.info { e.message }
+            else
+                $log.error { e }
+            end
+            # some messages must be treated.
+            # already expired.
+            # some xml error.
+            # no url
+            passiveMessage(i18n("There is no direct stream for this programme.\n %s" %[prog.title]))
         end
     end
 
+    slots :openDocUrl
+    def openDocUrl
+        openUrlDocument('http://github.com/rubytwiddler/irecorder/wiki')
+    end
+
+    slots :openReportIssueUrl
+    def openReportIssueUrl
+        openUrlDocument('http://github.com/rubytwiddler/irecorder/issues')
+    end
+
+    slots  :openSource
+    def openSource
+        cmd = 'dolphin'
+        args = [ APP_DIR ]
+        proc = Qt::Process.new(self)
+        proc.start(cmd, args)
+    end
+
+    def openUrlDocument(url)
+        webPlayerCommand = IRecSettings.webPlayerCommand
+        cmd, args = makeProcCommand(webPlayerCommand, url)
+        $log.debug { "execute cmd '#{cmd}', args '#{args.inspect}'" }
+        proc = Qt::Process.new(self)
+        proc.start(cmd, args)
+    end
 
     # ------------------------------------------------------------------------
     #
     # slot: called when 'Get List' Button clicked signal invoked.
     #
     public
+    slots  :getList
     def getList
         feedAdr = getFeedAdr
         return if feedAdr.nil?
@@ -591,10 +633,9 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
         begin
             makeTablefromRss( CacheRssDevice.read(feedAdr) )
-        rescue IOError, OpenURI::HTTPError => e
+        rescue  => e
             $log.error { e }
         end
-        mediaFilterChanged
         setListTitle
     end
 
@@ -608,18 +649,18 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
         channelStr = nil
         case  @channelType
-        when 0
+        when TvType
             # get TV channel
             @channelIndex = @tvChannelListBox.currentRow
             channelStr = TVChannelRssTbl[ @channelIndex ][1]
-        when 1
+        when RadioType
             # get Radio channel
             @channelIndex = @radioChannelListBox.currentRow
             channelStr = RadioChannelRssTbl[ @channelIndex ][1]
-        when 2
+        when RadioCategoryType
             # get Category
             @channelIndex = @categoryListBox.currentRow
-            channelStr = 'categories/' + CategoryRssTbl[ @channelIndex ][1]
+            channelStr = 'categories/' + CategoryRssTbl[ @channelIndex ][1] + '/radio'
         end
 
         return nil  if channelStr.nil?
@@ -648,23 +689,25 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
     protected
     def makeTablefromRss(rss)
-#         rss = RSS::Parser.parse(rssRaw)
+        @programmeTable.clearContents
+        @programmeTable.rowCount = 0
+        @filterLineEdit.clear
+        entries = rss.css('entry')
+        return unless rss and entries and entries.size
+
         sortFlag = @programmeTable.sortingEnabled
         @programmeTable.sortingEnabled = false
         @programmeTable.hide
-        @programmeTable.clearContents
-        @filterLineEdit.clear
-        @programmeTable.rowCount = rss.entries.size
-        setMediaFilter
+        @programmeTable.rowCount = entries.size
 
         # ['Title', 'Category', 'Updated' ]
-        rss.entries.each_with_index do |i, r|
-            title = i.title.content.to_s
-            updated = i.updated.content.to_s
-            contents = i.content.content
-            linkItem = i.links.find do |l| l.rel == 'self' end
-            link = linkItem ? linkItem.href : nil
-            categories = i.categories.map do |c| c.term end.join(',')
+        entries.each_with_index do |i, r|
+            title = i.at_css('title').content
+            updated = i.at_css('updated').content
+            contents = i.at_css('content').content
+            linkItem = i.css('link').find do |l| l['rel'] == 'self' end
+            link = linkItem ? linkItem['href'] : nil
+            categories = i.css('category').map do |c| c['term'] end.join(',')
             $log.misc { title }
             @programmeTable.addEntry( r, title, categories, updated, contents, link )
         end
@@ -673,19 +716,6 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         @programmeTable.show
     end
 
-    def setMediaFilter
-        @programmeTable.mediaFilter =
-            case  @channelType
-            when 2
-                @tvFilterBtn.enabled = true
-                @radioFilterBtn.enabled = true
-                @tvFilterBtn.checked ? 'tv' : 'radio'
-            else
-                @tvFilterBtn.enabled = false
-                @radioFilterBtn.enabled = false
-                ''
-            end
-    end
 
 
     # ------------------------------------------------------------------------
@@ -695,13 +725,18 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
     #   Start Downloading
     #
     public
+    slots  :startDownload
     def startDownload
         rowsSet = {}      # use Hash as Set.
         @programmeTable.selectedItems.each do |i| rowsSet[i.row] = true end
 
-        rowsSet.keys.sort.map do |r|
+        titles = {}
+        rowsSet.keys.map do |r|
+            @programmeTable[r]
+        end .each do |p| titles[p.title] = p end
+
+        titles.each_value do |prog|
             begin
-                prog = @programmeTable[r]
                 url = prog.content[UrlRegexp]       # String[] method extract only 1st one.
 
                 $log.info { "episode Url : #{url}" }
@@ -712,15 +747,22 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                 $log.info { "save name : #{fName}" }
 
                 startDownOneFile(minfo, fName)
+
+                passiveMessage(i18n("Start Download programme '%s'") % [prog.title])
+
             rescue Timeout::Error, StandardError => e
-                $log.error { e }
-                KDE::MessageBox::information(self, i18n("There is not direct stream for programme '%s'.") % [prog.title])
+                if e.kind_of? RuntimeError
+                    $log.info { e.message }
+                else
+                    $log.error { e }
+                end
+                passiveMessage(i18n("There is no direct stream for this programme.\n%s" %[prog.title]))
             end
         end
     end
 
 
-    private
+    protected
     #
     def getSaveName(prog, ext='wma')
         tags = prog.categories.split(/,/)
@@ -765,10 +807,10 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
     def getChannelTitle
         case  @channelType
-        when 0
+        when TvType
         # get TV channel
             TVChannelRssTbl[ @channelIndex ][0]
-        when 1
+        when RadioType
         # get Radio channel
             RadioChannelRssTbl[ @channelIndex ][0]
         else
@@ -814,6 +856,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
     # slot :  periodically called to update task view.
     #
     protected
+    slots  :updateTask
     def updateTask
         @taskWin.each do |task|
             task.process.updateView
@@ -826,9 +869,12 @@ end
 #    main start
 #
 
-about = KDE::AboutData.new(APP_NAME, APP_NAME, KDE::ki18n(APP_NAME), APP_VERSION)
-about.setProgramIconName(':images/irecorder-22.png')
-KDE::CmdLineArgs.init(ARGV, about)
+$about = KDE::AboutData.new(APP_NAME, APP_NAME, KDE::ki18n(APP_NAME), APP_VERSION,
+                            KDE::ki18n('BBC iRecorder KDE')
+                           )
+$about.setProgramIconName(':images/irecorder-22.png')
+$about.addLicenseTextFile(APP_DIR + '/MIT-LICENSE')
+KDE::CmdLineArgs.init(ARGV, $about)
 # options = KDE::CmdLineOptions.new()
 # options.add( "+url", KDE::ki18n( "The url to record)" ),"")
 

data/lib/bbcnet.rb

@@ -5,7 +5,6 @@ require 'rubygems'
 require 'uri'
 require 'net/http'
 require 'open-uri'
-require 'rss'
 require 'nokogiri'
 require 'shellwords'
 require 'fileutils'
@@ -25,8 +24,8 @@ class BBCNet
     DirectStreamRegexp = URI.regexp(['mms', 'rtsp', 'rtmp', 'rtmpt'])
 
     class CacheMetaInfoDevice < CasheDevice::CacheDeviceBase
-        def initialize(expireDuration = 40*60, cacheMax=200)
-            super(expireDuration, cacheMax)
+        def initialize(cacheDuration = 40*60, cacheMax=200)
+            super(cacheDuration, cacheMax)
         end
 
         # return : [ data, key ]
@@ -81,6 +80,9 @@ class BBCNet
 #             res = IO.read("../tmp/iplayer-playlist-me.xml")
 
             doc = Nokogiri::XML(res)
+            item = doc.at_css("noItems")
+            raise "No Playlist " + item[:reason] if item
+
             item = doc.at_css("item")
             @media = item[:kind].gsub(/programme/i, '')
             @duration = item[:duration].to_i
@@ -158,11 +160,6 @@ class BBCNet
     #
 
     # convert epsode Url to console Url
-    # example
-    #  from
-    #    http://www.bbc.co.uk/iplayer/episode/b007jpkt/Miss_Marple_A_Caribbean_Mystery_Episode_1/
-    #  to
-    #    http://www.bbc.co.uk/iplayer/console/b007jpkt
     def self.getPlayerConsoleUrl(url)
        "http://www.bbc.co.uk/iplayer/console/" + extractPid(url)
     end
@@ -188,7 +185,7 @@ class BBCNet
         while url != old and not url[DirectStreamRegexp] do
             old = url
             res = BBCNet.read(url)
-            url = res[ DirectStreamRegexp ] or res[ UrlRegexp ] or old
+            url = res[ DirectStreamRegexp ] || res[ UrlRegexp ] || old
             $log.debug { "new url:#{url},  old url:#{old}" }
             $log.debug { "no url in response '#{res}'" } if url[ UrlRegexp ]
         end

data/lib/cache.rb

@@ -9,9 +9,9 @@ module CasheDevice
             attr_accessor :expireTime, :url, :key
         end
 
-        attr_accessor :expireDuration, :cacheMax
-        def initialize(expireDuration = 26*60, cacheMax=10)
-            @expireDuration = expireDuration      # 12 minutes
+        attr_accessor :cacheDuration, :cacheMax
+        def initialize(cacheDuration = 26*60, cacheMax=10)
+            @cacheDuration = cacheDuration      # 12 minutes
             @cache = Hash.new
             @cacheLRU = []          # Least Recently Used
             @cacheMax = cacheMax
@@ -46,7 +46,7 @@ module CasheDevice
             end
             cached = CachedData.new
             cached.url = url
-            cached.expireTime = startTime + @expireDuration
+            cached.expireTime = startTime + @cacheDuration
             data, cached.key = directRead(url)
             @cache[url] = cached
             @cacheLRU.push(cached)
@@ -67,22 +67,22 @@ end
 #   practical implementations.
 #
 class CacheRssDevice < CasheDevice::CacheDeviceBase
-    def initialize(expireDuration = 12*60, cacheMax=6)
-        super(expireDuration, cacheMax)
+    def initialize(cacheDuration = 12*60, cacheMax=6)
+        super(cacheDuration, cacheMax)
     end
 
     # return : [ data, key ]
     #  key : key to restore data.
     def directRead(url)
-         data = RSS::Parser.parse(CacheHttpDiskDevice.read(url))
+         data = Nokogiri::XML(CacheHttpDiskDevice.read(url))
          [ data, data ]
     end
 end
 
 
 class CacheHttpDiskDevice < CasheDevice::CacheDeviceBase
-    def initialize(expireDuration = 12*60, cacheMax=30)
-        super(expireDuration, cacheMax)
+    def initialize(cacheDuration = 12*60, cacheMax=50)
+        super(cacheDuration, cacheMax)
         @tmpdir = Dir.tmpdir + '/bbc_cache'
         FileUtils.mkdir_p(@tmpdir)
     end
@@ -96,11 +96,17 @@ class CacheHttpDiskDevice < CasheDevice::CacheDeviceBase
     # return : [ data, key ]
     #  key : key to restore data.
     def directRead(url)
-        puts "directRead(): " + self.class.name
+        $log.debug { "directRead(): " + self.class.name }
         tmpfname = tempFileName(url)
 
+        if File.exist?(tmpfname) then
+            $log.debug { "File ctime  : " + File.ctime(tmpfname).to_s}
+            $log.debug { "expire time : " + (File.ctime(tmpfname) + @cacheDuration).to_s }
+            $log.debug { "Now Time    : " + Time.now.to_s }
+        end
+
         if File.exist?(tmpfname) and
-                File.ctime(tmpfname) + @expireDuration > Time.now then
+                File.ctime(tmpfname) + @cacheDuration > Time.now then
             data = IO.read(tmpfname)
         else
             data = BBCNet.read(url)
@@ -110,6 +116,6 @@ class CacheHttpDiskDevice < CasheDevice::CacheDeviceBase
     end
 
     def tempFileName(url)
-        File.join(@tmpdir, url.scan(%r{\w+/\w+$}).first.gsub(%r|/|, '_'))
+        File.join(@tmpdir, url.scan(%r{(?:iplayer/)[\w\/]+$}).first.gsub!(/iplayer\//,'').gsub!(%r|/|, '_'))
     end
 end

data/lib/download.rb

@@ -7,7 +7,6 @@ require "bbcnet.rb"
 #
 #
 class DownloadProcess < Qt::Process
-    slots   'taskFinished(int,QProcess::ExitStatus)'
     attr_reader     :sourceUrl, :fileName
     attr_accessor   :taskItem
 
@@ -136,13 +135,12 @@ class DownloadProcess < Qt::Process
     def cancelTask
         if running? then
             self.terminate
+            taskFinished(1,0)
         end
     end
 
     def removeData
-        if running? then
-            self.terminate
-        end
+        cancelTask
         begin
             File.delete(@rawFilePath)
             File.delete(@outFilePath)
@@ -159,18 +157,23 @@ class DownloadProcess < Qt::Process
         Time.now - @startTime
     end
 
-    # slot :
+    slots   'taskFinished(int,QProcess::ExitStatus)'
     def taskFinished(exitCode, exitStatus)
         checkReadOutput
         if (exitCode.to_i.nonzero? || exitStatus.to_i.nonzero?) && checkErroredStatus then
             self.status = ERROR
-            $log.error { [ makeErrorMsg, "exitCode=#{exitCode}, exitStatus=#{exitStatus}" ] }
+            errMsg = makeErrorMsg
+            $log.error { [ errMsg, "exitCode=#{exitCode}, exitStatus=#{exitStatus}" ] }
+            passiveMessage(errMsg)
         else
             $log.info {
                 [ "Successed to download a File '%#2$s'",
                     "Successed to convert a File '%#2$s'", ][@stage] %
                 [ @sourceUrl, @rawFilePath ]
             }
+            if @stage == CONVERT then
+                passiveMessage(i18n("Download, Convert Complete. '%#1$s'") % [@outFilePath])
+            end
             nextTask
         end
     end
@@ -222,10 +225,10 @@ class DownloadProcess < Qt::Process
         # debug code.
         if DEBUG_DOWNLOAD then
             if rand > 0.4 then
-                cmdApp = "test/sleepjob.rb"
+                cmdApp = APP_DIR + "/mytests/sleepjob.rb"
                 cmdArgs = %w{ touch a/b/ }
             else
-                cmdApp = "test/sleepjob.rb"
+                cmdApp = APP_DIR + "/mytests/sleepjob.rb"
                 cmdArgs = %w{ touch } << @rawFilePath.shellescape
             end
         end
@@ -246,10 +249,10 @@ class DownloadProcess < Qt::Process
         # debug code.
         if DEBUG_DOWNLOAD then
             if rand > 0.4 then
-                cmdApp = "test/sleepjob.rb"
+                cmdApp = APP_DIR + "/mytests/sleepjob.rb"
                 cmdArgs = %w{ touch a/b/ }
             else
-                cmdApp = "test/sleepjob.rb"
+                cmdApp = APP_DIR + "/mytests/sleepjob.rb"
                 cmdArgs = %w{ cp -f } + [ @rawFilePath.shellescape, @outFilePath.shellescape ]
             end
         end
@@ -300,7 +303,15 @@ class DownloadProcess < Qt::Process
         when CONVERT
             begin
                 $log.debug { "check duration for convert." }
-                AudioFile.getDuration(@outFilePath) < AudioFile.getDuration(@rawFilePath) - 10
+                outDuration = AudioFile.getDuration(@outFilePath)
+                rawDuration = AudioFile.getDuration(@rawFilePath)
+                isError = outDuration < rawDuration - 3*60 - 10
+                if isError then
+                    $log.warn { [ "duration check error",
+                                  " outDuration : #{outDuration}",
+                                  " rawDuration : #{rawDuration}" ] }
+                end
+                isError
             rescue => e
                 $log.warn { e }
                 true

data/lib/mylibs.rb

@@ -105,6 +105,11 @@ class HBoxLayoutWidget < Qt::Widget
     end
 end
 
+def passiveMessage(text)
+    %x{ kdialog --passivepopup #{text.shellescape} }
+end
+
+
 #--------------------------------------------------------------------------
 #
 #

data/lib/programmewin.rb

@@ -3,8 +3,6 @@
 #
 #
 class ProgrammeTableWidget < Qt::TableWidget
-    slots   'filterChanged(const QString &)'
-
     #
     #
     class Programme
@@ -46,7 +44,6 @@ class ProgrammeTableWidget < Qt::TableWidget
     #------------------------------------------------------------------------
     #
     #
-    attr_accessor :mediaFilter
 
     def initialize()
         super(0, 3)
@@ -58,7 +55,6 @@ class ProgrammeTableWidget < Qt::TableWidget
         self.sortingEnabled = true
         sortByColumn(2, Qt::DescendingOrder )
 
-        @mediaFilter = ''
 
         # Hash table : key column_0_item  => Programme entry.
         @table = Hash.new
@@ -82,12 +78,10 @@ class ProgrammeTableWidget < Qt::TableWidget
     # slot : called when filterLineEdit text is changed.
     #
     public
-
+    slots   'filterChanged(const QString &)'
     def filterChanged(text)
         return unless text
 
-        text += ' ' + @mediaFilter unless @mediaFilter.empty?
-
         regxs = text.split(/[,\s]+/).map do |w|
                     /#{Regexp.escape(w.strip)}/i
         end
@@ -117,47 +111,47 @@ class ProgrammeTableWidget < Qt::TableWidget
 
     protected
     def contextMenuEvent(e)
-        item = itemAt(e.pos)
+        prog = self[itemAt(e.pos).row]
         menu = createPopup
-        execPopup(menu, e.globalPos, item)
+        action = menu.exec(e.globalPos)
+        action and execPopup(action, prog)
+        menu.deleteLater
     end
 
     def createPopup()
         menu = Qt::Menu.new
+        a = menu.addAction(KDE::Icon.new('search'), i18n('Search Same Programme'))
+        a.setVData('searchSame@')
+        a = menu.addAction(KDE::Icon.new('search'), i18n('Search Same Category tags'))
+        a.setVData('searchSameTags@')
+        menu.addSeparator
         insertPlayerActions(menu)
         menu
     end
 
-    def execPopup(menu, pos, item)
-        action = menu.exec(pos)
-        if action then
-            action.data
-#             $log.code { "execute : '#{action.vData}'" }
-                cmd, exe = action.vData.split(/@/, 2)
-#                 $log.code { "cmd(#{cmd}), exe(#{exe})" }
-                case cmd
-                when 'play'
-                    playMedia(exe, item)
-                else
-#                     self.method(cmd).call(item)
-                end
+    def execPopup(action, item)
+        $log.code { "execute : '#{action.vData}'" }
+        cmd, exe = action.vData.split(/@/, 2)
+        $log.code { "cmd(#{cmd}), exe(#{exe})" }
+        if cmd == 'play'
+            playMedia(exe, item)
+        elsif self.respond_to?(cmd)
+            self.method(cmd).call(item)
+        else
+            $log.warn { "No method #{cmd} in contextmenu." }
         end
-        menu.deleteLater
     end
 
     def insertPlayerActions(menu)
         Mime::services('.wma').each do |s|
-            if s.exec then
-                exeName = s.exec[/\w+/]
-                a = menu.addAction(KDE::Icon.new(exeName), 'Play with ' + exeName)
-                a.setVData('play@' + s.exec)
-            end
+            exeName = s.exec[/\w+/]
+            a = menu.addAction(KDE::Icon.new(exeName), 'Play with ' + exeName)
+            a.setVData('play@' + s.exec)
         end
     end
 
-    def playMedia(exe, item)
+    def playMedia(exe, prog)
         begin
-            prog = self[item.row]
             url = prog.content[UrlRegexp]       # String[] method extract only 1st one.
 
             $log.info { "episode Url : #{url}" }
@@ -168,7 +162,7 @@ class ProgrammeTableWidget < Qt::TableWidget
             args = args.split(/\s+/).map do |a|
                 a.gsub(/%\w/, url)
             end
-#             $log.debug { "execute cmd '#{cmd}', args '#{args.inspect}'" }
+            $log.debug { "execute cmd '#{cmd}', args '#{args.inspect}'" }
             proc = Qt::Process.new(self)
             proc.start(cmd, args)
 
@@ -177,6 +171,15 @@ class ProgrammeTableWidget < Qt::TableWidget
             KDE::MessageBox::information(self, i18n("There is not direct stream for this programme."))
         end
     end
+
+    signals  'filterRequest(const QString &)'
+    def searchSame(prog)
+        emit filterRequest( prog.title.sub(/:.*/, '') )
+    end
+
+    def searchSameTags(prog)
+        emit filterRequest( prog.categories )
+    end
 end
 
 

data/lib/taskwin.rb

@@ -1,4 +1,4 @@
-#---------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------------------
 #
 #  Task Window
 #
@@ -107,7 +107,6 @@ class TaskWindow < Qt::Widget
         # context menu : right click popup menu.
         protected
         def contextMenuEvent(e)
-            $log.misc { "right button is clicked." }
             wItem = itemAt(e.pos)
             if wItem
                 openContextPopup(e.globalPos, wItem)
@@ -121,7 +120,6 @@ class TaskWindow < Qt::Widget
         def openContextPopup(pos, wItem)
             poRow =  wItem.row
             poColumn = wItem.column
-            $log.misc { "right clicked item (row:#{poRow}, column:#{poColumn})" }
             process = taskItemAtRow(wItem.row).process
 
             menu = Qt::Menu.new
@@ -182,7 +180,9 @@ class TaskWindow < Qt::Widget
                 if process.rawDownloaded? then
                     createPlayers(menu, i18n('Play File with'), "playMP3@", '.mp3')
                 end
-                createPlayers(menu, i18n('Play Temp File with'), "playTemp@", '.wma')
+                if !process.finished? or File.exist?(process.rawFilePath) then
+                    createPlayers(menu, i18n('Play Temp File with'), "playTemp@", '.wma')
+                end
             end
         end
 
@@ -250,9 +250,10 @@ class TaskWindow < Qt::Widget
         # contextMenu Event
         def removeTaskData(process, wItem)
             if process.running? then
-                process.removeData
-                $log.info { "task and data removed." }
+                process.cancelTask
             end
+            process.removeData
+            $log.info { "task and data removed." }
             ti = taskItemAtRow(wItem.row)
             deleteItem(ti)
         end
@@ -294,6 +295,7 @@ class TaskWindow < Qt::Widget
         def initialize(text)
             super(text)
             self.flags = Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled
+            self.toolTip = text
         end
     end
 

data/resources/bbcstyle.qss

@@ -24,6 +24,11 @@
 }
 
 
+QLabel a {
+    text-decoration: underline; color: rgb(84, 174, 255);
+}
+
+
 /*
     Popup & Menu
 */

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irecorder
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: linux
 authors: 
 - ruby.twiddler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +09:00
+date: 2010-09-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,7 @@ files:
 - Rakefile
 - resources/bbcstyle.qss
 has_rdoc: true
-homepage: http://wiki.github.com/rubytwiddler/irecorder/
+homepage: http://github.com/rubytwiddler/irecorder/wiki
 licenses: 
 - MIT-LICENSE
 post_install_message: 
@@ -96,6 +96,7 @@ requirements:
 - korundum4
 - qtwebkit
 - kio
+- ktexteditor
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: