prefer local directory playlists

1 files changed, 5 insertions, 4 deletions

diff --git a/bin/psycamp b/bin/psycamp
index a6ca3ce..6ae4b43 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -150,7 +150,8 @@ my $screen = 0;
         $tmpdir='/tmp' unless -d $tmpdir and -w _;
         $tmpdir='.' unless -d $tmpdir and -w _;
         # $tmplock="$tmpdir/.psycamp-copylock";
-        $playlist="$tmpdir/playlist-$ENV{USER}.m3u";
+        $playlist=".psycamp-$ENV{USER}.m3u";
+        $playlist="$tmpdir/$playlist" unless -w $playlist or -w '.';
 
 MAIN: {
         if ($#ARGV >= 0) {
@@ -1334,7 +1335,7 @@ sub load {
         local *L;
         return unless open (L, $playlist);
         for ($NS=0; <L>;) {
-                chomp;
+                s/\r?\n$//;
                 if ($opt_L and not -r $_) {
                         print "Skipping $_\n";
                         next;
@@ -1356,7 +1357,7 @@ sub save {
         foreach my $i ($cs+1 .. $NS-1) {
                 my $f = $file[$order[$i]];
                 print L $ENV{PWD}, '/' unless $f =~ m!^/!;
-                print L $f, "\n";
+                print L $f, "\r\n";
         }
         close L;
 }
@@ -1371,7 +1372,7 @@ sub edit {
 
 sub addtolist {
         if (open(A, ">>playlist.m3u")) {
-                print A "$CurrentFile\n";
+                print A "$CurrentFile\r\n";
                 close A;
                 print YELLOW, "\rAdded $CurrentFile to ./playlist.m3u \n", RESET;
                 return;