[Slimp3-checkins] CVS: slimp3/server/lib/SliMP3/Buttons Browse.pm,1.33,1.34

[Sean A. <sli...@us...>]

Update of /cvsroot/slimp3/slimp3/server/lib/SliMP3/Buttons
In directory usw-pr-cvs1:/tmp/cvs-serv868/Buttons

Modified Files:
	Browse.pm 
Log Message:
General cleanup in preparation for background playlist building - please 
let me know if I've broken anything:

New module Scan.pm - this will eventually be where we do the background
playlist creation. For now I'm just moving playlistget into there and
changing the interface a little bit, to get us closer to something that   
can work as a background task.

Instead of receiving an array returned by playlistget, now you call
addToList, and give it a reference to the list which it should add the
contents of the specified dir, file, or URL. the playListCache is
temporarily disabled. addToList returns the number of items added.

There were a number of other functions which really didn't belong in
Playlist.pm, and a todo item stating such. I hate to make zillions of tiny
modules, but I couldn't think of a better place for them. So I've made two
new modules. In all likelihood we'll need more functions here in the
future, so I don't feel too bad about the following:

SliMP3::Parse
   M3U()
   PLS()
SliMP3::RemoteStream
   OpenRemoteStream()

Moved fixPath() to SliMP3::Misc




Index: Browse.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/Buttons/Browse.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Browse.pm	2002/01/29 05:26:33	1.33
--- Browse.pm	2002/01/29 08:22:16	1.34
***************
*** 15,18 ****
--- 15,19 ----
  use SliMP3::Buttons::TrackInfo;
  use SliMP3::Strings qw (string);
+ use SliMP3::Scan;
  
  # Each button on the remote has a function:
***************
*** 178,193 ****
  	if (SliMP3::Misc::isList($pwd)) {
  		my $itemCount = 0;
! 		my @newitems;
! 
  		$::d_f && print "getting playlist " . $pwd . " as directory\n";
! 
! 		@newitems = SliMP3::Playlist::playlistget($pwd, 0);
! 
! 		# copy the newitems to the list
! 		foreach my $item ( @newitems ) {
! 			$client->dirItems($itemCount++, $item);
! 			$::d_f && print("adding $itemCount " . $item . " to diritems\n");
! 		}
! 	
  		$client->numberOfDirItems($itemCount);
  	} else {
--- 179,186 ----
  	if (SliMP3::Misc::isList($pwd)) {
  		my $itemCount = 0;
! 		
  		$::d_f && print "getting playlist " . $pwd . " as directory\n";
! 		@{$client->dirItems}=();
! 		$itemCount = SliMP3::Scan::addToList($client->dirItems, $pwd, 0);
  		$client->numberOfDirItems($itemCount);
  	} else {