From 5274722f4f20f287405f15ca7856bca483c0f931 Mon Sep 17 00:00:00 2001 From: silvernode Date: Sat, 27 Jul 2013 13:38:41 -0500 Subject: [PATCH 01/12] created changelog file, added current version number to README --- README.md | 3 ++- changelog.txt | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 changelog.txt diff --git a/README.md b/README.md index 3746b6b..dbf55ce 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -#Mandy +#Mandy - current version: 0.4 + ##About diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..86ffe93 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,13 @@ +***CHANGELOG*** + + +Version 0.4 (7-27-13) + ++ fixed media player error when opening finished file ++ fixed .mp3 validation ++ cancel button now works properly in url entry box +* added progress bar for conversion process +* added push notifications +* files now open with default media player not vlc + + From 2ad0e9852c3de36956a9a8d53ecbb542b2a9407a Mon Sep 17 00:00:00 2001 From: silvernode Date: Sun, 28 Jul 2013 19:48:59 -0500 Subject: [PATCH 02/12] small cleanup --- main.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 main.lua diff --git a/main.lua b/main.lua old mode 100755 new mode 100644 From cdfcbcc21fc376992cd9ffc869770cb55c7ac84b Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Sat, 27 Jul 2013 11:51:07 -0500 Subject: [PATCH 03/12] Cleaned code, fixed spaceing --- ffmpeg_progress.lua | 89 +++++++++++++---------------- mandy.lua | 112 +++++++++++++----------------------- progress.lua | 136 ++++++++++++++++---------------------------- 3 files changed, 129 insertions(+), 208 deletions(-) diff --git a/ffmpeg_progress.lua b/ffmpeg_progress.lua index 811ac88..f57ee55 100644 --- a/ffmpeg_progress.lua +++ b/ffmpeg_progress.lua @@ -4,66 +4,57 @@ local cancelflag local downloadProgress local function downloadStart(YtLink) - cancelButton = iup.button{ - title = "Cancel", - action = function() - cancelflag = true - end + cancelButton = iup.button{ + title = "Cancel", + action = function() + cancelflag = true + end + } + + local downloadProgress = iup.progressbar{expand="HORIZONTAL", MARQUEE="YES"} + local dlgProgress = iup.dialog{ + title = "converting", + dialogframe = "YES", border = "YES", + iup.vbox { + downloadProgress, + cancelButton, } - local downloadProgress = iup.progressbar{expand="HORIZONTAL", MARQUEE="YES"} - local dlgProgress = iup.dialog{ - title = "converting", - dialogframe = "YES", border = "YES", - iup.vbox { - downloadProgress, - cancelButton, - } - } - dlgProgress.size = "QUARTERxEIGHT" - dlgProgress.menubox = "NO" - dlgProgress.close_cb = cancelButton.action - dlgProgress:showxy(iup.CENTER, iup.CENTER) - return dlgProgress + } + dlgProgress.size = "QUARTERxEIGHT" + dlgProgress.menubox = "NO" + dlgProgress.close_cb = cancelButton.action + dlgProgress:showxy(iup.CENTER, iup.CENTER) + return dlgProgress end local function DL_progress(YtLink) - downloadStart() - local pipe = io.popen(YtLink) - --os.execute(YtLink) - - repeat - local c = pipe:read() - if c then - - iup.Flush() - - iup.LoopStep() - iup.Flush() - if cancelflag then - - iup.Message("Terminated", "You have canceled the conversion") - iup.Flush() - break - - end - - end - - - - -until not c -pipe:close() -iup.Close() -return + downloadStart() + local pipe = io.popen(YtLink) + + repeat + local c = pipe:read() + if c then + iup.Flush() + iup.LoopStep() + iup.Flush() + if cancelflag then + iup.Message("Terminated", "You have canceled the conversion") + iup.Flush() + break + end + end + until not c + pipe:close() + iup.Close() + return end convert_mp3 = {} convert_mp3.go = function(tubeLink) DL_progress(tubeLink) return -end + end diff --git a/mandy.lua b/mandy.lua index 1bddb69..2367ed9 100644 --- a/mandy.lua +++ b/mandy.lua @@ -1,93 +1,65 @@ #!/usr/bin/lua5.2 ---ffmpeg ---libavcodec-extra-53 <-Ubuntu...suck it - require("iuplua") require("iupluacontrols") require('progress') require('ffmpeg_progress') - - - --Main url entry box function url_entry() - -res, url = iup.GetParam("Mandy 0.4 - Enter URL", nil, - "Enter Youtube URL: %s\n", "") - - if res == true then - if string.match(url, "youtube.com/watch") then - return url - - else - iup.Message("Error", "The URL is not a youtube link") - iup.Flush() - iup.Close() - end - - + res, url = iup.GetParam("Mandy 0.4 - Enter URL", nil, + "Enter Youtube URL: %s\n", "") + if res == true then + if string.match(url, "youtube.com/watch") then + return url else - return false - + iup.Message("Error", "The URL is not a youtube link") + iup.Flush() + iup.Close() end - - - + else + return false + end end --Ask user to select a codec function sel_Codec() - - - end - - --Ask user to set directory function set_dir() - getPath = iup.filedlg{dialogtype = "SAVE", title="Save file...", - filter="*.mp3", filterinfo="mp3", - directory=".", - file="*.mp3"} + getPath = iup.filedlg{dialogtype = "SAVE", title="Save file...", + filter="*.mp3", filterinfo="mp3", + directory=".", + file="*.mp3"} - getPath:popup(iup.ANYWHERE, iup.ANYWHERE) + getPath:popup(iup.ANYWHERE, iup.ANYWHERE) - local status = getPath.status + local status = getPath.status - if status == "1" then - if string.match(getPath.value, ".mp3") then - local savedPath = getPath.value - return savedPath + if status == "1" then + if string.match(getPath.value, ".mp3") then + local savedPath = getPath.value + return savedPath - else - local savedPath = getPath.value..".mp3" - return savedPath + else + local savedPath = getPath.value..".mp3" + return savedPath - end - - - elseif status == "0" then - - local savedPath = getPath.value - - g_status = "23" - return savedPath, g_status - - - - elseif status == "-1" then - - g_status = "23" - return g_status - - end - + elseif status == "0" then + local savedPath = getPath.value + g_status = "23" + return savedPath, g_status + + + + elseif status == "-1" then + g_status = "23" + return g_status + end end function ytDl(x) @@ -97,19 +69,17 @@ function ytDl(x) local tmpPath2 = "/tmp/youtube-dl-"..tmpName.."-"..tmpNameTwo..".flv" popin.ytdl(tmpPath) - return tmpPath2 - end function ffmpeg(tmpPath, dirD) - local subSpaces = string.gsub(dirD, "", "\\") - local mp3 = "ffmpeg -i "..tmpPath.." -acodec libmp3lame -ac 2 -ab 192k -vn -y "..subSpaces - --os.execute(mp3) - convert_mp3.go(mp3) - io.popen("notify-send 'The file was saved to' "..subSpaces) - io.popen("xdg-open "..subSpaces) + local subSpaces = string.gsub(dirD, "", "\\") + local mp3 = "ffmpeg -i "..tmpPath.." -acodec libmp3lame -ac 2 -ab 192k -vn -y "..subSpaces + convert_mp3.go(mp3) + io.popen("notify-send 'The file was saved to' "..subSpaces) + io.popen("xdg-open "..subSpaces) end + --put everything into a table to use local functions globally global = {} global.url = function () diff --git a/progress.lua b/progress.lua index d823dca..b4c0b04 100644 --- a/progress.lua +++ b/progress.lua @@ -1,97 +1,65 @@ --- take note of YtLink, I keep passing it around in order to show it as the title bar --- of the download window, YOU WILL HAVE TO PAY ATTENTION TO IT --- IT GOES THROUGH FUCKING EVERYTHING --- Also it will be replaced by what the user saves the file as --- keep that in mind as well require ('iuplua') -local cancelflag --set variable -local downloadProgress --set variable +local cancelflag +local downloadProgress -local function downloadStart(YtLink) --create button and cancle flag - cancelButton = iup.button{ - title = "Cancel", - action = function() - cancelflag = true - - --return iup.CLOSE --not sure if needed - - end - } - local pTest = "1" - downloadProgress = iup.progressbar{expand="HORIZONTAL"} - dlgProgress = iup.dialog{ --create main window - title = "Downloading.. ", - dialogframe = "YES", border = "YES", - iup.vbox { -- create vbox that contains said objects - downloadProgress, - cancelButton, - pTest, - } - } - dlgProgress.size = "QUARTERxEIGHT" --should be size of dialog box - -- dlgProgress.menubox = "NO" -- no windows menus - dlgProgress.close_cb = cancelButton.action -- calls the action of the button - dlgProgress:showxy(iup.CENTER, iup.CENTER) -- show and position box - return dlgProgress +--create button with cancel flag +local function downloadStart(YtLink) + cancelButton = iup.button{ + title = "Cancel", + action = function() + cancelflag = true + end} + + downloadProgress = iup.progressbar{expand="HORIZONTAL"} + dlgProgress = iup.dialog{ + title = "Downloading.. ", + dialogframe = "YES", border = "YES", + iup.vbox { + downloadProgress, + cancelButton, + pTest, + } + } + dlgProgress.size = "QUARTERxEIGHT" + dlgProgress.menubox = "NO" -- no windows menus + dlgProgress.close_cb = cancelButton.action + dlgProgress:showxy(iup.CENTER, iup.CENTER) + return dlgProgress end -local function DL_progress(YtLink) -- monitor download progress - downloadStart(YtLink) -- start the progress bar - downloadProgress.value = 0 - local pipe = io.popen("youtube-dl " ..YtLink) - repeat - local c = pipe:read(20) -- read the first 20 characters of each line - if c then -- if c is true then... - - local b = string.match(c, '.....%%') -- %% in a string is "%" - - -- string.match finds the percent sign and then finds every character - -- for every dot you place. dots before grab before the character - -- dots after grab after the character - - --[[ -Perhaps do a different method -round up and only update if number has changed --- didn't help at all, reverted to less code]] - - - if b then - - --here we take the last character off of the string - --in this case it is the "percent" sign - - local b = string.sub(b,0,-2) - downloadProgress.value = b/100 -- x out of 100 - -- in this case x is the progress - -- data we grabbed - iup.Flush() -- speeds everything up considerably - -- when changing an attribute of an element, the change may not - -- take place immediately - -- in that case throw in a flush after the change - - iup.LoopStep() -- required to work, also allows user to click button - iup.Flush() -- added this second flush... helps a shit ton - if cancelflag then -- if cancelflag is true, then break - -- which happens if you click the button - - iup.Message("Terminated", "You have canceled the download") - iup.Flush() - break +-- start download, create progress bar, monitor progress +local function DL_progress(YtLink) + downloadStart(YtLink) + downloadProgress.value = 0 + local pipe = io.popen("youtube-dl " ..YtLink) + repeat + local c = pipe:read(20) -- read the first 20 characters of each line + if c then + local b = string.match(c, '.....%%') - end + if b then + local b = string.sub(b,0,-2) + downloadProgress.value = b/100 -- x out of 100 + iup.Flush() + iup.LoopStep() --check for user input + iup.Flush() + if cancelflag then + iup.Message("Terminated", "You have canceled the download") + iup.Flush() + break + end - end + end end -until not c-- creating a loop until c is not true -pipe:close() -- closing the ipopen ---iup.Close() + until not c + pipe:close() end popin = {} @@ -99,11 +67,3 @@ popin.ytdl = function(tubeLink) DL_progress(tubeLink) end ---if you can have your script call this one and insert the link to YtLink... win - ---local YtLink = ('http://www.youtube.com/watch?v=jrmlums5bV8') - - ---DL_progress( YtLink) - - From 84b86b481da0edeebe7b1b4420a253750799188f Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Sat, 27 Jul 2013 12:29:05 -0500 Subject: [PATCH 04/12] added DEPENDS, fixed .mp3 validation and space substitution --- DEPENDS | 11 +++++++++++ mandy.lua | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 DEPENDS diff --git a/DEPENDS b/DEPENDS new file mode 100644 index 0000000..75ffe2d --- /dev/null +++ b/DEPENDS @@ -0,0 +1,11 @@ +lua 5.2 +libfreetype6-dev (ubuntu) +youtube-dl +ffmpeg +libnotify +git +IUP +CD +IM + +see readme for instructions for Ubuntu and Archlinux diff --git a/mandy.lua b/mandy.lua index 2367ed9..c67cf6d 100644 --- a/mandy.lua +++ b/mandy.lua @@ -39,7 +39,7 @@ function set_dir() local status = getPath.status if status == "1" then - if string.match(getPath.value, ".mp3") then + if string.match(getPath.value, "%.mp3") then local savedPath = getPath.value return savedPath @@ -73,8 +73,8 @@ function ytDl(x) end function ffmpeg(tmpPath, dirD) - local subSpaces = string.gsub(dirD, "", "\\") - local mp3 = "ffmpeg -i "..tmpPath.." -acodec libmp3lame -ac 2 -ab 192k -vn -y "..subSpaces + local subSpaces = string.gsub(dirD, " ", "\\") + local mp3 = "ffmpeg -i "..tmpPath.." -acodec libmp3lame -ac 2 -ab 192k -vn -y "..subSpaces convert_mp3.go(mp3) io.popen("notify-send 'The file was saved to' "..subSpaces) io.popen("xdg-open "..subSpaces) From 92adc9470f28127901729adb6f4a5ba8b818357b Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Mon, 29 Jul 2013 13:17:42 -0500 Subject: [PATCH 05/12] Licenses agreements added. --- BEFORE_YOU_CONTRIBUTE | 7 ++ CONTRIBUTORS | 1 + Contributor_License_Agreement | 123 ++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 BEFORE_YOU_CONTRIBUTE create mode 100644 CONTRIBUTORS create mode 100644 Contributor_License_Agreement diff --git a/BEFORE_YOU_CONTRIBUTE b/BEFORE_YOU_CONTRIBUTE new file mode 100644 index 0000000..0dbf7b2 --- /dev/null +++ b/BEFORE_YOU_CONTRIBUTE @@ -0,0 +1,7 @@ +Please read and sign our Contributor_License_Agreement before contributing. + +Any and all contributions from any entity that has not signed the +Contributor_License_Agreement hereby surrenders any claim +to ownership of copyright. Any and all works received in this way shall +be considered anonymous contributions and the copyright will be held by +Zolfite. diff --git a/CONTRIBUTORS b/CONTRIBUTORS new file mode 100644 index 0000000..a84da31 --- /dev/null +++ b/CONTRIBUTORS @@ -0,0 +1 @@ +Logen Kain diff --git a/Contributor_License_Agreement b/Contributor_License_Agreement new file mode 100644 index 0000000..199de90 --- /dev/null +++ b/Contributor_License_Agreement @@ -0,0 +1,123 @@ + Zolfite + Contributor License Agreement + +Thank you for your interest in Zolfite. In order to clarify the +intellectual property license granted with Contributions from any +person or entitiy, Zolfite must have a Contributor License Agreement + ("CLA") on file that has been signed by each Contributor, indicating + agreement to the license terms below. This license is for your +protection as a Contributor as well as protection of Zolfite and its +users; it does not change your rights to use your own Contributions +for any other purpose. If you have not already done so, please complete + and sign, then scan and email a pdf file of this Agreement to +logen@lavabit.com. Please read this document carefully before signing and + keep a copy for your records. The Public name field is optional and +will be used to the CONTRIBUTERS file. + + Full name: _________________ + + Public name: _________________ + + E-Mail: _________________ + + +You accept and agree to the following terms and conditions for your +present and futre Contributions submitted to Zolfite. Except for +the license granted herein to Zolfite and recipients of software +distrubuted by Zolfite, You reserve all right, title, and interest +in and to Your Contributions. + + + + +1. Definitions. + + "You" (or "Your") shall mean the copyright owner or legal entity + authorized by the copyright owner that is making this Agreement + with Zolfite. For legal entities, the entity making a + Contribution and all other entities that control, are controlled + by, or are under common control with that entity are considered to + be a single Contributor. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "Contribution" shall mean any original work of authorship, + including any modifications or additions to an existing work, that + is intentionally submitted by You to Zolfite for inclusion + in, or documentation of, any of the products owned or managed by + Zolfite (the "Work"). For the purposes of this definition, + "submitted" means any form of electronic, verbal, or written + communication sent to Zolfite or its representatives, + including but not limited to communication on electronic mailing + lists, source code control systems, and issue tracking systems that + are managed by, or on behalf of, Zolfite for the purpose of + discussing and improving the Work, but excluding communication that + is conspicuously marked or otherwise designated in writing by You + as "Not a Contribution." + +2. Grant of Copyright License. Subject to the terms and conditions of + this Agreement, You hereby grant to Zolfite and to + recipients of software distributed by Zolfite a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare derivative works of, + publicly display, publicly perform, sublicense, and distribute Your + Contributions and such derivative works. + +3. Grant of Patent License. Subject to the terms and conditions of + this Agreement, You hereby grant to Zolfite and to + recipients of software distributed by Zolfite a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have + made, use, offer to sell, sell, import, and otherwise transfer the + Work, where such license applies only to those patent claims + licensable by You that are necessarily infringed by Your + Contribution(s) alone or by combination of Your Contribution(s) + with the Work to which such Contribution(s) was submitted. If any + entity institutes patent litigation against You or any other entity + (including a cross-claim or counterclaim in a lawsuit) alleging + that Your Contribution, or the Work to which you have contributed, + constitutes direct or contributory patent infringement, then any + patent licenses granted to that entity under this Agreement for + that Contribution or Work shall terminate as of the date such + litigation is filed. + +4. You represent that you are legally entitled to grant the above + license. If your employer(s) has rights to intellectual property + that you create that includes Your Contributions, you represent + that you have received permission to make Contributions on behalf + of that employer, that your employer has waived such rights for + Your Contributions to Zolfite, or that your employer has + executed a separate Corporate CLA with Zolfite. + +5. You represent that each of Your Contributions is Your original + creation (see section 7 for submissions on behalf of others). You + represent that Your Contribution submissions include complete + details of any third-party license or other restriction (including, + but not limited to, related patents and trademarks) of which you + are personally aware and which are associated with any part of Your + Contributions. + +6. You are not expected to provide support for Your Contributions, + except to the extent You desire to provide support. You may provide + support for free, for a fee, or not at all. Unless required by + applicable law or agreed to in writing, You provide Your + Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied, including, without + limitation, any warranties or conditions of TITLE, NON- + INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. + +7. Should You wish to submit work that is not Your original creation, + You may submit it to Zolfite separately from any + Contribution, identifying the complete details of its source and of + any license or other restriction (including, but not limited to, + related patents, trademarks, and license agreements) of which you + are personally aware, and conspicuously marking the work as + "Submitted on behalf of a third-party: [named here]". + +8. You agree to notify Zolfite of any facts or circumstances of + which you become aware that would make these representations + inaccurate in any respect. + +Please sign: __________________________________ Date: ________________ From 072532d50630b43916a1bdcab238e436eb072bf0 Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Mon, 29 Jul 2013 13:18:55 -0500 Subject: [PATCH 06/12] Licenses agreement --- LICENSE | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9840b1b --- /dev/null +++ b/LICENSE @@ -0,0 +1,25 @@ + +Copyright (c) 2013, Zolfite +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of the Zolfite 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 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. From 633e72c9ab3df1263ac9b01f1cc8447cfc385b7d Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Mon, 29 Jul 2013 13:22:32 -0500 Subject: [PATCH 07/12] Updated Contributers --- CONTRIBUTORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a84da31..f612253 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1 +1 @@ -Logen Kain +Logen Kain From d4ca8389b898016426d6d8095f4636e6f8dc717f Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Mon, 29 Jul 2013 21:30:30 -0500 Subject: [PATCH 08/12] Updated Contributer License --- BEFORE_YOU_CONTRIBUTE | 3 +++ CONTRIBUTORS | 2 ++ Contributor_License_Agreement | 17 +++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/BEFORE_YOU_CONTRIBUTE b/BEFORE_YOU_CONTRIBUTE index 0dbf7b2..ac2bfa8 100644 --- a/BEFORE_YOU_CONTRIBUTE +++ b/BEFORE_YOU_CONTRIBUTE @@ -1,5 +1,8 @@ Please read and sign our Contributor_License_Agreement before contributing. +In most cases we will require the signed agreement before merging any code +however in some cases we may allow anonymous contributions. + Any and all contributions from any entity that has not signed the Contributor_License_Agreement hereby surrenders any claim to ownership of copyright. Any and all works received in this way shall diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f612253..2b07b5c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1 +1,3 @@ + NAME Email + Logen Kain diff --git a/Contributor_License_Agreement b/Contributor_License_Agreement index 199de90..a4bfa70 100644 --- a/Contributor_License_Agreement +++ b/Contributor_License_Agreement @@ -20,6 +20,23 @@ will be used to the CONTRIBUTERS file. E-Mail: _________________ + Address: _________________ + + _________________ + + _________________ + + Country: _________________ + +If you are signing as an authorized representative on behalf of your +company or organization, please include the following: + +Organization name: ________________ + +Your Title: ________________ + + + You accept and agree to the following terms and conditions for your present and futre Contributions submitted to Zolfite. Except for From 26886d4de747d03dc10ff9a212ee8540fcb9ea04 Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Mon, 29 Jul 2013 21:35:25 -0500 Subject: [PATCH 09/12] modified anon contribute --- BEFORE_YOU_CONTRIBUTE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BEFORE_YOU_CONTRIBUTE b/BEFORE_YOU_CONTRIBUTE index ac2bfa8..7ef3d02 100644 --- a/BEFORE_YOU_CONTRIBUTE +++ b/BEFORE_YOU_CONTRIBUTE @@ -1,6 +1,6 @@ Please read and sign our Contributor_License_Agreement before contributing. -In most cases we will require the signed agreement before merging any code +In most cases we will require the signed CLA before merging any code however in some cases we may allow anonymous contributions. Any and all contributions from any entity that has not signed the From 64457741b3bb5bf2654d1bdf5fa57068218c341e Mon Sep 17 00:00:00 2001 From: silvernode Date: Sat, 27 Jul 2013 13:38:41 -0500 Subject: [PATCH 10/12] created changelog file, added current version number to README --- README.md | 3 ++- changelog.txt | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 changelog.txt diff --git a/README.md b/README.md index 3746b6b..dbf55ce 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -#Mandy +#Mandy - current version: 0.4 + ##About diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..86ffe93 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,13 @@ +***CHANGELOG*** + + +Version 0.4 (7-27-13) + ++ fixed media player error when opening finished file ++ fixed .mp3 validation ++ cancel button now works properly in url entry box +* added progress bar for conversion process +* added push notifications +* files now open with default media player not vlc + + From 9aceab941e2c9d63cf5ced574bda0b8eed03c51c Mon Sep 17 00:00:00 2001 From: silvernode Date: Sun, 28 Jul 2013 19:48:59 -0500 Subject: [PATCH 11/12] small cleanup --- main.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 main.lua diff --git a/main.lua b/main.lua old mode 100755 new mode 100644 From 293fbb3d642954a83170f5ec20626b6d40fbfd6c Mon Sep 17 00:00:00 2001 From: silvernode Date: Tue, 30 Jul 2013 06:20:38 -0500 Subject: [PATCH 12/12] Fixed ommited spaces issue in file name --- mandy.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mandy.lua b/mandy.lua index c67cf6d..3d48c6e 100644 --- a/mandy.lua +++ b/mandy.lua @@ -73,7 +73,7 @@ function ytDl(x) end function ffmpeg(tmpPath, dirD) - local subSpaces = string.gsub(dirD, " ", "\\") + local subSpaces = string.gsub(dirD, "", "\\") local mp3 = "ffmpeg -i "..tmpPath.." -acodec libmp3lame -ac 2 -ab 192k -vn -y "..subSpaces convert_mp3.go(mp3) io.popen("notify-send 'The file was saved to' "..subSpaces)