irecorder 0.0.4-linux → 0.0.5-linux

data/README

@@ -1,10 +1,18 @@
 BBC iPlayer like audio recorder with KDE GUI.
 You can browse BBC Radio programmes and click to download stream file.
-file will be converted mp3 files automatically.
-iplayer allow to play without any other browser or play on your prefered browser.
+files will be converted to mp3 files automatically.
+irecorder allow to play without any other browser or play on your prefered browser.
 
- Installation
-============
+== KDE ruby
+==============
+irecorder require kdebindings.
+please check your distro package to install it.
+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
+==================
 install most important package kdebindings4.
  on Mandriva Linux use urpmi command.
 
@@ -28,8 +36,8 @@ launch irecorder just type irecorder.rb
   # irecorder.rb
 
 
- Build Gem
-============
+== Build Gem
+=================
 if you want to gem package from source, use rake command.
 
   # rake gem

data/Rakefile

@@ -6,9 +6,10 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
     s.name = "irecorder"
-    s.version = "0.0.4"
+    s.version = "0.0.5"
     s.author = "ruby.twiddler"
     s.email = "ruby.twiddler at gmail.com"
+    s.homepage = "http://wiki.github.com/rubytwiddler/irecorder/"
     s.platform = "linux"
     s.summary = "BBC iPlayer like audio recorder with KDE GUI."
     s.files = FileList["{bin,lib}/**/*"].to_a
@@ -22,12 +23,9 @@ spec = Gem::Specification.new do |s|
 BBC iPlayer like audio recorder with KDE GUI.
 You can browse BBC Radio programmes and click to download stream file.
 files will be converted to mp3 files automatically.
-iplayer allow to play without any other browser or on your prefered media player
+irecorder allow to play without any other browser or play on your prefered browser.
 like mplayer.
 irecorder require kdebindings.
- svn://anonsvn.kde.org/home/kde/branches/KDE/4.4/kdebindings
- http://websvn.kde.org/branches/KDE/4.4/kdebindings/
-please check your distro package to install it.
     EOF
     s.has_rdoc = false
     s.extra_rdoc_files = ["README"]
@@ -65,3 +63,11 @@ task :install4rpm do
     installToDir('bin/irecorder', prefix, :mode => 0755)
 end
 
+
+resouce_files = [ 'resources/irecorder.qrc' ] + FileList['resources/images/*.png']
+desc "package resources"
+file 'lib/irecorder_resource.rb' => resouce_files  do
+    %x{ rbrcc resources/irecorder.qrc >lib/irecorder_resource.rb }
+end
+
+task :resource => 'lib/irecorder_resource.rb'

data/bin/irecorder.rb

@@ -2,8 +2,8 @@
 #
 #    2010 by ruby.twiddler@gmail.com
 #
-#     IPlayer interface
-#      record real/wma (rtsp/mms) audio/video stream
+#     iPlayer interface
+#      record real/wma (rtsp/mms) audio stream
 #
 
 $KCODE = 'UTF8'
@@ -12,7 +12,7 @@ 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.3"
+APP_VERSION = "0.0.5"
 
 # standard libs
 require 'rubygems'
@@ -32,207 +32,16 @@ require 'qtwebkit'
 # my libraries and programs
 #
 $:.unshift(LIB_DIR)
+require "irecorder_resource"
 require "bbcnet"
 require "mylibs"
 require "logwin"
 require "taskwin"
 require "download"
+require "programmewin"
 require "settings"
 
 
