From 5271c8503199ea6e14f298743b28f2262a7e216a Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 10 Nov 2018 02:44:48 -0500
Subject: rename paths to util, and add more stuff to it

---
 src/main.rs | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index d7adc8f..4f9ce07 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,27 +13,15 @@ extern crate serde_json;
 extern crate serde_derive;
 
 mod cmd;
-mod lastfm;
-mod paths;
 mod db;
-
-fn program_name() -> failure::Fallible<String> {
-    let program = std::env::args()
-        .next()
-        .ok_or_else(|| format_err!("no program name found"))?;
-    let path = std::path::Path::new(&program);
-    let filename = path.file_name()
-        .ok_or_else(|| format_err!("invalid filename found"))?
-        .to_string_lossy()
-        .to_string();
-    Ok(filename)
-}
+mod lastfm;
+mod util;
 
 fn main() {
     match cmd::run() {
         Ok(_) => {},
         Err(e) => {
-            let name = program_name()
+            let name = util::program_name()
                 .unwrap_or_else(|e| {
                     eprintln!("{}", e);
                     "?".to_string()
-- 
cgit v1.2.3-54-g00ecf