added optional commandline options

Makefile

@@ -7,8 +7,8 @@ OBJ        = $(SRC:src/%.c=$(BUILD_PATH)/%.o)
 INCLUDES   = -Iinclude \
 			 -I/usr/include
 
-CFLAGS	   = -W -Wall -g
-LDFLAGS	   = -L/usr/lib -lcurl
+CFLAGS	   = -W -Wall -g -D_GNU_SOURCE
+LDFLAGS	   = -L/usr/lib -lcurl -ltag_c
 
 all: prepare $(EXEC)
 

README.mkd

@@ -1,15 +1,18 @@
 SHOUTcast Recorder
 ==================
 
-SHOUTcast Recorder is able to record and store SHOUTcast stream automatically
-into separate mp3 files. This software was initially conceived to understand
-the SHOUTcast protocol, not really to record web radios ;) The fun part is to
-play with the protocol !
+SHOUTcast Recorder is able to record and store SHOUTcast stream automatically into separate mp3 files. This software was initially conceived to understand the SHOUTcast protocol, not really to record web radios ;) The fun part is to play with the protocol !
 
 Dependencies
 ------------
 
 - libcurl
+	- sudo apt-get install libcurl-dev
+	- sudo apt-get install libcurl4-openssl-dev
+- taglib
+	- sudo apt-get install libtag1-dev
+	- sudo apt-get install libtagc0-dev
+
 
 How does it work ?
 ------------------
@@ -23,27 +26,113 @@ How does it work ?
 - At the end of each block, we write gathered MP3 data into an external file
 - Now we can enjoy downloaded music :)
 
-How to run it
--------------
-
-Here are two examples :
+How to build it
+---------------
 
-	./shoutr -u http://88.190.24.47:80
+- use make to build
+- artefact is in build folder
+- see Makefile
 
-or
-
-	./shoutr -p frequence3.pls
+How to run it
+-------------
 
+Usage:
+
+	./shoutr [-p <playlist>|-u <stream_url>] [OPTIONS]
+
+Examples :
+
+	./shoutr -u http://88.190.24.47:80 -f ./%w-%H -d 3580
+
+	./shoutr -p frequence3.pls -l ./log
+
+OPTIONS:
+
+	-d duration     defines the recording length in seconds (see CURLOPT_TIMEOUT)
+	-e extension    fileextension (default: mp3)
+	-f basefilename defines the base name of the mp3 file(s) created (default: radio)
+	-i ignore       stream_title (change) to ignore (do not create a new file)
+	-l logfolder    (rel/abs) path to folder for log (default: current folder)
+	-n name         name of station (default radio)
+	-r repeat       repeat the recording specified number of times
+	-s id3tags      split stream_title (on ' - ') into artist - title (0) or title - artist (1, default)
+	-t title        (part of) title to record (default any) (tip: use '-' to record only music)
+	-x proxy        defines proxy to use (see CURLOPT_PROXY)
+
+without these additional commandline options specified
+
+	no proxy is used 
+		libcurl respects the proxy environment variables named http_proxy, ftp_proxy, sftp_proxy etc., see CURLOPT_PROXY
+	basename will be radio###.mp3 
+		### is incrementing number
+		incrementing number can be used for sorting. 
+			as metadata is never changing exacty on the moment the song changes,
+			a fluent playback is only possible in recording order (hence incrementing number)
+		incrementing number will increment when
+			metadata streamtitle changes
+			repeat > 0 and duration passes
+		basename can handle timestamp directives (see strftime)
+		basename will be appended with name of station (if provided with -n) and downloaded music using metadata (if available)
+	duration will be infinite (see CURLOPT_TIMEOUT)
+	repeat will be 0 (no repeat)
+	repeat will 
+		reuse/continue the recording using the existing connection
+		avoid establishing new connection (preventing new connection pub)
+		change incrementing number
+		create a separate recording file for each repeat
+		not change basename (weekday nor hour nor any supplied timestamp directive)
+		N.B. a repeat set to 2 will produce 3 recordings (0, 1=1st repeat, 2=2nd repeat)
+			(of the same stream and of the same duration)
+	non-empty stream_title will be used for id3tag assuming artist - title
+
+
+cron example :
+
+	SHELL=/bin/bash
+	log=/HDD/log/crontab.
+	dt=date +%Y%m%d
+
+	stream=http://88.190.24.47:80
+	0 10 * * * cd /HDD; ./shoutr -u $stream -f ./\%u-10 -d 3580 -r 1 >> $log$($dt).log 2>&1
+
+
+copy recordings in recording order :
+
+
+	#!/bin/bash
+	SECONDS=0
+	TEST=
+	IFS=$'\n'
+	DRIVE="$(dirname "$0")"
+	DST="${DRIVE}/.."
+	LOG="${DRIVE}/copyit.LOG"
+	echo "" > $LOG
+
+	function cpit {
+	$TEST mkdir -pv "${DST}/${CWD}" | tee -a $LOG
+	for i in $( find "${SRC}${CWD}" -type f -mtime -6 | sort )
+	do 
+	 $TEST rsync --min-size=1mb -avh --no-p --no-g --chmod=ugo=rwX --modify-window=2 "$i" "${DST}/${CWD}" | tee -a $LOG
+	done
+	}
+
+	SRC=/mnt/nfs/HDD/
+	for G in "CD01" "CD02" "CD04" 
+	do
+	 CWD=$G
+	 echo $CWD $DST
+	 cpit
+	done
+	echo "Script finished in $SECONDS seconds=> $(($SECONDS/60)) min $(($SECONDS%60)) sec" | tee -a $LOG
+
 TODO
 ----
 
 Some interesting features to add :
 
