In progress

3 files changed, 81 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index ea6f018..f0cb641 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ SRCS_DIR	 = src/
 DATA_DIR	 = share/
 TRGT_DIR	 = ./
 
-SRCS_NAME	 = c_go2work
+SRCS_NAME	 = c_defs
+SRCS_NAME	+= c_go2work
 SRCS_NAME	+= c_player
 SRCS_NAME	+= u_checks
 SRCS_NAME	+= u_prints
diff --git a/src/c_defs.go b/src/c_defs.go
new file mode 100644
index 0000000..b2c5474
--- /dev/null
+++ b/src/c_defs.go
@@ -0,0 +1,71 @@
+/*
+ * ========================
+ * =====    ===============
+ * ======  ================
+ * ======  ================
+ * ======  ====   ====   ==
+ * ======  ===     ==  =  =
+ * ======  ===  =  ==     =
+ * =  ===  ===  =  ==  ====
+ * =  ===  ===  =  ==  =  =
+ * ==     =====   ====   ==
+ * ========================
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022 Joe
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the organization nor the
+ *    names of its contributors may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JOE ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL JOE BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * go2work: src/c_defs.go
+ * Wed Mar 30 13:02:47 CEST 2022
+ * Joe
+ *
+ * Definitions.
+ */
+
+package main
+
+const (
+	PROGNAME			= "go2work"
+	VERSION				= "0.1.0"
+	HOURS				= 0
+	MINS				= 1
+	SECS				= 2
+	INTERVAL			= 500
+	LOG_FORMAT			= "bad time format"
+	DEF_FILES			= "/usr/home/jozan/mu/progressive/progressive_black_metal/deathspell_omega/2010_paracletus/02_wings_of_predation.flac"
+	DEF_MEDIA_PLAYER	= "mpv"
+	DEF_PLAYER_OPTIONS	= []string{"--no-video", "--loop"}
+	DEF_RANDOM			= true
+	DEF_USE_FORTUNE		= true
+)
+
+type options struct {
+	files			[]string
+	media_player	string
+	player_options	[]string
+	random			bool
+	use_fortune		bool
+}
diff --git a/src/c_go2work.go b/src/c_go2work.go
index 073fb43..079d133 100644
--- a/src/c_go2work.go
+++ b/src/c_go2work.go
@@ -56,18 +56,6 @@ import (
 	"strings"
 )
 
-const (
-	PROGNAME		= "go2work"
-	VERSION			= "0.1.0"
-	HOURS			= 0
-	MINS			= 1
-	SECS			= 2
-	INTERVAL		= 500
-	USE_FORTUNE		= true
-	MEDIA_PLAYER	= "mpv"
-	LOG_FORMAT		= "bad time format"
-)
-
 func main() {
 	var curr_t [3]byte
 	var dest_t [3]byte
@@ -92,7 +80,7 @@ func main() {
 		dest_t = get_test_time()
 	default:
 		if strings.Contains(os.Args[1], ":") == false {
-			log.Fatal("bad time format")
+			log.Fatal(LOG_FORMAT)
 		}
 		str_dest_t := strings.Split(os.Args[1], ":")
 		tmp, _ = strconv.Atoi(str_dest_t[HOURS])
@@ -101,15 +89,15 @@ func main() {
 		dest_t[MINS] = byte(tmp)
 		dest_t[SECS] = 0
 	}
-	if check_media_player(MEDIA_PLAYER) == false {
-		log.Fatal("media player (" + MEDIA_PLAYER + ") not found")
+	if check_media_player(DEF_MEDIA_PLAYER) == false {
+		log.Fatal("media player (" + DEF_MEDIA_PLAYER + ") not found")
 		return
 	}
-	if USE_FORTUNE == true && check_fortune() == false {
+	if DEF_USE_FORTUNE == true && check_fortune() == false {
 		fmt.Println("Beware, fortune is set on but was not found")
 	}
 	if check_time_format(dest_t) == false {
-		log.Fatal("bad time format")
+		log.Fatal(LOG_FORMAT)
 		return
 	}
 	curr_t = get_time()
@@ -125,10 +113,10 @@ func main() {
 				curr_t[MINS] == dest_t[MINS] &&
 				curr_t[SECS] == dest_t[SECS] {
 				exec_player(
-					USE_FORTUNE,
-					MEDIA_PLAYER,
+					DEF_USE_FORTUNE,
+					DEF_MEDIA_PLAYER,
 					"--no-video",
-					"/usr/home/jozan/mu/progressive/progressive_black_metal/deathspell_omega/2010_paracletus/02_wings_of_predation.flac",
+					DEF_FILES,
 				)
 				return
 			}