modified: ACEStream/Core/APIImplementation/DownloadImpl.py

modified: ACEStream/Core/APIImplementation/SingleDownload.py modified: ACEStream/Core/BitTornado/BT1/Storage.py modified: ACEStream/Core/BitTornado/BT1/StorageWrapper.py modified: ACEStream/Core/defaults.py modified: ACEStream/Player/BaseApp.py
pticaTor · May 21, 2013 · dda42f9 · dda42f9
1 parent fd8c3af
commit dda42f9
Show file tree

Hide file tree

Showing 205 changed files with 37 additions and 184 deletions.
diff --git a/ACEStream/Category/Category.pyc b/ACEStream/Category/Category.pyc
diff --git a/ACEStream/Category/FamilyFilter.pyc b/ACEStream/Category/FamilyFilter.pyc
diff --git a/ACEStream/Category/__init__.pyc b/ACEStream/Category/__init__.pyc
diff --git a/ACEStream/Category/init_category.pyc b/ACEStream/Category/init_category.pyc
diff --git a/ACEStream/Core/API.pyc b/ACEStream/Core/API.pyc
diff --git a/ACEStream/Core/APIImplementation/DirectDownload.pyc b/ACEStream/Core/APIImplementation/DirectDownload.pyc
diff --git a/ACEStream/Core/APIImplementation/DownloadImpl.py b/ACEStream/Core/APIImplementation/DownloadImpl.py
@@ -44,7 +44,7 @@ def __init__(self, dltype, session, tdef = None, main_url = None):
             self.tdef.readonly = True
             self.log_prefix = 'DownloadImpl::' + str(DLTYPE_TORRENT) + ':' + binascii.hexlify(self.tdef.get_infohash()) + ':'
             if tdef.can_save() != 1:
-                self.encrypted_storage = True
+                self.encrypted_storage = False
             else:
                 self.encrypted_storage = globalConfig.get_value('encrypted_storage')
         elif self.dltype == DLTYPE_DIRECT:

diff --git a/ACEStream/Core/APIImplementation/DownloadImpl.pyc b/ACEStream/Core/APIImplementation/DownloadImpl.pyc
diff --git a/ACEStream/Core/APIImplementation/DownloadRuntimeConfig.pyc b/ACEStream/Core/APIImplementation/DownloadRuntimeConfig.pyc
diff --git a/ACEStream/Core/APIImplementation/FakeDownload.pyc b/ACEStream/Core/APIImplementation/FakeDownload.pyc
diff --git a/ACEStream/Core/APIImplementation/LaunchManyCore.pyc b/ACEStream/Core/APIImplementation/LaunchManyCore.pyc
diff --git a/ACEStream/Core/APIImplementation/SessionRuntimeConfig.pyc b/ACEStream/Core/APIImplementation/SessionRuntimeConfig.pyc
diff --git a/ACEStream/Core/APIImplementation/SingleDownload.py b/ACEStream/Core/APIImplementation/SingleDownload.py
@@ -42,6 +42,7 @@ def __init__(self, infohash, metainfo, kvconfig, multihandler, get_extip_func, l
         self.repexer = None
         self.log_prefix = 'sd::' + binascii.hexlify(self.infohash) + ':'
         self.lock = Lock()
+        self.stopping = False
         self.download_id = binascii.hexlify(self.infohash) + '-' + str(long(time.time())) + '-' + str(random.randint(0, 100000))
         try:
             self.dldoneflag = Event()
@@ -288,11 +289,20 @@ def checkpoint(self):
         else:
             return
 
-    def shutdown(self):
+    def shutdown(self, blocking = True):
         if DEBUG:
             log(self.log_prefix + 'shutdown: thread', currentThread().getName())
         resumedata = None
-        self.lock.acquire()
+        if self.stopping:
+            if DEBUG:
+                log(self.log_prefix + 'shutdown: already stopping, exit: thread', currentThread().getName())
+            return
+        if DEBUG:
+            log(self.log_prefix + 'shutdown, acquire lock: blocking', blocking, 'thread', currentThread().getName())
+        locked = self.lock.acquire(blocking)
+        if DEBUG:
+            log(self.log_prefix + 'shutdown, got lock: locked', locked, 'thread', currentThread().getName())
+        self.stopping = True
         try:
             if self.dow is not None:
                 if self.repexer:
@@ -314,7 +324,11 @@ def shutdown(self):
             elif DEBUG:
                 log(self.log_prefix + 'shutdown: regular shutdown: _getstatsfunc', self._getstatsfunc, 'thread', currentThread().getName())
         finally:
-            self.lock.release()
+            if DEBUG:
+                log(self.log_prefix + 'shutdown, release lock: thread', currentThread().getName())
+            self.stopping = False
+            if locked:
+                self.lock.release()
 
         return resumedata
 
@@ -464,7 +478,7 @@ def fatalerrorfunc(self, data):
         else:
             log_exc()
             self.set_error_func(data)
-        self.shutdown()
+        self.shutdown(blocking=False)
 
     def nonfatalerrorfunc(self, e):
         log(self.log_prefix + 'nonfatalerrorfunc called', e)

diff --git a/ACEStream/Core/APIImplementation/SingleDownload.pyc b/ACEStream/Core/APIImplementation/SingleDownload.pyc
diff --git a/ACEStream/Core/APIImplementation/ThreadPool.pyc b/ACEStream/Core/APIImplementation/ThreadPool.pyc
diff --git a/ACEStream/Core/APIImplementation/UserCallbackHandler.pyc b/ACEStream/Core/APIImplementation/UserCallbackHandler.pyc
diff --git a/ACEStream/Core/APIImplementation/__init__.pyc b/ACEStream/Core/APIImplementation/__init__.pyc
diff --git a/ACEStream/Core/APIImplementation/maketorrent.pyc b/ACEStream/Core/APIImplementation/maketorrent.pyc
diff --git a/ACEStream/Core/APIImplementation/makeurl.pyc b/ACEStream/Core/APIImplementation/makeurl.pyc
diff --git a/ACEStream/Core/APIImplementation/miscutils.pyc b/ACEStream/Core/APIImplementation/miscutils.pyc
diff --git a/ACEStream/Core/Base.pyc b/ACEStream/Core/Base.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Choker.pyc b/ACEStream/Core/BitTornado/BT1/Choker.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Connecter.pyc b/ACEStream/Core/BitTornado/BT1/Connecter.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Downloader.pyc b/ACEStream/Core/BitTornado/BT1/Downloader.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/DownloaderFeedback.pyc b/ACEStream/Core/BitTornado/BT1/DownloaderFeedback.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Encrypter.pyc b/ACEStream/Core/BitTornado/BT1/Encrypter.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/FileSelector.pyc b/ACEStream/Core/BitTornado/BT1/FileSelector.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Filter.pyc b/ACEStream/Core/BitTornado/BT1/Filter.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/GetRightHTTPDownloader.pyc b/ACEStream/Core/BitTornado/BT1/GetRightHTTPDownloader.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/HoffmanHTTPDownloader.pyc b/ACEStream/Core/BitTornado/BT1/HoffmanHTTPDownloader.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/MessageID.pyc b/ACEStream/Core/BitTornado/BT1/MessageID.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/NatCheck.pyc b/ACEStream/Core/BitTornado/BT1/NatCheck.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/PiecePicker.pyc b/ACEStream/Core/BitTornado/BT1/PiecePicker.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Rerequester.pyc b/ACEStream/Core/BitTornado/BT1/Rerequester.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Statistics.pyc b/ACEStream/Core/BitTornado/BT1/Statistics.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Storage.py b/ACEStream/Core/BitTornado/BT1/Storage.py
@@ -256,8 +256,14 @@ def _close(self, file):
             f.flush()
             self.unlock_file(file, f)
             f.close()
-            self.tops[file] = getsize(file)
-            self.mtimes[file] = getmtime(file)
+            if os.path.isfile(file):
+                self.tops[file] = getsize(file)
+                self.mtimes[file] = getmtime(file)
+            else:
+                if DEBUG:
+                    log(self.log_prefix + '_close: missing file', file)
+                self.tops[file] = 0
+                self.mtimes[file] = 0
         else:
             if self.lock_while_reading:
                 self.unlock_file(file, f)

diff --git a/ACEStream/Core/BitTornado/BT1/Storage.pyc b/ACEStream/Core/BitTornado/BT1/Storage.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/StorageWrapper.py b/ACEStream/Core/BitTornado/BT1/StorageWrapper.py
@@ -857,8 +857,7 @@ def sync(self):
         except IOError as e:
             self.failed('IO Error: ' + str(e))
         except OSError as e:
-	    log('OS Error: ' + str(e))
-            #self.failed('OS Error: ' + str(e))
+            self.failed('OS Error: ' + str(e))
 
     def _move_piece(self, index, newpos):
         oldpos = self.places[index]

diff --git a/ACEStream/Core/BitTornado/BT1/StorageWrapper.pyc b/ACEStream/Core/BitTornado/BT1/StorageWrapper.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/T2T.pyc b/ACEStream/Core/BitTornado/BT1/T2T.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/Uploader.pyc b/ACEStream/Core/BitTornado/BT1/Uploader.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/__init__.pyc b/ACEStream/Core/BitTornado/BT1/__init__.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/btformats.pyc b/ACEStream/Core/BitTornado/BT1/btformats.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/convert.pyc b/ACEStream/Core/BitTornado/BT1/convert.pyc
diff --git a/ACEStream/Core/BitTornado/BT1/track.pyc b/ACEStream/Core/BitTornado/BT1/track.pyc
diff --git a/ACEStream/Core/BitTornado/CurrentRateMeasure.pyc b/ACEStream/Core/BitTornado/CurrentRateMeasure.pyc
diff --git a/ACEStream/Core/BitTornado/HTTPHandler.pyc b/ACEStream/Core/BitTornado/HTTPHandler.pyc
diff --git a/ACEStream/Core/BitTornado/RateLimiter.pyc b/ACEStream/Core/BitTornado/RateLimiter.pyc
diff --git a/ACEStream/Core/BitTornado/RateMeasure.pyc b/ACEStream/Core/BitTornado/RateMeasure.pyc
diff --git a/ACEStream/Core/BitTornado/RawServer.pyc b/ACEStream/Core/BitTornado/RawServer.pyc
diff --git a/ACEStream/Core/BitTornado/ServerPortHandler.pyc b/ACEStream/Core/BitTornado/ServerPortHandler.pyc
diff --git a/ACEStream/Core/BitTornado/SocketHandler.pyc b/ACEStream/Core/BitTornado/SocketHandler.pyc
diff --git a/ACEStream/Core/BitTornado/__init__.pyc b/ACEStream/Core/BitTornado/__init__.pyc
diff --git a/ACEStream/Core/BitTornado/bencode.pyc b/ACEStream/Core/BitTornado/bencode.pyc
diff --git a/ACEStream/Core/BitTornado/bitfield.pyc b/ACEStream/Core/BitTornado/bitfield.pyc
diff --git a/ACEStream/Core/BitTornado/clock.pyc b/ACEStream/Core/BitTornado/clock.pyc
diff --git a/ACEStream/Core/BitTornado/download_bt1.pyc b/ACEStream/Core/BitTornado/download_bt1.pyc
diff --git a/ACEStream/Core/BitTornado/iprangeparse.pyc b/ACEStream/Core/BitTornado/iprangeparse.pyc
diff --git a/ACEStream/Core/BitTornado/natpunch.pyc b/ACEStream/Core/BitTornado/natpunch.pyc
diff --git a/ACEStream/Core/BitTornado/parseargs.pyc b/ACEStream/Core/BitTornado/parseargs.pyc
diff --git a/ACEStream/Core/BitTornado/parsedir.pyc b/ACEStream/Core/BitTornado/parsedir.pyc
diff --git a/ACEStream/Core/BitTornado/piecebuffer.pyc b/ACEStream/Core/BitTornado/piecebuffer.pyc
diff --git a/ACEStream/Core/BitTornado/subnetparse.pyc b/ACEStream/Core/BitTornado/subnetparse.pyc
diff --git a/ACEStream/Core/BitTornado/torrentlistparse.pyc b/ACEStream/Core/BitTornado/torrentlistparse.pyc
diff --git a/ACEStream/Core/BitTornado/zurllib.pyc b/ACEStream/Core/BitTornado/zurllib.pyc
diff --git a/ACEStream/Core/CacheDB/CacheDBHandler.pyc b/ACEStream/Core/CacheDB/CacheDBHandler.pyc
diff --git a/ACEStream/Core/CacheDB/Notifier.pyc b/ACEStream/Core/CacheDB/Notifier.pyc
diff --git a/ACEStream/Core/CacheDB/SqliteCacheDBHandler.pyc b/ACEStream/Core/CacheDB/SqliteCacheDBHandler.pyc
diff --git a/ACEStream/Core/CacheDB/SqliteFriendshipStatsCacheDB.pyc b/ACEStream/Core/CacheDB/SqliteFriendshipStatsCacheDB.pyc
diff --git a/ACEStream/Core/CacheDB/SqliteSeedingStatsCacheDB.pyc b/ACEStream/Core/CacheDB/SqliteSeedingStatsCacheDB.pyc
diff --git a/ACEStream/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.pyc b/ACEStream/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.pyc
diff --git a/ACEStream/Core/CacheDB/__init__.pyc b/ACEStream/Core/CacheDB/__init__.pyc
diff --git a/ACEStream/Core/CacheDB/cachedb.pyc b/ACEStream/Core/CacheDB/cachedb.pyc
diff --git a/ACEStream/Core/CacheDB/maxflow.pyc b/ACEStream/Core/CacheDB/maxflow.pyc
diff --git a/ACEStream/Core/CacheDB/sqlitecachedb.pyc b/ACEStream/Core/CacheDB/sqlitecachedb.pyc
diff --git a/ACEStream/Core/ClosedSwarm/ClosedSwarm.pyc b/ACEStream/Core/ClosedSwarm/ClosedSwarm.pyc
diff --git a/ACEStream/Core/ClosedSwarm/__init__.pyc b/ACEStream/Core/ClosedSwarm/__init__.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/MagnetLink/MagnetLink.pyc b/ACEStream/Core/DecentralizedTracking/MagnetLink/MagnetLink.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/MagnetLink/MiniBitTorrent.pyc b/ACEStream/Core/DecentralizedTracking/MagnetLink/MiniBitTorrent.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/MagnetLink/__init__.pyc b/ACEStream/Core/DecentralizedTracking/MagnetLink/__init__.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/__init__.pyc b/ACEStream/Core/DecentralizedTracking/__init__.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/mainlineDHT.pyc b/ACEStream/Core/DecentralizedTracking/mainlineDHT.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/__init__.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/__init__.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/__init__.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/__init__.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/bencode.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/bencode.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/controller.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/controller.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/floodbarrier.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/floodbarrier.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/identifier.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/identifier.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/logging_conf.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/logging_conf.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/message.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/message.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/message_tools.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/message_tools.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/minitwisted.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/minitwisted.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/node.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/node.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/ptime.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/ptime.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/pymdht.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/pymdht.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/querier.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/querier.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/routing_table.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/routing_table.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/token_manager.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/token_manager.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/tracker.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/tracker.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/core/utils.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/core/utils.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/plugins/__init__.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/plugins/__init__.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/plugins/lookup_a16.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/plugins/lookup_a16.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt.pyc b/ACEStream/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/repex.pyc b/ACEStream/Core/DecentralizedTracking/repex.pyc
diff --git a/ACEStream/Core/DecentralizedTracking/ut_pex.pyc b/ACEStream/Core/DecentralizedTracking/ut_pex.pyc
diff --git a/ACEStream/Core/DirectDownload/Downloader.pyc b/ACEStream/Core/DirectDownload/Downloader.pyc
diff --git a/ACEStream/Core/DirectDownload/Storage.pyc b/ACEStream/Core/DirectDownload/Storage.pyc
diff --git a/ACEStream/Core/DirectDownload/VODTransporter.pyc b/ACEStream/Core/DirectDownload/VODTransporter.pyc
diff --git a/ACEStream/Core/DirectDownload/__init__.pyc b/ACEStream/Core/DirectDownload/__init__.pyc
diff --git a/ACEStream/Core/Download.pyc b/ACEStream/Core/Download.pyc
diff --git a/ACEStream/Core/DownloadConfig.pyc b/ACEStream/Core/DownloadConfig.pyc
diff --git a/ACEStream/Core/DownloadState.pyc b/ACEStream/Core/DownloadState.pyc
diff --git a/ACEStream/Core/LiveSourceAuthConfig.pyc b/ACEStream/Core/LiveSourceAuthConfig.pyc
diff --git a/ACEStream/Core/Merkle/__init__.pyc b/ACEStream/Core/Merkle/__init__.pyc
diff --git a/ACEStream/Core/Merkle/merkle.pyc b/ACEStream/Core/Merkle/merkle.pyc
diff --git a/ACEStream/Core/NATFirewall/ConnectionCheck.pyc b/ACEStream/Core/NATFirewall/ConnectionCheck.pyc
diff --git a/ACEStream/Core/NATFirewall/DialbackMsgHandler.pyc b/ACEStream/Core/NATFirewall/DialbackMsgHandler.pyc
diff --git a/ACEStream/Core/NATFirewall/NatCheck.pyc b/ACEStream/Core/NATFirewall/NatCheck.pyc
diff --git a/ACEStream/Core/NATFirewall/ReturnConnHandler.pyc b/ACEStream/Core/NATFirewall/ReturnConnHandler.pyc
diff --git a/ACEStream/Core/NATFirewall/TimeoutCheck.pyc b/ACEStream/Core/NATFirewall/TimeoutCheck.pyc
diff --git a/ACEStream/Core/NATFirewall/TimeoutFinder.pyc b/ACEStream/Core/NATFirewall/TimeoutFinder.pyc
diff --git a/ACEStream/Core/NATFirewall/UDPPuncture.pyc b/ACEStream/Core/NATFirewall/UDPPuncture.pyc
diff --git a/ACEStream/Core/NATFirewall/UPnPThread.pyc b/ACEStream/Core/NATFirewall/UPnPThread.pyc
diff --git a/ACEStream/Core/NATFirewall/__init__.pyc b/ACEStream/Core/NATFirewall/__init__.pyc
diff --git a/ACEStream/Core/NATFirewall/guessip.pyc b/ACEStream/Core/NATFirewall/guessip.pyc
diff --git a/ACEStream/Core/NATFirewall/upnp.pyc b/ACEStream/Core/NATFirewall/upnp.pyc
diff --git a/ACEStream/Core/Overlay/OverlayThreadingBridge.pyc b/ACEStream/Core/Overlay/OverlayThreadingBridge.pyc
diff --git a/ACEStream/Core/Overlay/SecureOverlay.pyc b/ACEStream/Core/Overlay/SecureOverlay.pyc
diff --git a/ACEStream/Core/Overlay/__init__.pyc b/ACEStream/Core/Overlay/__init__.pyc
diff --git a/ACEStream/Core/Overlay/permid.pyc b/ACEStream/Core/Overlay/permid.pyc
diff --git a/ACEStream/Core/ProxyMode/Helper.pyc b/ACEStream/Core/ProxyMode/Helper.pyc
diff --git a/ACEStream/Core/ProxyMode/__init__.pyc b/ACEStream/Core/ProxyMode/__init__.pyc
diff --git a/ACEStream/Core/ProxyService/Helper.pyc b/ACEStream/Core/ProxyService/Helper.pyc
diff --git a/ACEStream/Core/ProxyService/ProxyServiceUtil.pyc b/ACEStream/Core/ProxyService/ProxyServiceUtil.pyc
diff --git a/ACEStream/Core/ProxyService/__init__.pyc b/ACEStream/Core/ProxyService/__init__.pyc
diff --git a/ACEStream/Core/RequestPolicy.pyc b/ACEStream/Core/RequestPolicy.pyc
diff --git a/ACEStream/Core/Search/KeywordSearch.pyc b/ACEStream/Core/Search/KeywordSearch.pyc
diff --git a/ACEStream/Core/Search/__init__.pyc b/ACEStream/Core/Search/__init__.pyc
diff --git a/ACEStream/Core/Session.pyc b/ACEStream/Core/Session.pyc
diff --git a/ACEStream/Core/SessionConfig.pyc b/ACEStream/Core/SessionConfig.pyc
diff --git a/ACEStream/Core/Subtitles/MetadataDomainObjects/Languages.pyc b/ACEStream/Core/Subtitles/MetadataDomainObjects/Languages.pyc
diff --git a/ACEStream/Core/Subtitles/MetadataDomainObjects/MetadataExceptions.pyc b/ACEStream/Core/Subtitles/MetadataDomainObjects/MetadataExceptions.pyc
diff --git a/ACEStream/Core/Subtitles/MetadataDomainObjects/__init__.pyc b/ACEStream/Core/Subtitles/MetadataDomainObjects/__init__.pyc
diff --git a/ACEStream/Core/Subtitles/SubtitleHandler/SimpleTokenBucket.pyc b/ACEStream/Core/Subtitles/SubtitleHandler/SimpleTokenBucket.pyc
diff --git a/ACEStream/Core/Subtitles/SubtitleHandler/SubsMessageHandler.pyc b/ACEStream/Core/Subtitles/SubtitleHandler/SubsMessageHandler.pyc
diff --git a/ACEStream/Core/Subtitles/SubtitleHandler/__init__.pyc b/ACEStream/Core/Subtitles/SubtitleHandler/__init__.pyc
diff --git a/ACEStream/Core/Subtitles/SubtitlesHandler.pyc b/ACEStream/Core/Subtitles/SubtitlesHandler.pyc
diff --git a/ACEStream/Core/Subtitles/__init__.pyc b/ACEStream/Core/Subtitles/__init__.pyc
diff --git a/ACEStream/Core/TS/Service.pyc b/ACEStream/Core/TS/Service.pyc
diff --git a/ACEStream/Core/TS/__init__.pyc b/ACEStream/Core/TS/__init__.pyc
diff --git a/ACEStream/Core/TS/domutils.pyc b/ACEStream/Core/TS/domutils.pyc
diff --git a/ACEStream/Core/TorrentDef.pyc b/ACEStream/Core/TorrentDef.pyc
diff --git a/ACEStream/Core/Utilities/EncryptedStorage.pyc b/ACEStream/Core/Utilities/EncryptedStorage.pyc
diff --git a/ACEStream/Core/Utilities/TSCrypto.pyc b/ACEStream/Core/Utilities/TSCrypto.pyc
diff --git a/ACEStream/Core/Utilities/__init__.pyc b/ACEStream/Core/Utilities/__init__.pyc
diff --git a/ACEStream/Core/Utilities/logger.pyc b/ACEStream/Core/Utilities/logger.pyc
diff --git a/ACEStream/Core/Utilities/mp4metadata.pyc b/ACEStream/Core/Utilities/mp4metadata.pyc
diff --git a/ACEStream/Core/Utilities/odict.pyc b/ACEStream/Core/Utilities/odict.pyc
diff --git a/ACEStream/Core/Utilities/timeouturlopen.pyc b/ACEStream/Core/Utilities/timeouturlopen.pyc
diff --git a/ACEStream/Core/Utilities/unicode.pyc b/ACEStream/Core/Utilities/unicode.pyc
diff --git a/ACEStream/Core/Utilities/utilities.pyc b/ACEStream/Core/Utilities/utilities.pyc
diff --git a/ACEStream/Core/Video/LiveSourceAuth.pyc b/ACEStream/Core/Video/LiveSourceAuth.pyc
diff --git a/ACEStream/Core/Video/MovieTransport.pyc b/ACEStream/Core/Video/MovieTransport.pyc
diff --git a/ACEStream/Core/Video/PiecePickerStreaming.pyc b/ACEStream/Core/Video/PiecePickerStreaming.pyc
diff --git a/ACEStream/Core/Video/VideoOnDemand.pyc b/ACEStream/Core/Video/VideoOnDemand.pyc
diff --git a/ACEStream/Core/Video/VideoStatus.pyc b/ACEStream/Core/Video/VideoStatus.pyc
diff --git a/ACEStream/Core/Video/__init__.pyc b/ACEStream/Core/Video/__init__.pyc
diff --git a/ACEStream/Core/__init__.pyc b/ACEStream/Core/__init__.pyc
diff --git a/ACEStream/Core/debug.pyc b/ACEStream/Core/debug.pyc
diff --git a/ACEStream/Core/defaults.py b/ACEStream/Core/defaults.py
@@ -184,8 +184,8 @@
 dldefaults['auto_download_limit'] = False
 dldefaults['wait_sufficient_speed'] = False
 dldefaults['enable_http_support'] = True
-dldefaults['player_buffer_time'] = 5
-dldefaults['live_buffer_time'] = 10
+dldefaults['player_buffer_time'] = 0
+dldefaults['live_buffer_time'] = 0
 dldefaults['download_finished_callback'] = None
 dldefaults['download_failed_callback'] = None
 dldefaults['direct_download_url'] = None

diff --git a/ACEStream/Core/defaults.pyc b/ACEStream/Core/defaults.pyc
diff --git a/ACEStream/Core/exceptions.pyc b/ACEStream/Core/exceptions.pyc
diff --git a/ACEStream/Core/osutils.pyc b/ACEStream/Core/osutils.pyc
diff --git a/ACEStream/Core/simpledefs.pyc b/ACEStream/Core/simpledefs.pyc
diff --git a/ACEStream/Debug/__init__.pyc b/ACEStream/Debug/__init__.pyc
diff --git a/ACEStream/Debug/console.pyc b/ACEStream/Debug/console.pyc
diff --git a/ACEStream/GlobalConfig.pyc b/ACEStream/GlobalConfig.pyc
diff --git a/ACEStream/Player/BaseApp.py b/ACEStream/Player/BaseApp.py
@@ -392,7 +392,7 @@ def OnInitBase(self):
         #ga = lambda : GoogleAnalytics.send_event('client', 'startup', VERSION)
         #self.run_delayed(ga)
         self.tsservice = TSService(self)
-        self.run_delayed(self.check_auth_level, 0.1)
+        #self.run_delayed(self.check_auth_level, 0.1)
         self.cookie_file = os.path.join(self.state_dir, 'cookies.pickle')
         self.cookie_jar = cookielib.CookieJar()
         self.load_cookies()
@@ -406,16 +406,16 @@ def OnInitBase(self):
                 if DEBUG:
                     print_exc()
 
-        self.check_user_profile()
+        #self.check_user_profile()
         #self.ad_manager = AdManager(self, self.cookie_jar)
         if TS_ENV_PLATFORM == 'dune':
             default_enabled = False
         else:
             default_enabled = True
-        preload_ads_enabled = self.get_preload_ads_enabled(default_enabled)
-        if DEBUG:
-            log('baseapp::init: preload_ads_enabled', preload_ads_enabled)
-        self.run_delayed(self.cleanup_hidden_downloads_task, 1.0)
+        #preload_ads_enabled = self.get_preload_ads_enabled(default_enabled)
+        #if DEBUG:
+            #log('baseapp::init: preload_ads_enabled', preload_ads_enabled)
+        #self.run_delayed(self.cleanup_hidden_downloads_task, 1.0)
         self.run_delayed(self.remove_unknown_downloads, 20.0)
         #self.run_delayed(self.check_preload_ads, 1.0, 'check_preload_ads')
         if sys.platform == 'win32':
@@ -929,173 +929,6 @@ def start_download(self, tdef, dlfile, extra_files_indexes = [], developer_id =
         #self.run_delayed(func)
         return newd
 
-    def start_ad_downloads_when_main_started(self, maind, ads):
-        self.dlinfo_lock.acquire()
-        try:
-            if maind not in self.downloads_in_vodmode:
-                if DEBUG:
-                    log('baseapp::start_ad_downloads_when_main_started: download is not in vod mode, stop trying: hash', binascii.hexlify(maind.get_hash()))
-                return
-            ds = maind.network_get_state(usercallback=None, getpeerlist=False, sessioncalling=True)
-            dlstatus = ds.get_status()
-            is_vod = ds.is_vod()
-            playable = ds.get_vod_playable()
-            if DEBUG:
-                log('baseapp::start_ad_downloads_when_main_started: hash', binascii.hexlify(maind.get_hash()), 'status', dlstatus_strings[dlstatus], 'is_vod', is_vod, 'playable', playable)
-            if dlstatus == DLSTATUS_STOPPED_ON_ERROR:
-                if DEBUG:
-                    log('baseapp::start_ad_downloads_when_main_started: download cannot start, stop trying: hash', binascii.hexlify(maind.get_hash()), 'error', ds.get_error())
-                return
-            start_ads = False
-            if dlstatus == DLSTATUS_DOWNLOADING and is_vod:
-                if playable:
-                    if DEBUG:
-                        log('baseapp::start_ad_downloads_when_main_started: download is playable, stop trying: hash', binascii.hexlify(maind.get_hash()))
-                    return
-                if DEBUG:
-                    log('baseapp::start_ad_downloads_when_main_started: download is not playable, start ads: hash', binascii.hexlify(maind.get_hash()))
-                start_ads = True
-            else:
-                if dlstatus == DLSTATUS_SEEDING:
-                    if DEBUG:
-                        log('baseapp::start_ad_downloads_when_main_started: download is finished, stop trying: hash', binascii.hexlify(maind.get_hash()))
-                    return
-                if DEBUG:
-                    log('baseapp::start_ad_downloads_when_main_started: keep trying: hash', binascii.hexlify(maind.get_hash()))
-            if start_ads:
-                self.start_ad_downloads(maind, ads)
-            else:
-                start_ad_downloads_when_main_started_lambda = lambda : self.start_ad_downloads_when_main_started(maind, ads)
-                self.run_delayed(start_ad_downloads_when_main_started_lambda, 1.0)
-        finally:
-            self.dlinfo_lock.release()
-
-    def start_ad_downloads(self, newd, ads):
-        ds = newd.network_get_state(usercallback=None, getpeerlist=False, sessioncalling=True)
-        main_dlstatus = ds.get_status()
-        main_progress = ds.get_progress()
-        if DEBUG:
-            log('baseapp::start_ad_downloads: start ads: main', binascii.hexlify(newd.get_hash()), 'status', dlstatus_strings[main_dlstatus], 'progress', main_progress)
-        noninterruptable_ads = []
-        noninterruptable_ads_hash_list = []
-        interruptable_ads = []
-        for ad in ads:
-            if ad['dltype'] == DLTYPE_TORRENT:
-                ad['dlhash'] = ad['tdef'].get_infohash()
-                ad['size'] = ad['tdef'].get_length()
-            elif ad['dltype'] == DLTYPE_DIRECT:
-                tdef = None
-                if tdef is None:
-                    ad['dlhash'] = hashlib.sha1(ad['url']).digest()
-                    ad['size'] = 0
-                else:
-                    ad['tdef'] = tdef
-                    ad['dlhash'] = tdef.get_infohash()
-                    ad['size'] = tdef.get_length()
-                    ad['dltype'] = DLTYPE_TORRENT
-                    if DEBUG:
-                        log('baseapp::start_ad_downloads: got torrent from url: url', ad['url'], 'infohash', binascii.hexlify(ad['dlhash']))
-            else:
-                raise ValueError('Unknown download type ' + str(ad['dltype']))
-            if not ad.has_key('priority'):
-                if ad['interruptable']:
-                    ad['priority'] = 0
-                else:
-                    ad['priority'] = -1
-            if ad['interruptable']:
-                interruptable_ads.append(ad)
-            else:
-                noninterruptable_ads.append(ad)
-                noninterruptable_ads_hash_list.append(ad['dlhash'])
-
-        def start_ad(ad):
-            d = self.s.get_download(ad['dltype'], ad['dlhash'])
-            if d is None:
-                if ad['interruptable'] or ad['wait_preload']:
-                    if DEBUG:
-                        log('baseapp::start_ad_downloads: interruptable or preload ad download is not in downloads, skip: dlhash', binascii.hexlify(ad['dlhash']))
-                    return False
-                if DEBUG:
-                    log('baseapp::start_ad_downloads: start new ad download: main', binascii.hexlify(newd.get_hash()), 'ad', binascii.hexlify(ad['dlhash']))
-                if not self.cleanup_hidden_downloads(needed=ad['size'], priority=ad['priority']):
-                    if DEBUG:
-                        log('baseapp::start_ad_downloads: not enough space: hash', binascii.hexlify(ad['dlhash']), 'size', ad['size'])
-                    return False
-                dcfg = DownloadStartupConfig()
-                dcfg.set_video_event_callback(lambda d, event, params: self.sesscb_vod_event_callback(d, event, params, newd))
-                dcfg.set_dest_dir(self.s.get_ads_dir())
-                dcfg.set_player_buffer_time(1)
-                dcfg.set_max_conns(50)
-                dcfg.set_max_conns_to_initiate(60)
-                dcfg.set_hidden(True)
-                if ad['dltype'] == DLTYPE_TORRENT:
-                    d = self.s.start_download(ad['tdef'], dcfg)
-                elif ad['dltype'] == DLTYPE_DIRECT:
-                    dcfg.set_download_failed_callback(self.download_failed_callback)
-                    if ad['predownload']:
-                        dcfg.set_predownload(True)
-                    d = self.s.start_direct_download(ad['url'], dcfg)
-            else:
-                if ad['interruptable']:
-                    if main_progress == 1.0:
-                        if DEBUG:
-                            log('baseapp::start_ad_downloads: main content is completed, skip interruptable ad: dlhash', binascii.hexlify(ad['dlhash']))
-                        return False
-                if ad['interruptable'] or ad['wait_preload']:
-                    ds = d.network_get_state(usercallback=None, getpeerlist=False, sessioncalling=True)
-                    progress = ds.get_progress()
-                    if progress != 1.0:
-                        if DEBUG:
-                            log('baseapp::start_ad_downloads: interruptable or preload ad download is not completed, skip: dlhash', binascii.hexlify(ad['dlhash']), 'progress', progress)
-                        return False
-                used_by_another_vod = False
-                for main_d, ads in self.downloads_in_admode.iteritems():
-                    if d in ads:
-                        used_by_another_vod = True
-                        if DEBUG:
-                            log('baseapp::start_ad_downloads: ad download is used by another vod: main', binascii.hexlify(newd.get_hash()), 'other', binascii.hexlify(main_d.get_hash()), 'ad', binascii.hexlify(d.get_hash()))
-                        break
-
-                if used_by_another_vod:
-                    start_ad_download_when_seeding_lambda = lambda d = d, newd = newd: self.start_ad_download_when_seeding(d, newd)
-                    self.run_delayed(start_ad_download_when_seeding_lambda, 0.1)
-                else:
-                    if DEBUG:
-                        log('baseapp::start_ad_downloads: restart existing ad download: main', binascii.hexlify(newd.get_hash()), 'ad', binascii.hexlify(ad['dlhash']))
-                    d.set_video_event_callback(lambda d, event, params: self.sesscb_vod_event_callback(d, event, params, newd))
-                    d.set_player_buffer_time(1)
-                    d.set_max_conns(10)
-                    d.set_max_conns_to_initiate(10)
-                    d.set_hidden(True)
-                    if d.get_type() == DLTYPE_DIRECT:
-                        d.set_download_failed_callback(self.download_failed_callback)
-                    d.restart()
-            self.downloads_in_admode.setdefault(newd, odict())[d] = {'ad': ad,
-             'start_params': None,
-             'completed': False,
-             'started': None,
-             'finished': None,
-             'failed': False}
-            return True
-
-        started_noninterruptable_ads = 0
-        started_interruptable_ads = 0
-        for ad in noninterruptable_ads:
-            if start_ad(ad):
-                started_noninterruptable_ads += 1
-
-        for ad in interruptable_ads:
-            if start_ad(ad):
-                started_interruptable_ads += 1
-
-        if DEBUG:
-            log('baseapp::start_ad_downloads: started_noninterruptable_ads', started_noninterruptable_ads, 'started_interruptable_ads', started_interruptable_ads)
-        if started_noninterruptable_ads == 0 and started_interruptable_ads == 0 and main_dlstatus == DLSTATUS_STOPPED:
-            if DEBUG:
-                log('baseapp::start_ad_downloads: no ads started, start main download: main', binascii.hexlify(newd.get_hash()))
-            newd.restart()
-        self.add_preload_ads(interruptable_ads, False)
-
     def guess_duration_from_size(self, content_length):
         if content_length >= 734003200:
             content_duration = 5400
@@ -2060,6 +1893,7 @@ def gui_states_callback(self, dslist, haspeerlist):
          totalspeed)
 
     def update_download_stats(self, ds, force = False):
+        return
         try:
             if not force and time.time() - self.last_download_stats < DOWNLOAD_STATS_INTERVAL:
                 return

diff --git a/ACEStream/Player/BaseApp.pyc b/ACEStream/Player/BaseApp.pyc
diff --git a/ACEStream/Player/__init__.pyc b/ACEStream/Player/__init__.pyc
diff --git a/ACEStream/Player/common.pyc b/ACEStream/Player/common.pyc
diff --git a/ACEStream/Plugin/AtomFeedParser.pyc b/ACEStream/Plugin/AtomFeedParser.pyc
diff --git a/ACEStream/Plugin/BackgroundProcess.pyc b/ACEStream/Plugin/BackgroundProcess.pyc
diff --git a/ACEStream/Plugin/EngineConsole.pyc b/ACEStream/Plugin/EngineConsole.pyc
diff --git a/ACEStream/Plugin/Search.pyc b/ACEStream/Plugin/Search.pyc
diff --git a/ACEStream/Plugin/__init__.pyc b/ACEStream/Plugin/__init__.pyc
diff --git a/ACEStream/Plugin/defs.pyc b/ACEStream/Plugin/defs.pyc
diff --git a/ACEStream/Policies/RateManager.pyc b/ACEStream/Policies/RateManager.pyc
diff --git a/ACEStream/Policies/__init__.pyc b/ACEStream/Policies/__init__.pyc
diff --git a/ACEStream/Utilities/HardwareIdentity.pyc b/ACEStream/Utilities/HardwareIdentity.pyc
diff --git a/ACEStream/Utilities/Instance2Instance.pyc b/ACEStream/Utilities/Instance2Instance.pyc
diff --git a/ACEStream/Utilities/LSO.pyc b/ACEStream/Utilities/LSO.pyc
diff --git a/ACEStream/Utilities/LinuxSingleInstanceChecker.pyc b/ACEStream/Utilities/LinuxSingleInstanceChecker.pyc
diff --git a/ACEStream/Utilities/TimedTaskQueue.pyc b/ACEStream/Utilities/TimedTaskQueue.pyc
diff --git a/ACEStream/Utilities/__init__.pyc b/ACEStream/Utilities/__init__.pyc
diff --git a/ACEStream/Video/Ogg.pyc b/ACEStream/Video/Ogg.pyc
diff --git a/ACEStream/Video/VideoServer.pyc b/ACEStream/Video/VideoServer.pyc
diff --git a/ACEStream/Video/__init__.pyc b/ACEStream/Video/__init__.pyc
diff --git a/ACEStream/Video/defs.pyc b/ACEStream/Video/defs.pyc
diff --git a/ACEStream/Video/utils.pyc b/ACEStream/Video/utils.pyc
diff --git a/ACEStream/WebUI/WebUI.pyc b/ACEStream/WebUI/WebUI.pyc
diff --git a/ACEStream/WebUI/__init__.pyc b/ACEStream/WebUI/__init__.pyc
diff --git a/ACEStream/__init__.pyc b/ACEStream/__init__.pyc
diff --git a/ACEStream/env.pyc b/ACEStream/env.pyc
diff --git a/ACEStream/version.pyc b/ACEStream/version.pyc