-
-
-
-#---------------------------------------------------------------------------------------------
-#---------------------------------------------------------------------------------------------
-
-
-
-
-
-#---------------------------------------------------------------------------------------------
-#
-#
-class ProgrammeTableWidget < Qt::TableWidget
-    slots   'filterChanged(const QString &)'
-
-    #
-    #
-    class Programme
-        attr_reader :titleItem, :categoriesItem, :updatedItem
-        attr_reader :content, :link
-
-        def initialize(title, categories, updated, content, link)
-            @titleItem = Item.new(title)
-            @categoriesItem = Item.new(categories)
-            @updatedItem = Item.new(updated)
-            @content = content
-            @link = link
-        end
-
-        def title
-            @titleItem.text
-        end
-
-        def categories
-            @categoriesItem.text
-        end
-
-        def updated
-            @updatedItem.text
-        end
-    end
-
-    #
-    #
-    class Item < Qt::TableWidgetItem
-        def initialize(text)
-            super(text)
-            self.flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled
-            self.toolTip = text
-        end
-    end
-
-
-    #------------------------------------------------------------------------
-    #
-    #
-    attr_accessor :mediaFilter
-
-    def initialize()
-        super(0, 3)
-
-        setHorizontalHeaderLabels(['Title', 'Category', 'Updated'])
-        self.horizontalHeader.stretchLastSection = true
-        self.selectionBehavior = Qt::AbstractItemView::SelectRows
-        self.alternatingRowColors = true
-        self.sortingEnabled = true
-        sortByColumn(2, Qt::DescendingOrder )
-
-        @mediaFilter = ''
-
-        # Hash table : key column_0_item  => Programme entry.
-        @table = Hash.new
-    end
-
-    def addEntry( row, title, categories, updated, content, link )
-        entry = Programme.new(title, categories, updated, content, link)
-        setItem( row, 0, entry.titleItem )
-        setItem( row, 1, entry.categoriesItem )
-        setItem( row, 2, entry.updatedItem )
-        @table[entry.titleItem] = entry
-    end
-
-    # return Programme object.
-    def [](row)
-        @table[item(row,0)]
-    end
-
-
-    #
-    # slot : called when filterLineEdit text is changed.
-    #
-    public
-
-    def filterChanged(text)
-        return unless text
-
-        text += ' ' + @mediaFilter unless @mediaFilter.empty?
-
-        regxs = text.split(/[,\s]+/).map do |w|
-                    /#{Regexp.escape(w.strip)}/i
-        end
-        rowCount.times do |r|
-            i0 = item(r,0)
-            i1 = item(r,1)
-            i2 = item(r,2)
-            txt = ((i0 && i0.text) || '') + ((i1 && i1.text) || '') + ((i2 && i2.text) || '')
-            if regxs.all? do |rx| rx =~ txt end then
-                showRow(r)
-            else
-                hideRow(r)
-            end
-        end
-    end
-
-    GroupName = "ProgrammeTable"
-    def writeSettings
-        config = $config.group(GroupName)
-        config.writeEntry('Header', horizontalHeader.saveState)
-    end
-
-    def readSettings
-        config = $config.group(GroupName)
-        horizontalHeader.restoreState(config.readEntry('Header', horizontalHeader.saveState))
-    end
-
-    protected
-    def contextMenuEvent(e)
-        item = itemAt(e.pos)
-        menu = createPopup
-        execPopup(menu, e.globalPos, item)
-    end
-
-    def createPopup()
-        menu = Qt::Menu.new
-        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
-        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
-        end
-    end
-
-    def playMedia(exe, item)
-        begin
-            prog = self[item.row]
-            url = prog.content[UrlRegexp]       # String[] method extract only 1st one.
-
-            $log.info { "episode Url : #{url}" }
-            minfo = BBCNet::MetaInfo.get(url).update
-            url = minfo.wma.url
-
-            cmd, args = exe.split(/\s+/, 2)
-            args = args.split(/\s+/).map do |a|
-                a.gsub(/%\w/, url)
-            end
-#             $log.debug { "execute cmd '#{cmd}', args '#{args.inspect}'" }
-            proc = Qt::Process.new(self)
-            proc.start(cmd, args)
-
-        rescue => e
-            $log.error { e }
-            KDE::MessageBox::information(self, i18n("There is not direct stream for this programme."))
-        end
-    end
-end
-
-
-
-
 #---------------------------------------------------------------------------------------------
 #---------------------------------------------------------------------------------------------
 #
@@ -295,7 +104,7 @@ class MainWindow < KDE::MainWindow
         reloadStyleAction.setShortcut(KDE::Shortcut.new('Ctrl+R'))
         clearStyleAction = KDE::Action.new(KDE::Icon.new('list-remove'), i18n('&Clear StyleSheet'), self)
         clearStyleAction.setShortcut(KDE::Shortcut.new('Ctrl+L'))
-        quitAction = KDE::Action.new(KDE::Icon.new('exit'), i18n('&Quit'), self)
+        quitAction = KDE::Action.new(KDE::Icon.new('application-exit'), i18n('&Quit'), self)
         quitAction.setShortcut(KDE::Shortcut.new('Ctrl+Q'))
         fileMenu = KDE::Menu.new('&File', self)
         fileMenu.addAction(recordAction)
@@ -534,6 +343,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                     )
                 end
             )
+            vbxw.addWidget( @listTitleLabel = Qt::Label.new('') )
             vbxw.addWidget(@programmeTable)
 
             # 'Start Download' Button
@@ -552,12 +362,14 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                 connect( w, SIGNAL(:clicked), self, SLOT(:mediaFilterChanged) )
             end
 
-            playBtn = KDE::PushButton.new( KDE::Icon.new('media-playback-start'), i18n("Play")) do |w|
+            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
 
-            downloadBtn = KDE::PushButton.new( KDE::Icon.new('arrow-down'), i18n("Download")) do |w|
+            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
@@ -621,6 +433,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
     def closeEvent(event)
         writeSettings
         super(event)
