Tags: patch
Severity: normal

Here's a patch.  I also discovered another bug in playlist generation,
which is why I'm changing the severity.



--- podget.orig 2008-01-09 16:54:23.000000000 -0700
+++ podget      2008-01-09 17:35:44.000000000 -0700
@@ -566,6 +566,19 @@
                         fi
                     fi
 
+                    # Fix case where filename part of URI is constant
+                    if [ ${filename_dupefix} -gt 0 ] ; then
+                        if [ -z "$mod_filename" ] ; then
+                            mod_filename=${url_filename}
+                        fi
+                        mod_prefix="${url_base%%/}"
+                        mod_prefix="${mod_prefix##*/}"
+                        mod_filename="${mod_prefix##*/}_${mod_filename}"
+                        if [ $verbosity -ge 3 ] ; then 
+                            echo "FILENAME DUPLICATE FIXED: $mod_filename"
+                        fi
+                    fi
+
                     mkdir -p "$dir_library/$feed_category/$feed_name"
                     dtest=$(fgrep $url $dir_log/$log_comp)
                     
@@ -574,7 +587,7 @@
                             echo -e "\nDownloading $url_filename from 
$url_base"
                         fi
                         
-                        if [ $modify_filename -gt 0 ] || [ $filename_formatfix 
-gt 0 ] ; then
+                        if [ -n "$mod_filename" ] ; then
                             wget $wget_options -O 
"$dir_library/$feed_category/$feed_name/$mod_filename" $url
                         else
                             wget $wget_options -P 
"$dir_library/$feed_category/$feed_name/" $url
@@ -583,7 +596,7 @@
                         if [ $? ] ; then
                             echo $url >> $dir_log/$log_comp
                             if [ -n "$playlist_name" ] ; then
-                                if [ $modify_filename -gt 0 ] ; then
+                                if [ -n "$mod_filename" ] ; then
                                     echo 
"$feed_category/$feed_name/$mod_filename" >> $dir_library/$playlist_name
                                 else
                                     echo 
"$feed_category/$feed_name/$url_filename" >> $dir_library/$playlist_name
@@ -623,7 +636,8 @@
 
     # Sort new playlist
     if [ -e "$dir_library/$playlist_name" ] ; then 
-        cat "$dir_library/$playlist_name" | sort > 
"$dir_library/$playlist_name"
+        sort "$dir_library/$playlist_name" > 
"$dir_library/$playlist_name.sorted"
+        mv "$dir_library/$playlist_name.sorted" "$dir_library/$playlist_name"
         
         # Create ASX Playlist
         if [ ${asx_playlist} -gt 0 ] ; then 

-- 
Rob

Attachment: signature.asc
Description: Digital signature

Reply via email to