[Xbmc-addons] Scripts branch, dharma-pre, updated. e8cace4f71207195f342088043a5b98da23f2e3f

Fri, 12 Nov 2010 10:07:34 -0800 

The branch, dharma-pre has been updated
       via  e8cace4f71207195f342088043a5b98da23f2e3f (commit)
       via  28bd5d626c3aad081d094ce01b313d8a6dfb1b4a (commit)
      from  64be01a2d115037317908508d08381c4061f4eab (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=e8cace4f71207195f342088043a5b98da23f2e3f

commit e8cace4f71207195f342088043a5b98da23f2e3f
Author: amet <a...@nospam>
Date:   Fri Nov 12 22:06:06 2010 +0400

    [script.xbmc.subtitles] -v2.1.3
    - fixed: smb hashing *should* work now :)

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index b6c8c70..f633165 100644
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmc.subtitles"
        name="XBMC Subtitles"
-       version="2.1.2"
+       version="2.1.3"
        provider-name="Amet">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 9d16829..d24244a 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,6 @@
+2.1.3
+- fixed: smb hashing *should* work now :)
+
 2.1.2
 - cosmetics: removed spaces from strings, unix EOL
 
diff --git a/script.xbmc.subtitles/resources/lib/utilities.py 
b/script.xbmc.subtitles/resources/lib/utilities.py
index 2c4ea09..2b9969b 100644
--- a/script.xbmc.subtitles/resources/lib/utilities.py
+++ b/script.xbmc.subtitles/resources/lib/utilities.py
@@ -18,25 +18,25 @@ def hashFile(filename):
     try: 
       longlongformat = '<LL'  # signed long, unsigned long 
       bytesize = struct.calcsize(longlongformat) 
+      f = open(filename, "rb") 
           
-      f = file(filename, "rb") 
-          
-      filesize = os.path.getsize(filename) 
+      filesize = os.path.getsize(filename)
       hash = filesize 
           
       if filesize < 65536 * 2:
         return "Error"
-        
+      b = f.read(65536)
       for x in range(65536/bytesize):
-        buffer = f.read(bytesize)
+        buffer = b[x*bytesize:x*bytesize+bytesize]
         (l2, l1)= struct.unpack(longlongformat, buffer) 
         l_value = (long(l1) << 32) | long(l2) 
         hash += l_value 
         hash = hash & 0xFFFFFFFFFFFFFFFF #to remain as 64bit number
       
       f.seek(max(0,filesize-65536),0)
+      b = f.read(65536)
       for x in range(65536/bytesize):
-        buffer = f.read(bytesize)
+        buffer = b[x*bytesize:x*bytesize+bytesize]
         (l2, l1) = struct.unpack(longlongformat, buffer)
         l_value = (long(l1) << 32) | long(l2)
         hash += l_value

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=28bd5d626c3aad081d094ce01b313d8a6dfb1b4a

commit 28bd5d626c3aad081d094ce01b313d8a6dfb1b4a
Author: amet <a...@nospam>
Date:   Fri Nov 12 18:53:32 2010 +0400

    [script.xbmc.subtitles] -v 2.1.2
    - cosmetics: removed spaces from strings, unix EOL
    - reverted: "# -*- coding: utf-8 -*- "

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 82df139..b6c8c70 100644
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmc.subtitles"
        name="XBMC Subtitles"
-       version="2.1.1"
+       version="2.1.2"
        provider-name="Amet">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 46c48c9..9d16829 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,6 @@
+2.1.2
+- cosmetics: removed spaces from strings, unix EOL
+
 2.1.1
 - fixes in Subdivx service
 - cleanup of language string files(I hope everyone is happy now ;p)
diff --git a/script.xbmc.subtitles/resources/language/Croatian/strings.xml 
b/script.xbmc.subtitles/resources/language/Croatian/strings.xml
index 4edf499..b2feb2a 100644
--- a/script.xbmc.subtitles/resources/language/Croatian/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Croatian/strings.xml
@@ -13,7 +13,7 @@
     <string id="655">Titl dostupan lokalno</string>
     <string id="656">Servis nije odgovorio u zadanom vremenskom 
periodu</string>
     <string id="657">Nije pronađen niti jedan titl!</string>
