Skip to content

Commit

Permalink
Set Downloadmanager
Browse files Browse the repository at this point in the history
Former-commit-id: 991c1fd
  • Loading branch information
xaverW committed Jan 26, 2016
1 parent 8ab5c93 commit 9558f62
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 8 deletions.
2 changes: 0 additions & 2 deletions dist/Info/11.298.build

This file was deleted.

2 changes: 2 additions & 0 deletions dist/Info/11.301.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Datum: 26.01.2016
MediathekView Buildnummer: 11.301
2 changes: 1 addition & 1 deletion dist/MediathekView.jar.REMOVED.git-id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
737cdf8c339c47577d0ea3b3103c4a34d4528493
83e983b745afcf30603ba76feb91ee2655a70e6c
3 changes: 3 additions & 0 deletions dist/bin/aria2-remote.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/bash

# Das Skript muss evtl. noch
# "ausführbar" gemacht werden!!!

# Programmparameter in MediathekView
# %f ** <URL of aria2 daemon> <secret for aria2 daemon>

# oder ohne gesetztes Passwort
# %f ** <URL of aria2 daemon>

Expand Down
Binary file modified dist/lib/MSearch.jar
Binary file not shown.
Binary file modified libs/MSearch.jar
Binary file not shown.
69 changes: 69 additions & 0 deletions res/bin/aria2-remote.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/bin/bash

# Das Skript muss evtl. noch
# "ausführbar" gemacht werden!!!

# Programmparameter in MediathekView
# %f ** <URL of aria2 daemon> <secret for aria2 daemon>

# oder ohne gesetztes Passwort
# %f ** <URL of aria2 daemon>

# Start von aria2 auf dem Server
# aria2c --enable-rpc --rpc-listen-all --dir=/ZIELPFAD/FILME


log=/tmp/MediathekView-aria2.log
echo "Running $0 $*" >$log

url=$1
filename=$(basename "$2")

aria2_server_url=$3
aria2_server_secret=$4

#echo >>$log
#echo "MediathekView-aria2 parameters:" >>$log
#while [ -n "$1" ]
#do
# echo "$1" >>$log
# shift
#done

echo >>$log
echo "url: " $url >>$log
echo "filename: " $filename >>$log
echo "aria2_server_url: " $aria2_server_url >>$log
echo "aria2_server_secret: " $aria2_server_secret >>$log

id=medview
method=aria2.addUri

if [ -n "$filename" ]
then
options=",{\"out\":\"${filename}\"}"
else
options=""
fi

params="[\"token:${aria2_server_secret}\",[\"${url}\"]${options}]"
params_base64enc=$(echo "${params}" | base64 -w 0 -)
params_base64enc_urlenc=${params_base64enc//=/%3D}

get="${aria2_server_url}?id=${id}&method=${method}&params=${params_base64enc_urlenc}"

echo >>$log
echo "executing: $get" >>$log

result=$(curl -S -k "$get")

echo >>$log
echo "result: $result" >>$log

if [[ $result =~ '"result":' ]]
then
exit 0
else
exit 1
fi

2 changes: 0 additions & 2 deletions src/mediathek/tool/GuiFunktionenProgramme.java
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,6 @@ private static boolean addOnZip(String datei) {
fOut.write(buffer, 0, n);
}
fOut.close();
f.setExecutable(true, false);
f.setReadable(true, false);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/version.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Sun, 24 Jan 2016 18:22:25 +0100
#Tue, 26 Jan 2016 14:34:34 +0100

BUILD=11.298
DATE=24.01.2016 / 18\:22\:25
BUILD=11.301
DATE=26.01.2016 / 14\:34\:34

0 comments on commit 9558f62

Please sign in to comment.