diff --git a/patreon-dl/gui/VERSION b/patreon-dl/gui/VERSION index 7bcd0e3..6812f81 100755 --- a/patreon-dl/gui/VERSION +++ b/patreon-dl/gui/VERSION @@ -1 +1 @@ -0.0.2 \ No newline at end of file +0.0.3 \ No newline at end of file diff --git a/patreon-dl/gui/bin/install.sh b/patreon-dl/gui/bin/install.sh new file mode 100755 index 0000000..2787a9a --- /dev/null +++ b/patreon-dl/gui/bin/install.sh @@ -0,0 +1,20 @@ +#!/bin/bash +INSTDIR="$HOME/.local/share/applications" +mkdir -p "$INSTDIR/patreon-dl-gui" &> /dev/null +echo "cp ./`ls *.bin` $INSTDIR/patreon-dl-gui/" +cp ./`ls *.bin` $INSTDIR/patreon-dl-gui/ +echo "cp ./`ls *.png` $INSTDIR/patreon-dl-gui/" +cp ./`ls *.png` $INSTDIR/patreon-dl-gui/ + +if [ ! -f "$INSTDIR/patreon-dl-gui/`ls *.json`" ]; then + echo "cp ./`ls *.json` $INSTDIR/patreon-dl-gui/" + cp ./`ls *.json` $INSTDIR/patreon-dl-gui/ +fi + +if [ -e $INSTDIR/patreon-dl ]; then + rm $INSTDIR/patreon-dl +fi + +echo "ln -s $INSTDIR/patreon-dl-gui/`ls *.bin` $INSTDIR/patreon-dl" +ln -s $INSTDIR/patreon-dl-gui/`ls *.bin` $INSTDIR/patreon-dl +cat ./patreon-dl-gui.desktop | sed -e "s|{HOME}|$HOME|g" > $INSTDIR/patreon-dl-gui.desktop \ No newline at end of file diff --git a/patreon-dl/gui/bin/patreon-dl-gui.desktop b/patreon-dl/gui/bin/patreon-dl-gui.desktop new file mode 100644 index 0000000..4d879e5 --- /dev/null +++ b/patreon-dl/gui/bin/patreon-dl-gui.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=0.0.2 +Name=Pateon DL +Comment=Download videos from Patreon +Exec={HOME}/.local/share/applications/patreon-dl +Icon={HOME}/.local/share/applications/patreon-dl-gui/patreon-dl.png +Terminal=false +StartupWMClass=FLTK +Type=Application +Categories=media +MimeType=application/octet-stream diff --git a/patreon-dl/gui/bin/patreon-dl.png b/patreon-dl/gui/bin/patreon-dl.png new file mode 100644 index 0000000..ee082de Binary files /dev/null and b/patreon-dl/gui/bin/patreon-dl.png differ diff --git a/patreon-dl/gui/handlers/mods/patreon.go b/patreon-dl/gui/handlers/mods/patreon.go index d20e8b3..f8bbde0 100644 --- a/patreon-dl/gui/handlers/mods/patreon.go +++ b/patreon-dl/gui/handlers/mods/patreon.go @@ -87,12 +87,17 @@ func ProcPatreon(fn func(string), config *config.Config, playlistURL string, out fileSize := GetFileSize("Temp file", tmpfile) if maxSize > 0 && fileSize > int64(maxSize) { + fmt.Printf("File size (%v) exceeds thresshold (%v); initiating re-encode...", fileSize, int64(maxSize)) + fn(Format("File size (%v) exceeds thresshold (%v); initiating re-encode...", fileSize, int64(maxSize))) + time.Sleep(time.Duration(sleepTimeout) * time.Second) if err = Encode(config.FFMpegBin, []string{tmpfile}); err != nil { fn(Format("Error: %v", err)) time.Sleep(time.Duration(sleepTimeout) * time.Second) } } else { - fmt.Printf("File size (%v) does not exceed max file size (%v); continuing...\n", fileSize, maxSize) + fmt.Printf("File size (%v) does not exceed thresshold (%v); continuing...\n", fileSize, maxSize) + fn(Format("File size (%v) does not exceed thresshold (%v); continuing...\n", fileSize, maxSize)) + time.Sleep(time.Duration(sleepTimeout) * time.Second) } fmt.Printf("Renaming '%s' to '%s'\n", tmpfile, outfile) diff --git a/patreon-dl/gui/handlers/mods/vimeo.go b/patreon-dl/gui/handlers/mods/vimeo.go index 68bd0a2..55ec3a8 100644 --- a/patreon-dl/gui/handlers/mods/vimeo.go +++ b/patreon-dl/gui/handlers/mods/vimeo.go @@ -102,12 +102,17 @@ func ProcVimeo(fn func(string), config *config.Config, playlistURL string, outfi fileSize := GetFileSize("Temp file", tmpfile) if maxSize > 0 && fileSize > int64(maxSize) { + fmt.Printf("File size (%v) exceeds thresshold (%v); initiating re-encode...", fileSize, int64(maxSize)) + fn(Format("File size (%v) exceeds thresshold (%v); initiating re-encode...", fileSize, int64(maxSize))) + time.Sleep(time.Duration(sleepTimeout) * time.Second) if err = Encode(config.FFMpegBin, []string{tmpfile}); err != nil { fn(Format("Error: %v", err)) time.Sleep(time.Duration(sleepTimeout) * time.Second) } } else { - fmt.Println("File size does not exceed max file size; continuing...") + fmt.Printf("File size (%v) does not exceed thresshold (%v); continuing...\n", fileSize, maxSize) + fn(Format("File size (%v) does not exceed thresshold (%v); continuing...\n", fileSize, maxSize)) + time.Sleep(time.Duration(sleepTimeout) * time.Second) } fmt.Printf("Renaming '%s' to '%s'...\n", tmpfile, outfile) diff --git a/patreon-dl/gui/makefile b/patreon-dl/gui/makefile index 9591645..c972960 100644 --- a/patreon-dl/gui/makefile +++ b/patreon-dl/gui/makefile @@ -28,7 +28,7 @@ endif publish: ifneq ("$(wildcard ./bin/${BINNAME}-linux-${VERSION}.bin)","") mkdir -p ${PUBDIR} - tar -cf ${PUBDIR}/${BINNAME}-linux-${VERSION}.tar -C ./bin/ ${BINNAME}-linux-${VERSION}.bin config.json + tar -cf ${PUBDIR}/${BINNAME}-linux-${VERSION}.tar -C ./bin/ ${BINNAME}-linux-${VERSION}.bin config.json install.sh patreon-dl-gui.desktop patreon-dl.png endif clean: diff --git a/patreon-dl/gui/patreon-dl-gui.desktop b/patreon-dl/gui/patreon-dl-gui.desktop new file mode 100644 index 0000000..326ef58 --- /dev/null +++ b/patreon-dl/gui/patreon-dl-gui.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=0.0.2 +Name=Pateon DL +Comment=Download videos from Patreon +Exec=/home/cdmnky/.bin/patreon-dl/patreon-dl-gui +Icon=/home/cdmnky/Documents/System76/Icons/patreon.png +Terminal=false +StartupWMClass=FLTK +Type=Application +Categories=media +MimeType=application/octet-stream