-    <string id="744"> pronađeni su titlovi za </string>
+    <string id="744">pronađeni su titlovi za</string>
     <string id="747">Pretraži koristeći ime datoteke</string>
     <string id="748">Ne možete spremiti titl na odabranu lokaciju</string>
     <string id="750">Želite li privremeno omogućiti titl?</string>
diff --git a/script.xbmc.subtitles/resources/language/Czech/strings.xml 
b/script.xbmc.subtitles/resources/language/Czech/strings.xml
index 46262fd..de7525a 100644
--- a/script.xbmc.subtitles/resources/language/Czech/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Czech/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Titulky k dispozici lokálně</string>
     <string id="656">Služba neodpověděla do časového limitu</string>
     <string id="657">No Subtitles Found!</string>    
-    <string id="744"> titulků pro </string>
+    <string id="744">titulků pro</string>
     <string id="747">Hledat pomocí názvu složky</string>
     <string id="748">Titulky nelze uložit do vybrané složky</string>
     <string id="750">Chcete tyto titulky aktivovat dočasně_</string>
diff --git a/script.xbmc.subtitles/resources/language/Dutch/strings.xml 
b/script.xbmc.subtitles/resources/language/Dutch/strings.xml
index 93303ae..6c4b3b2 100644
--- a/script.xbmc.subtitles/resources/language/Dutch/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Dutch/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Lokaal al ondertitels beschikbaar</string>
     <string id="656">De service reageerde niet binnen de time-out 
limiet</string>
     <string id="657">Geen ondertitels gevonden!</string>    
-    <string id="744"> ondertitels gevonden voor </string>
+    <string id="744">ondertitels gevonden voor</string>
     <string id="747">Op basis van mapnaam zoeken</string>
     <string id="748">U kunt de ondertitels niet opslaan op de gekozen 
locatie</string>
     <string id="750">Wilt u deze ondertitels tijdelijk activeren?</string>
diff --git a/script.xbmc.subtitles/resources/language/English/strings.xml 
b/script.xbmc.subtitles/resources/language/English/strings.xml
index 6b3fefb..031a292 100644
--- a/script.xbmc.subtitles/resources/language/English/strings.xml
+++ b/script.xbmc.subtitles/resources/language/English/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>
-    <string id="744"> subtitles found for </string>
+    <string id="744">subtitles found for</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/Finnish/strings.xml 
b/script.xbmc.subtitles/resources/language/Finnish/strings.xml
index 60d8aad..6136dcd 100644
--- a/script.xbmc.subtitles/resources/language/Finnish/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Finnish/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>        
-    <string id="744"> tekstitystä löydetty kohteelle </string>
+    <string id="744">tekstitystä löydetty kohteelle</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/French/strings.xml 
b/script.xbmc.subtitles/resources/language/French/strings.xml
index 7d67342..752c361 100644
--- a/script.xbmc.subtitles/resources/language/French/strings.xml
+++ b/script.xbmc.subtitles/resources/language/French/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string> 
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>       
-    <string id="744"> soustitres trouvés pour </string>
+    <string id="744">soustitres trouvés pour</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/German/strings.xml 
b/script.xbmc.subtitles/resources/language/German/strings.xml
index a2b2a84..31d0950 100644
--- a/script.xbmc.subtitles/resources/language/German/strings.xml
+++ b/script.xbmc.subtitles/resources/language/German/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>    
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>
-    <string id="744"> Untertitel gefunden für </string>
+    <string id="744">Untertitel gefunden für</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/Hungarian/strings.xml 
b/script.xbmc.subtitles/resources/language/Hungarian/strings.xml
index 01f7087..ec0ffb4 100644
--- a/script.xbmc.subtitles/resources/language/Hungarian/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Hungarian/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Helyi felirat elérhető</string>
     <string id="656">Szolgáltatás nem elérhtető a megadott időkorláton 
belül</string>
     <string id="657">Felirat nem található!</string>
-    <string id="744"> felirat található ehhez </string>
+    <string id="744">felirat található ehhez</string>
     <string id="747">Keresés a mappanév használatával</string>
     <string id="748">Nem mentheted el a feliratot a kiválasztott 
célhelyre</string>
     <string id="750">Felirat ideiglenes aktiválása?</string>