-- add option --quiet
-- add option --ncurses
-- add a big shoucast radio list with lots of radios 
-- add shoutr_start and shoutr_stop functions.
-- add id3tags
+- more id3tags (taglib) (artist and title depends on station)
+- see www.radio-browser.info for a big shoucast radio list 
+
 
 LICENSE
 -------
@@ -53,5 +142,7 @@ See the file COPYING for details.
 
 Contact
 -------
-
 Yoann Sculo - <yoann.sculo@gmail.com>
+
+------
+markdown by http://remarkableapp.github.io/

include/curl.h

@@ -1,6 +1,14 @@
 #ifndef __CURL_H_
 #define __CURL_H_
 
+void SwapOfs(void *p);
 int read_stream(Stream *stream);
 
+#if LIBCURL_VERSION_NUM >= 0x072000
+int xferinfo(void *p, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
+#else
+int older_progress(void *p, double dltotal, double dlnow, double ultotal, double ulnow);
+#endif
+
+
 #endif // __CURL_H_

include/log.h

@@ -1,9 +1,10 @@
 #ifndef __LOG_H_
 #define __LOG_H_
 
-int log_open_files(void);
+int log_open_files(char* folder);
 int log_close_files(void);
 void slog(char *line);
 void slog_prog(char *line);
+void plog(char *fmt, ...);
 
 #endif

include/parsing.h

@@ -1,2 +1,3 @@
 
 size_t parse_data(void *ptr, size_t size, size_t nmemb, void *userdata);
+size_t parse_header(void *ptr, size_t size, size_t nmemb, void *userdata);

include/pls.h

@@ -4,8 +4,8 @@
 #define MAX_LINE_LENGTH 500
 
 typedef struct {
-	char file[500];
-	char title[500];
+	char file[MAX_LINE_LENGTH];
+	char title[MAX_LINE_LENGTH];
 	int length;
 } PlsEntry;
 

include/shoutcast.h

@@ -3,8 +3,9 @@
 
 #include "types.h"
 
+int free_stream(Stream *stream);
 int load_stream(Stream *stream, const char *url);
 void global_listener(Stream *stream, char *buffer);
-int write_data(Stream *stream, size_t *size);
+int write_data(Stream *stream);
 
 #endif // __SHOUTCAST_H_

include/types.h

@@ -3,6 +3,7 @@
 
 #define TRUE  1
 #define FALSE 0
+#define TITLE_SIZE 160 
 
 typedef enum {
 	E_STATUS_NONE,
@@ -18,7 +19,7 @@ typedef struct
 	char icy_name[500];
 	char icy_notice1[500];
 	char icy_notice2[500];
-	char icy_genre[255];
+	char icy_genre[TITLE_SIZE];
 	char icy_pub[10];
 	char icy_br[10]; // bitrate
 
@@ -47,20 +48,32 @@ typedef struct
 
 typedef struct
 {
-	char url[255];          // Stream url
+	char url[TITLE_SIZE];          // Stream url
+	char proxy[TITLE_SIZE];	// Network proxy
+	char basefilename[TITLE_SIZE]; // basefilename of output file
+	char filename[TITLE_SIZE];     // current filename of output file
+	char ext[TITLE_SIZE];           // current extension of output file
+	char onlytitle[TITLE_SIZE];	// record only if title contains onlytitle
+	char to_ignore[TITLE_SIZE];	// ignore stream_title changes when including this string
+	unsigned int duration;  // max recording duration
+	unsigned int repeat;    // max recording repeats
 	FILE *output_stream;    // Output MP3 file
-	char stream_title[500]; // Current title
-
+	char stream_title[TITLE_SIZE]; // Current title
+	char station[TITLE_SIZE];      // station
+	int TA; // title = <Title> - <Artist> else <Artist> - <Title>
 	parsing_status status; 
 
-	ICYHeader header;   // Stream header (won't change after being set)
-	MetaData metadata;  // Stream metadata (will change during session)
-	Mp3Data mp3data;    // MP3 raw data
+	ICYHeader header;        // Stream header (won't change after being set)
+	MetaData metadata;       // Stream metadata (will change during session)
+	Mp3Data mp3data;         // MP3 raw data
 
 	unsigned int bytes_count; // Number of bytes received since last metadata block
 	unsigned int bytes_count_total; // Number of bytes received since beginning
 	unsigned int blocks_count; // Number of HTTP blocks received
 	unsigned int metadata_count; // Number of metadata blocks received since beginning
+        int ignoring; // ignoring title change
 } Stream;
 
+void newfilename(Stream* stream,const char* title);
+
 #endif // __TYPES_H_

radios/frequence3.pls

@@ -1,9 +1,9 @@
 [playlist]
 NumberOfEntries=2
-File1=http://stream-hautdebit.frequence3.net:8000/
-Title1=[Serveur Generique] - Frequence3 - Une Rafale de Tubes ! [HautDebit]
+File1=http://ice.stream.frequence3.net/frequence3-128.mp3
+Title1=[Serveur Generique] - Frequence3 - Une Rafale de Tubes !
 Length1=-1
-File2=http://stream-hautdebit.frequence3.net:8000/
-Title2=[Serveur Generique] - Frequence3 - Une Rafale de Tubes ! [HautDebit]
+File2=http://ice.stream.frequence3.net/frequence3-32.mp3
+Title2=[Serveur Generique] - Frequence3 - Une Rafale de Tubes !
 Length2=-1
 Version=2

shoutcastRecorder/shoutcastRecorder.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shoutcastRecorder", "shoutcastRecorder\shoutcastRecorder.vcxproj", "{7EFF25AC-DF8A-44AF-83EE-B20CB7056DB7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7EFF25AC-DF8A-44AF-83EE-B20CB7056DB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7EFF25AC-DF8A-44AF-83EE-B20CB7056DB7}.Debug|Win32.Build.0 = Debug|Win32
+		{7EFF25AC-DF8A-44AF-83EE-B20CB7056DB7}.Release|Win32.ActiveCfg = Release|Win32
+		{7EFF25AC-DF8A-44AF-83EE-B20CB7056DB7}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

shoutcastRecorder/shoutcastRecorder/ReadMe.txt

@@ -0,0 +1,40 @@
+========================================================================
+    CONSOLE APPLICATION : shoutcastRecorder Project Overview
+========================================================================
+
+AppWizard has created this shoutcastRecorder application for you.
+
+This file contains a summary of what you will find in each of the files that
+make up your shoutcastRecorder application.
+
+
+shoutcastRecorder.vcxproj
+    This is the main project file for VC++ projects generated using an Application Wizard.
+    It contains information about the version of Visual C++ that generated the file, and
+    information about the platforms, configurations, and project features selected with the
+    Application Wizard.
+
+shoutcastRecorder.vcxproj.filters
+    This is the filters file for VC++ projects generated using an Application Wizard. 
+    It contains information about the association between the files in your project 
+    and the filters. This association is used in the IDE to show grouping of files with
+    similar extensions under a specific node (for e.g. ".cpp" files are associated with the
+    "Source Files" filter).
+
+shoutcastRecorder.cpp
+    This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+    These files are used to build a precompiled header (PCH) file
+    named shoutcastRecorder.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////