+        $config.sync    # important!  qtruby can't invoke destructor properly.
     end
 
     def readSettings
@@ -628,6 +441,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         @mainTabPage.restoreState(config.readEntry('MainTabPageState', @mainTabPage.saveState))
         @progTableFrame.restoreState(config.readEntry('ProgTableFrame',
                                                       @progTableFrame.saveState))
+        @channelTypeToolBox.currentIndex = config.readEntry('ChannelType', @channelTypeToolBox.currentIndex)
 
         @programmeTable.readSettings
         @taskWin.readSettings
@@ -637,9 +451,20 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         config = $config.group(GroupName)
         config.writeEntry('MainTabPageState', @mainTabPage.saveState)
         config.writeEntry('ProgTableFrame', @progTableFrame.saveState)
+        config.writeEntry('ChannelType', @channelTypeToolBox.currentIndex)
 
         @programmeTable.writeSettings
         @taskWin.writeSettings
+#         dumpConfig(GroupName)
+    end
+
+    def dumpConfig(group)
+        puts "dump #{group} config"
+        entries  = KDE::Global.config.entryMap(group)
+        confGroup = KDE::Global.config.group(group)
+        entries.each do |key, val|
+            puts "     key(#{key}) = #{val.inspect}"
+        end
     end
 
     # ------------------------------------------------------------------------
@@ -664,6 +489,9 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         color = "#%06x" % (@programmeSummaryWebView.palette.color(Qt::Palette::Text).rgb & 0xffffff)
 
         html = <<-EOF
+        <style type="text/css">
+        img { float: left; margin: 4px; }
+        </style>
         <font color="#{color}">
           #{prog.content}
         </font>
@@ -733,7 +561,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                 url = prog.content[UrlRegexp]       # String[] method extract only 1st one.
 
                 $log.info { "episode Url : #{url}" }
-                minfo = BBCNet::MetaInfo.get(url).update
+                minfo = BBCNet::CacheMetaInfoDevice.read(url)
                 $log.debug { "#{minfo.inspect}" }
                 url = minfo.wma.url
 
@@ -762,13 +590,15 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
         $log.info{ "feeding from '#{feedAdr}'" }
 
         begin
-            makeTablefromRss( BBCNet.read(feedAdr) )
+            makeTablefromRss( CacheRssDevice.read(feedAdr) )
         rescue IOError, OpenURI::HTTPError => e
             $log.error { e }
         end
         mediaFilterChanged
+        setListTitle
     end
 
+
     #
     # get feed address
     #
@@ -794,15 +624,31 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
         return nil  if channelStr.nil?
 
-        list = %w[ list highlights popular ][@listTypeGroup.checkedId]
+        @listType = @listTypeGroup.checkedId
+        list = %w[ list highlights popular ][@listType]
 
         "http://feeds.bbc.co.uk/iplayer/#{channelStr}/#{list}"
     end
 
 
+    def getCategoryTitle
+        CategoryRssTbl[ @channelIndex ][0]
+    end
+
+    def setListTitle
+        names = []
+        if getChannelTitle
+            names << getChannelTitle
+        else
+            names << CategoryRssTbl[ @channelIndex ][0]
+        end
+        names << %w[ All Highlights Popular ][@listType]
+        @listTitleLabel.text = names.join(' / ')
+    end
+
     protected
-    def makeTablefromRss(rssRaw)
-        rss = RSS::Parser.parse(rssRaw)
+    def makeTablefromRss(rss)
+#         rss = RSS::Parser.parse(rssRaw)
         sortFlag = @programmeTable.sortingEnabled
         @programmeTable.sortingEnabled = false
         @programmeTable.hide
@@ -816,7 +662,8 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
             title = i.title.content.to_s
             updated = i.updated.content.to_s
             contents = i.content.content
-            link = i.links.find do |l| l.rel == 'self' end.href
+            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(',')
             $log.misc { title }
             @programmeTable.addEntry( r, title, categories, updated, contents, link )
@@ -858,7 +705,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
                 url = prog.content[UrlRegexp]       # String[] method extract only 1st one.
 
                 $log.info { "episode Url : #{url}" }
-                minfo = BBCNet::MetaInfo.get(url).update
+                minfo = BBCNet::CacheMetaInfoDevice.read(url)
                 url = minfo.wma.url
 
                 fName = getSaveName(prog, 'wma')
@@ -913,7 +760,7 @@ BBC iPlayer like audio (mms/rtsp) stream recorder.
 
     # channel [BBC Radio 4, ..]
     def getChannelName
-        title = getChannelTitle
+        getChannelTitle
     end
 
     def getChannelTitle
@@ -980,6 +827,7 @@ end
 #
 
 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)
 # options = KDE::CmdLineOptions.new()
 # options.add( "+url", KDE::ki18n( "The url to record)" ),"")