Menu
▾
▴
[Ngetsuite-cvs] ngetsuite/ngetsuite articles.rb,1.3,1.4 core.rb,1.30,1.31 downloadmanager.rb,1.20,1.21 group.rb,1.32,1.33 queue.rb,1.21,1.22 queue_file.rb,1.14,1.15
|
From: <jj...@us...> - 2004-02-07 16:24:13
|
Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18697/ngetsuite Modified Files: articles.rb core.rb downloadmanager.rb group.rb queue.rb queue_file.rb Log Message: typos fixed the download directory to the directory of the group instead of the group name added -L option to list the releases (beta) Index: articles.rb =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/articles.rb,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** articles.rb 6 Feb 2004 23:46:59 -0000 1.3 --- articles.rb 7 Feb 2004 16:21:20 -0000 1.4 *************** *** 4,8 **** module NgetSuite - class ArticleList < Db::DbList def getclass --- 4,7 ---- *************** *** 13,17 **** class Article - include Utils include Db --- 12,15 ---- *************** *** 38,42 **** class Release - include Utils include Db --- 36,39 ---- *************** *** 72,78 **** # if guessed from the subject (0 if not) def Release.filenb_from_subject(subject) ! subject =~ /[\[\(]?(\d+)([\/]|\s*of\s*)(\d+)[\]\)]?/ ! return [$1.to_i, $3.to_i] end --- 69,75 ---- # if guessed from the subject (0 if not) def Release.filenb_from_subject(subject) ! subject =~ /[\[\(]?(\d+)(?:[\/]|\s*of\s*)(\d+)[\]\)]?/ ! return [$1.to_i, $2.to_i] end *************** *** 166,171 **** end def to_s ! "#{@_mid}: #{@_nbactual}/#{@_nbexpected} [#{@_rlsmap}]" end --- 163,194 ---- end + def Release.list(groupid = '') + req = 'select articles.subject,articles.group,releases.rlsmap,releases.nbactual,releases.nbexpected from releases,articles where articles.mid = releases.mid' + + if (groupid != '') + name = Group.getname(groupid) + req += " and articles.group = '#{name}'" + end + + req += ' order by articles.time asc' + + sth = Db.dbh.execute req + + i = 0 + subj, grp, rlsmap, nbact, nbtot = nil + #rls = nil + sth.fetch do |row| + #rls = Release.new(name, row[2].to_s, true) + #puts "[#{i}] #{rls} (#{row[0]})" + subj, grp, rlsmap, nbact, nbtot = *row + puts "[#{Utils.blue i}] #{Utils.yellow nbact}/#{Utils.yellow nbtot} [#{Utils.green rlsmap}] \"#{subj}\"" + i += 1 + end + sth.finish + puts "No release found." if i == 0 + end + def to_s ! "#{Utils.green @_mid}: #{@_nbactual}/#{@_nbexpected} [#{Utils.yellow @_rlsmap}]" end Index: core.rb =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/core.rb,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** core.rb 6 Feb 2004 23:46:59 -0000 1.30 --- core.rb 7 Feb 2004 16:21:20 -0000 1.31 *************** *** 4,7 **** --- 4,8 ---- require 'ngetsuite/group' require 'ngetsuite/nfo' + require 'ngetsuite/articles' require 'dbi' require 'drb' *************** *** 105,108 **** --- 106,113 ---- end + def list_releases(groupid = '') + Release.list(groupid) + end + def queue_article(groupid, article_id, prio = '5') begin *************** *** 202,205 **** --- 207,212 ---- when 'list-nfos' list_nfos(arg) + when 'list-releases' + list_releases(arg) when 'show-nfo' args = arg.split(',') Index: downloadmanager.rb =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** downloadmanager.rb 6 Feb 2004 23:46:59 -0000 1.20 --- downloadmanager.rb 7 Feb 2004 16:21:20 -0000 1.21 *************** *** 66,70 **** @current_dlers += 1 id, group, type, value, subdir, prio = row.values_at(0, 1, 2, 3, 4, 5) ! log "found #{value} for group #{group}\n" dler = Downloader.new(id, type, value, group, @basedir + File::Separator + subdir, prio) @dlers[id] = dler --- 66,70 ---- @current_dlers += 1 id, group, type, value, subdir, prio = row.values_at(0, 1, 2, 3, 4, 5) ! log "found /#{value}/ for group #{group}\n" dler = Downloader.new(id, type, value, group, @basedir + File::Separator + subdir, prio) @dlers[id] = dler Index: group.rb =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** group.rb 7 Feb 2004 00:21:15 -0000 1.32 --- group.rb 7 Feb 2004 16:21:20 -0000 1.33 *************** *** 282,286 **** rls.insert_to_db ! debug "Inserted #{nb_releases} in #{Time.now-t}s" end --- 282,286 ---- rls.insert_to_db ! debug "Inserted #{nb_releases} releases in #{Time.now-t}s" end Index: queue.rb =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue.rb,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** queue.rb 6 Feb 2004 23:46:59 -0000 1.21 --- queue.rb 7 Feb 2004 16:21:20 -0000 1.22 *************** *** 117,120 **** --- 117,123 ---- @_period = period @_subdir = group + if group + @_subdir = Group.getgroup(group)._directory.sub(/#{$config['basedir']}\/*/, '') + end update_from_db if fetch_from_db end Index: queue_file.rb =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue_file.rb,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** queue_file.rb 2 Feb 2004 17:44:19 -0000 1.14 --- queue_file.rb 7 Feb 2004 16:21:20 -0000 1.15 *************** *** 23,28 **** # database and returns the number of rows deleted def QueueFile.clean(queueid) ! rows = Dbh.dbh.do "delete * from `queue_files` ! where `queue_id` = '#{queueid}'" return rows end --- 23,27 ---- # database and returns the number of rows deleted def QueueFile.clean(queueid) ! rows = Db.dbh.do "delete from `queue_files` where `queue_id` = '#{queueid}'" return rows end |