diff --git a/script.xbmc.subtitles/resources/language/Norwegian/strings.xml 
b/script.xbmc.subtitles/resources/language/Norwegian/strings.xml
index 4ffc796..1bf76da 100644
--- a/script.xbmc.subtitles/resources/language/Norwegian/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Norwegian/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Lokal undertekst tilgjengelig</string>
     <string id="656">Tjenesten svarte ikke innen tidsgrensen</string>
     <string id="657">Ingen undertekster funnet!</string>   
-    <string id="744"> undertekster funnet for </string>
+    <string id="744">undertekster funnet for</string>
     <string id="747">Søk med mappenavn</string>
     <string id="748">Du kan ikke lagre undertekster i den valgte 
mappen</string>
     <string id="750">Vil du bruke denne underteksten midlertidlig?</string>
diff --git a/script.xbmc.subtitles/resources/language/Polish/strings.xml 
b/script.xbmc.subtitles/resources/language/Polish/strings.xml
index dfe0d94..c73d70a 100644
--- a/script.xbmc.subtitles/resources/language/Polish/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Polish/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out 
limit</string>    
     <string id="657">No Subtitles Found!</string>
-    <string id="744"> napisów znalezionych dla </string>
+    <string id="744">napisów znalezionych dla</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/Portuguese 
(Brazil)/strings.xml b/script.xbmc.subtitles/resources/language/Portuguese 
(Brazil)/strings.xml
index 3391082..22a4eab 100644
--- a/script.xbmc.subtitles/resources/language/Portuguese (Brazil)/strings.xml  
+++ b/script.xbmc.subtitles/resources/language/Portuguese (Brazil)/strings.xml  
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>
-    <string id="744"> legendas encontradas para </string>
+    <string id="744">legendas encontradas para</string>
     <string id="745">O serviço Podnapisi requer usuário e senha</string>
     <string id="746">Por favor registre em www.podnapisi.net</string>
     <string id="747">Pesquise Usando o Nome da Pasta</string>
diff --git a/script.xbmc.subtitles/resources/language/Russian/strings.xml 
b/script.xbmc.subtitles/resources/language/Russian/strings.xml
index a6bf1c1..926c486 100644
--- a/script.xbmc.subtitles/resources/language/Russian/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Russian/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out 
limit</string>    
     <string id="657">No Subtitles Found!</string>
-    <string id="744"> сабтитров обнаружено для </string>
+    <string id="744">сабтитров обнаружено для</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/Serbian 
(Cyrillic)/strings.xml b/script.xbmc.subtitles/resources/language/Serbian 
(Cyrillic)/strings.xml
index 816f929..3212497 100644
--- a/script.xbmc.subtitles/resources/language/Serbian (Cyrillic)/strings.xml   
+++ b/script.xbmc.subtitles/resources/language/Serbian (Cyrillic)/strings.xml   
@@ -14,7 +14,7 @@
     <string id="655">Локални превод доступан</string>
     <string id="656">Сервис није одговорио у 
одређеном временском периоду</string>
     <string id="657">Није пронађен ни један 
превод!</string>
-    <string id="744"> превода нађено за </string>
+    <string id="744">превода нађено за</string>
     <string id="747">Претражи користећи име 
датотеке</string>
     <string id="748">Не можете снимити превод на 
жељену локацију</string>
     <string id="750">Желите ли да активирате превод 
привремено?</string>
diff --git a/script.xbmc.subtitles/resources/language/Serbian/strings.xml 
b/script.xbmc.subtitles/resources/language/Serbian/strings.xml
index 08f5ecd..6c383d7 100644
--- a/script.xbmc.subtitles/resources/language/Serbian/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Serbian/strings.xml
@@ -13,7 +13,7 @@
     <string id="655">Lokalni prevod dostupan</string>
     <string id="656">Servis nije odgovorio u određenom vremenskom 
periodu</string>
     <string id="657">Nije pronađen ni jedan prevod!</string>
-    <string id="744"> prevoda nađeno za </string>
+    <string id="744">prevoda nađeno za</string>
     <string id="747">Pretraži koristeći ime datoteke</string>
     <string id="748">Ne možete snimiti prevod na željenu lokaciju</string>
     <string id="750">Želite li da aktivirate prevod privremeno?</string>
