Update teiler config

teiler/teiler.configdir/config

@@ -2,103 +2,71 @@
 
 # general variables
 
-backend=rofi
-slop_color="255,0,0"
-slop_border=2
-hidecursor=yes
-
 # the path where images, videos and pastes should be saved
 img_path=$HOME/Pictures/Screenshots
 vid_path=$HOME/Videos/Screencasts
 paste_path=$HOME/Pictures/Paste
 
-# some distibutions rename the gdbar binary to dzen2-gdbar
-# set it here, accordingly
-gdbar=gdbar
-
-# editor to be used
+# set viewer for images and videos plus editor for images
+viewer=feh
 editor=gimp
+player=vlc
 
-# Uploading & archiving options
-# Possible Choices for ul: fb, scp, s3, imgur (imgur does not support videos)
+# Hitting Enter will upload
+always_ul=1
+
+# Uploading options
+# Possible Choices for img_ul: fb, scp, s3, imgur
+# Possible Choices for vid_ul: fb, scp, s3
 # Possible Choices for paste_ul: fb, scp, ix
-#
-# If you don't want a local history of images/videos,
-# set archive_img/archive_vid to "0"
-# keep in mind, that imgur does not support videos
-ul=scp
+img_ul=scp
+vid_ul=scp
 paste_ul=scp
-archive_vid=1
-archive_img=1
-archive_paste=0
-upload_vid=0
-
-# filebin history
-# for filebin history to work, you need to set your host here:
-filebin_host=https://host.example.com
-
-# For scp you need to provide the actual path on your server
-# where your files should be stored
-# this path normally should be within a http domain.
-# also set the actual URL to the directory
-
-scp_host=ratte
-scp_path_img=/srv/sites/ianonavy.com/files
-scp_path_vid=/srv/sites/ianonavy.com/files
-scp_path_paste=/srv/sites/ianonavy.com/files
-http_img=http://files.ianonavy.com
-http_vid=http://files.ianonavy.com
-http_paste=http://files.ianonavy.com
-
-
-
-# s3 options
-# same as scp options. set an actual path within your bucket, where
-# files should be stored. Also set the URL to your directories.
-s3_bucket=
-s3_path_img=path/to/images
-s3_path_vid=path/to/videos
-s3_path_paste=path/to/pastes
-s3_http_img=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/images
-s3_http_vid=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/videos
-s3_http_paste=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/pastes
-
 
 # Screencast options
 # Resolution to change to when recording:
 res=800x600
 
 # Ffmpeg settings
-# Possible encoder options: libav and ffmpeg
+
+# set this to 1, if ffmpeg version is < 1.7.1
+ffmpeg_compat=0
 encoder=ffmpeg
-encopts="-r 30 -vcodec libx264 -pix_fmt yuv420p -s $res -acodec libmp3lame"
-rect_encopts="-r 30 -c:v libx264 -preset slow -crf 18 -c:a libvorbis"
-ffaudio="-f alsa -ac 2 -i pulse"
+
+# Profile to use for screencasts
+# profiles are stored in $HOME/.config/teiler/profiles
+# teiler ships with 2 profiles atm. mp4-pulse and mp4-noaudio
+profile="mp4-pulse"
 
 # record indicator
 rec_text="capturing..."
 rec_w=100
-rec_x=3400
-rec_y=0
-rec_font=PragmataPro-10
+rec_font=Sans Mono-10
 rec_nf=\#FFFFFF
 rec_sf=\#000000
 
-
 # Normally you don't want to change anything here!
 SCREENCAST_PIDFILE=/tmp/$USER-teiler-screencast.pid
 INDICATOR_PIDFILE=/tmp/$USER-teiler-indicator.pid
-time=1000
 namekey=teiler
-random_string=$(date +%s | sha256sum | base64 | head -c 4 ; echo)
-img_filemask=$random_string
-vid_filemask=$random_string
-paste_filemask=$random_string
+random_string=$(date +'%Y-%m-%d-%H%M%S')
+img_filemask=img-$random_string.png
+paste_filemask=txt-$random_string.txt
 
+# video filemask is without extension, since it gets the extension
+# from set profile
+vid_filemask=vid-$random_string
+help_color="#0C73C2"
+slop_color="255,0,0"
+slop_border=2
+hidecursor=yes
+# slop options
+slop_border=1
+slop_color="255,0,0"
+hidecursor=yes
 
-###### rofi options ######
-
+# rofi options ######
 # here you can override options for rofi. normally rofi options
 # are read from ~/.Xresources, so setting options there is recommended.
 # you can dump options for ~/.Xresources with "rofi -dump-xresources"
-rofiopts="-lines 25"
+# rofiopts="-border 2 -width 35 -lines 40 -padding 12"

teiler/teiler.configdir/config.old

