From 5785087ee1543f00e3d694a4e3291e2e11e8ac2b Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Sat, 3 Aug 2013 17:36:45 -0500 Subject: [PATCH] Added a cfg file, poorly. --- main.lua | 2 +- mandy.cfg | 6 ++++++ mandy.lua | 27 +++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) mode change 100644 => 100755 main.lua create mode 100644 mandy.cfg diff --git a/main.lua b/main.lua old mode 100644 new mode 100755 index 12e3eab..4a6bcbd --- a/main.lua +++ b/main.lua @@ -1,6 +1,6 @@ #!/usr/bin/lua5.2 require("mandy") - +dofile("mandy.cfg") function main() local url=global.url() if not url then return false end diff --git a/mandy.cfg b/mandy.cfg new file mode 100644 index 0000000..5d6ac5c --- /dev/null +++ b/mandy.cfg @@ -0,0 +1,6 @@ +cfg_table = { + +format = "ogg" -- 0 for mp3, 1 for ogg, 2 for flac + +} + diff --git a/mandy.lua b/mandy.lua index 09a7aa6..3f5b719 100644 --- a/mandy.lua +++ b/mandy.lua @@ -7,15 +7,24 @@ require('ffmpeg_progress') --Main url entry box function url_entry() + + local format = sel_format() + local url = "" - local format = 0 + res, url, format = iup.GetParam("Mandy 0.5.0 - Enter URL", nil, "Enter Youtube URL: %s\n".. "Select an audio format: %l|mp3|ogg|flac|\n", url, format) + + gFormat = sel_Codec(format) if res == true then if string.match(url, "youtube.com/watch") then + + local format_config = io.open("Config.txt", "w") + format_config:write("local format = "..format) + format_config:close() return url else iup.Message("Error", "The URL is not a youtube link") @@ -28,6 +37,19 @@ function url_entry() end +-- checks mandy.cfg for format +function sel_format() + local format = cfg_table["format"] + if format == "mp3" then return 0 + elseif format == "ogg" then return 1 + elseif format == "flac" then return 2 + else return 0 + + end +end + + + --make format dropdown menu items work function sel_Codec(x) if x == 0 then @@ -58,6 +80,7 @@ function set_dir() local status = getPath.status + -- The "%" is used to escape the "." comming from gFormat if status == "1" or status == "0" then if string.match(getPath.value, "%"..gFormat) then local savedPath = getPath.value @@ -114,7 +137,7 @@ function ffmpeg(tmpPath, dirD) local subSpaces = string.gsub(dirD, " ", "\\ ") - local codec = "ffmpeg -i "..tmpPath.." -acodec "..gFormat.." -ac 2 -ab 192k -y "..subSpaces + local codec = "ffmpeg -i "..tmpPath.." -acodec "..gFormat.." -ac 2 -ab 192k -vn -y "..subSpaces print(format) local flag = convert_mp3.go(codec, tmpPath)