diff --git a/script.xbmc.subtitles/resources/language/Slovenian/strings.xml 
b/script.xbmc.subtitles/resources/language/Slovenian/strings.xml
index 7b39242..ae1d6a4 100644
--- a/script.xbmc.subtitles/resources/language/Slovenian/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Slovenian/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>    
-    <string id="744"> podnapisov najdenih za </string>
+    <string id="744">podnapisov najdenih za</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/Spanish/strings.xml 
b/script.xbmc.subtitles/resources/language/Spanish/strings.xml
index 4e22b34..d531339 100644
--- a/script.xbmc.subtitles/resources/language/Spanish/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Spanish/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>
-       <string id="744"> subtítulos encontrados para </string>
+       <string id="744">subtítulos encontrados para</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/Swedish/strings.xml 
b/script.xbmc.subtitles/resources/language/Swedish/strings.xml
index 47e0baf..09a672e 100644
--- a/script.xbmc.subtitles/resources/language/Swedish/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Swedish/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>
-    <string id="744"> undertexter hittades för </string>
+    <string id="744">undertexter hittades för</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/language/Turkish/strings.xml 
b/script.xbmc.subtitles/resources/language/Turkish/strings.xml
index df36a3e..a56c848 100755
--- a/script.xbmc.subtitles/resources/language/Turkish/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Turkish/strings.xml
@@ -14,7 +14,7 @@
     <string id="655">Local subtitle available</string>
     <string id="656">Service did not respond within the time out limit</string>
     <string id="657">No Subtitles Found!</string>
-    <string id="744"> için altyazýlar bulundu </string>
+    <string id="744">için altyazýlar bulundu</string>
     <string id="747">Search Using Parent Folder</string>
     <string id="748">You can't save subtitle to selected destination</string>
     <string id="750">Would you like to activate this subtitle 
temporarily?</string>
diff --git a/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py 
b/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py
index ff60878..d6e28f5 100755
--- a/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*- 
+
 # Subdivx.com subtitles, based on a mod of Undertext subtitles
 import os, sys, re, xbmc, xbmcgui, string, time, urllib, urllib2
 from utilities import log
diff --git a/script.xbmc.subtitles/resources/lib/utilities.py 
b/script.xbmc.subtitles/resources/lib/utilities.py
index 52fab61..2c4ea09 100644
--- a/script.xbmc.subtitles/resources/lib/utilities.py
+++ b/script.xbmc.subtitles/resources/lib/utilities.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*- 
+
 import sys
 import os
 import xbmc

-----------------------------------------------------------------------

Summary of changes:
 script.xbmc.subtitles/addon.xml                    |    2 +-
 script.xbmc.subtitles/changelog.txt                |    6 ++++++
 .../resources/language/Croatian/strings.xml        |    2 +-
 .../resources/language/Czech/strings.xml           |    2 +-
 .../resources/language/Dutch/strings.xml           |    2 +-
 .../resources/language/English/strings.xml         |    2 +-
 .../resources/language/Finnish/strings.xml         |    2 +-
 .../resources/language/French/strings.xml          |    2 +-
 .../resources/language/German/strings.xml          |    2 +-
 .../resources/language/Hungarian/strings.xml       |    2 +-
 .../resources/language/Norwegian/strings.xml       |    2 +-
 .../resources/language/Polish/strings.xml          |    2 +-
 .../language/Portuguese (Brazil)/strings.xml       |    2 +-
 .../resources/language/Russian/strings.xml         |    2 +-
 .../language/Serbian (Cyrillic)/strings.xml        |    2 +-
 .../resources/language/Serbian/strings.xml         |    2 +-
 .../resources/language/Slovenian/strings.xml       |    2 +-
 .../resources/language/Spanish/strings.xml         |    2 +-
 .../resources/language/Swedish/strings.xml         |    2 +-
 .../resources/language/Turkish/strings.xml         |    2 +-
 .../resources/lib/services/Subdivx/service.py      |    2 ++
 script.xbmc.subtitles/resources/lib/utilities.py   |   14 ++++++++------
 .../resources/skins/Default/media/flags/.gif       |  Bin 59 -> 0 bytes
 23 files changed, 35 insertions(+), 25 deletions(-)
 delete mode 100644 
script.xbmc.subtitles/resources/skins/Default/media/flags/.gif


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to