@@ -0,0 +1,105 @@
+##### teiler configuration file ######
+
+# general variables
+
+backend=rofi
+slop_color="255,0,0"
+slop_border=2
+hidecursor=yes
+
+# the path where images, videos and pastes should be saved
+img_path=$HOME/Pictures/Screenshots
+vid_path=$HOME/Videos/Screencasts
+paste_path=$HOME/Pictures/Paste
+
+# some distibutions rename the gdbar binary to dzen2-gdbar
+# set it here, accordingly
+gdbar=gdbar
+
+# editor to be used
+editor=gimp
+
+# Uploading & archiving options
+# Possible Choices for ul: fb, scp, s3, imgur (imgur does not support videos)
+# Possible Choices for paste_ul: fb, scp, ix
+#
+# If you don't want a local history of images/videos,
+# set archive_img/archive_vid to "0"
+# keep in mind, that imgur does not support videos
+img_ul=scp
+vid_ul=scp
+paste_ul=scp
+archive_vid=1
+archive_img=1
+archive_paste=0
+upload_vid=0
+
+# filebin history
+# for filebin history to work, you need to set your host here:
+filebin_host=https://host.example.com
+
+# For scp you need to provide the actual path on your server
+# where your files should be stored
+# this path normally should be within a http domain.
+# also set the actual URL to the directory
+
+scp_host=ratte
+scp_path_img=/srv/sites/ianonavy.com/files
+scp_path_vid=/srv/sites/ianonavy.com/files
+scp_path_paste=/srv/sites/ianonavy.com/files
+http_img=http://files.ianonavy.com
+http_vid=http://files.ianonavy.com
+http_paste=http://files.ianonavy.com
+
+
+
+# s3 options
+# same as scp options. set an actual path within your bucket, where
+# files should be stored. Also set the URL to your directories.
+s3_bucket=
+s3_path_img=path/to/images
+s3_path_vid=path/to/videos
+s3_path_paste=path/to/pastes
+s3_http_img=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/images
+s3_http_vid=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/videos
+s3_http_paste=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/pastes
+
+
+# Screencast options
+# Resolution to change to when recording:
+res=800x600
+
+# Ffmpeg settings
+# Possible encoder options: libav and ffmpeg
+encoder=ffmpeg
+encopts="-r 30 -vcodec libx264 -pix_fmt yuv420p -s $res -acodec libmp3lame"
+rect_encopts="-r 30 -c:v libx264 -preset slow -crf 18 -c:a libvorbis"
+ffaudio="-f alsa -ac 2 -i pulse"
+
+# record indicator
+rec_text="capturing..."
+rec_w=100
+rec_x=3400
+rec_y=0
+rec_font=PragmataPro-10
+rec_nf=\#FFFFFF
+rec_sf=\#000000
+
+
+# Normally you don't want to change anything here!
+SCREENCAST_PIDFILE=/tmp/$USER-teiler-screencast.pid
+INDICATOR_PIDFILE=/tmp/$USER-teiler-indicator.pid
+time=1000
+namekey=teiler
+random_string=$(date +%s | sha256sum | base64 | head -c 4 ; echo)
+img_filemask=${random_string}.png
+vid_filemask=${random_string}.mp4
+paste_filemask=${random_string}.txt
+
+
+###### rofi options ######
+
+# here you can override options for rofi. normally rofi options
+# are read from ~/.Xresources, so setting options there is recommended.
+# you can dump options for ~/.Xresources with "rofi -dump-xresources"
+rofiopts="-lines 25"

teiler/teiler.configdir/profiles/mp4-noaudio

@@ -0,0 +1,7 @@
+# do not edit this file. instead make a copy under different name
+# teiler will overwrite this file on start
+
+encopts="-r 30 -vcodec libx264 -pix_fmt yuv420p -s $res -acodec libmp3lame"
+rect_encopts="-r 30 -c:v libx264 -preset slow -crf 18 -c:a libvorbis"
+ext="mp4"
+ffaudio=""

teiler/teiler.configdir/profiles/mp4-pulse

@@ -0,0 +1,7 @@
+# do not edit this file. instead make a copy under different name
+# teiler will overwrite this file on start
+
+encopts="-r 30 -vcodec libx264 -pix_fmt yuv420p -s $res -acodec libmp3lame"
+rect_encopts="-r 30 -c:v libx264 -preset slow -crf 18 -c:a libvorbis"
+ext="mp4"
+ffaudio="-f alsa -ac 2 -i pulse"

teiler/teiler.configdir/uploader/s3

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+s3_bucket=
+s3_path_img=path/to/images
+s3_path_vid=path/to/videos
+s3_path_paste=path/to/pastes
+s3_http_img=http://S3_DOMAIN/path/to/images
+s3_http_vid=http://S3_DOMAIN/path/to/videos
+s3_http_paste=http://S3_DOMAIN/path/to/pastes

teiler/teiler.configdir/uploader/scp

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+scp_host=ratte
+scp_path_img=/srv/sites/ianonavy.com/files
+scp_path_vid=/srv/sites/ianonavy.com/files
+scp_path_paste=/srv/sites/ianonavy.com/files
+http_img=https://ianonavy.com/files
+http_vid=https://ianonavy.com/files
+http_paste=https://ianonavy.com/files
+