Skip to content
This repository has been archived by the owner on Mar 4, 2018. It is now read-only.

Commit

Permalink
Version 1.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
enen92 committed Sep 19, 2014
1 parent df2e219 commit ccb9948
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 12 deletions.
2 changes: 1 addition & 1 deletion plugin.video.p2p-streams/addon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.p2p-streams"
name="p2p-streams"
version="1.0.8"
version="1.0.9"
provider-name="enen92,fightnight">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
Expand Down
7 changes: 7 additions & 0 deletions plugin.video.p2p-streams/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
===== Stable Versions ========
[B]v1.0.9 (19/9/2014)[/B]
-Updated linux x64 Acestreamengine to version 3.0.0-b2
-Updated Openelec x64 Acestreamengine to version 3.0.0-b2
-Updated Android internal Acestreamengine to version 2.3.1
-Updated Android Apks in repository to match latest version of the engine and player
-Added support for android x86 (Acestream only)

[B]v1.0.8 (17/9/2014)[/B]
-Updated acestreamengine for Windows (version 2.3.0-Next)
-Updated acestreamengine for Linux x64 and Openelec x64 (version 3.0.0 b1)
Expand Down
35 changes: 24 additions & 11 deletions plugin.video.p2p-streams/resources/core/autoconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@
acestream_linux_i386_generic = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Linux/i386/acestream-linux-i386generic.tar.gz"
#Android
sopcast_apk = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/SopCast.apk.tar.gz"
acestreamengine_apk = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/AceStream-2.2.10-armv7.apk.tar.gz"
android_aceengine = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/org.acestream.engine.tar.gz"
android_aceplayer = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/AcePlayer-2.2.10-armv7.apk.tar.gz"
acestreamengine_apk_arm = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/AceStream-2.3.1-armv7.apk.tar.gz"
acestreamengine_apk_x86 = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/AcePlayer-2.3.1-x86.apk.tar.gz"
android_aceengine_arm = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/org.acestream.engine_arm.tar.gz"
android_aceengine_x86 = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/org.acestream.engine_x86.tar.gz"
android_aceplayer_arm = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/AcePlayer-2.3.1-armv7.apk.tar.gz"
android_aceplayer_x86 = "http://p2p-strm.googlecode.com/svn/trunk/Modules/Android/AcePlayer-2.3.1-x86.apk.tar.gz"
#Mac OSX
osx_i386_sopcast = "http://p2p-strm.googlecode.com/svn/trunk/Modules/MacOsx/i386/sopcast_osxi386.tar.gz"
osx_i386_acestream = "http://p2p-strm.googlecode.com/svn/trunk/Modules/MacOsx/i386/acestream_osxi386.tar.gz"
Expand Down Expand Up @@ -690,8 +693,12 @@ def configure_acestream(latest_version):
app_id = xbmcfolder[i]
settings.setSetting('app_id',app_id)
#Acestreamconfiguration for android starts here
acebundle = os.path.join(pastaperfil,android_aceengine.split("/")[-1])
download_tools().Downloader(android_aceengine,acebundle,translate(70014),translate(40000))
if "arm" in os.uname()[4]:
acebundle = os.path.join(pastaperfil,android_aceengine_arm.split("/")[-1])
download_tools().Downloader(android_aceengine_arm,acebundle,translate(70014),translate(40000))
else:
acebundle = os.path.join(pastaperfil,android_aceengine_x86.split("/")[-1])
download_tools().Downloader(android_aceengine_x86,acebundle,translate(70014),translate(40000))
import tarfile
if tarfile.is_tarfile(acebundle):
download_tools().extract(acebundle,pastaperfil)
Expand All @@ -716,12 +723,15 @@ def configure_acestream(latest_version):
mensagemok(translate(40000),translate(50018),translate(50019),translate(50020))
if xbmcvfs.exists(os.path.join("sdcard","Download")):
pasta = os.path.join("sdcard","Download")
acefile = os.path.join("sdcard","Download",acestreamengine_apk.split("/")[-1])
if "arm" in os.uname()[4]: acefile = os.path.join("sdcard","Download",acestreamengine_apk_arm.split("/")[-1])
else: acefile = os.path.join("sdcard","Download",acestreamengine_apk_x86.split("/")[-1])
else:
dialog = xbmcgui.Dialog()
pasta = dialog.browse(int(0), translate(40190), 'myprograms')
acefile = os.path.join(pasta,acestreamengine_apk.split("/")[-1])
download_tools().Downloader(acestreamengine_apk,acefile,translate(40072),translate(40000))
if "arm" in os.uname()[4]: acefile = os.path.join(pasta,acestreamengine_apk_arm.split("/")[-1])
else: acefile = os.path.join(pasta,acestreamengine_apk_x86.split("/")[-1])
if "arm" in os.uname()[4]: download_tools().Downloader(acestreamengine_apk_arm,acefile,translate(40072),translate(40000))
else: download_tools().Downloader(acestreamengine_apk_x86,acefile,translate(40072),translate(40000))
import tarfile
if tarfile.is_tarfile(acefile):
download_tools().extract(acefile,pasta)
Expand All @@ -734,12 +744,15 @@ def configure_acestream(latest_version):
if opcao:
if xbmcvfs.exists(os.path.join("sdcard","Download")):
pasta = os.path.join("sdcard","Download")
acefile = os.path.join("sdcard","Download",android_aceplayer.split("/")[-1])
if "arm" in os.uname()[4]: acefile = os.path.join("sdcard","Download",android_aceplayer_arm.split("/")[-1])
else: os.path.join("sdcard","Download",android_aceplayer_x86.split("/")[-1])
else:
dialog = xbmcgui.Dialog()
pasta = dialog.browse(int(0), translate(40190), 'myprograms')
acefile = os.path.join(pasta,acestreamengine_apk.split("/")[-1])
download_tools().Downloader(android_aceplayer,acefile,translate(70019),translate(40000))
if "arm" in os.uname()[4]: acefile = os.path.join(pasta,acestreamengine_apk_arm.split("/")[-1])
else: acefile = os.path.join(pasta,acestreamengine_apk_x86.split("/")[-1])
if "arm" in os.uname()[4]: download_tools().Downloader(android_aceplayer_arm,acefile,translate(70019),translate(40000))
else: download_tools().Downloader(android_aceplayer_x86,acefile,translate(70019),translate(40000))
import tarfile
if tarfile.is_tarfile(acefile):
download_tools().extract(acefile,pasta)
Expand Down

0 comments on commit ccb9948

Please sign in to comment.