Merge pull request #3 from SiCKRAGETV/develop

Develop

SickBeard.py

@@ -29,10 +29,13 @@ import sys
 import subprocess
 import traceback
 
+import os
+sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
+
 import shutil
-import lib.shutil_custom
+import shutil_custom
 
-shutil.copyfile = lib.shutil_custom.copyfile_custom
+shutil.copyfile = shutil_custom.copyfile_custom
 
 if sys.version_info < (2, 6):
     print "Sorry, requires Python 2.6 or 2.7."
@@ -49,10 +52,6 @@ except:
     print "The Python module Cheetah is required"
     sys.exit(1)
 
-import os
-
-sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
-
 # We only need this for compiling an EXE and I will just always do that on 2.6+
 if sys.hexversion >= 0x020600F0:
     from multiprocessing import freeze_support  # @UnresolvedImport
@@ -93,7 +92,7 @@ from sickbeard.tv import TVShow
 from sickbeard.webserveInit import SRWebServer
 from sickbeard.databases.mainDB import MIN_DB_VERSION, MAX_DB_VERSION
 from sickbeard.event_queue import Events
-from lib.configobj import ConfigObj
+from configobj import ConfigObj
 
 throwaway = datetime.datetime.strptime('20110101', '%Y%m%d')
 

gui/slick/interfaces/default/displayShow.tmpl

@@ -284,8 +284,8 @@
                 </table>
             
                 <table style="width:180px; float: right; vertical-align: middle; height: 100%;">
-                    #set $info_flag = $subtitles.fromietf($show.lang).alpha3
-                    <tr><td class="showLegend">Info Language:</td><td><img src="$sbRoot/images/flags/${info_flag}.png" width="16" height="11" alt="$show.lang" title="$show.lang" onError="this.onerror=null;this.src='$sbRoot/images/flags/unknown.png';"/></td></tr>
+                    #set $info_flag = $subtitles.fromietf($show.lang).opensubtitles if $show.lang else ''
+                    <tr><td class="showLegend">Info Language:</td><td><img src="$sbRoot/images/subtitles/flags/${info_flag}.png" width="16" height="11" alt="$show.lang" title="$show.lang" onError="this.onerror=null;this.src='$sbRoot/images/flags/unknown.png';"/></td></tr>
                     #if $sickbeard.USE_SUBTITLES
                     <tr><td class="showLegend">Subtitles: </td><td><img src="$sbRoot/images/#if $show.subtitles then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
                     #end if

gui/slick/interfaces/default/editShow.tmpl

 #import sickbeard
-#import lib.adba as adba
+#import adba
 #from sickbeard import common
 #from sickbeard.common import *
 #from sickbeard import exceptions

gui/slick/interfaces/default/history.tmpl

@@ -131,7 +131,7 @@
 				<td class="tvShow" width="35%"><a href="$sbRoot/home/displayShow?show=$hItem["showid"]#season-$hItem["season"]">$hItem["show_name"] - <%="S%02i" % int(hItem["season"])+"E%02i" % int(hItem["episode"]) %>#if "proper" in $hItem["resource"].lower() or "repack" in $hItem["resource"].lower() then ' <span class="quality Proper">Proper</span>' else ""#</a></td>
 				<td align="center" #if $curStatus == SUBTITLED then 'class="subtitles_column"' else ''#>
 				#if $curStatus == SUBTITLED:
-					<img width="16" height="11" style="vertical-align:middle;" src="$sbRoot/images/flags/${hItem['resource']}.png" onError="this.onerror=null;this.src='$sbRoot/images/flags/unknown.png';">
+					<img width="16" height="11" style="vertical-align:middle;" src="$sbRoot/images/subtitles/flags/${hItem['resource']}.png" onError="this.onerror=null;this.src='$sbRoot/images/flags/unknown.png';">
 				#end if
 					<span style="cursor: help; vertical-align:middle;" title="$os.path.basename($hItem['resource'])">$statusStrings[$curStatus]</span>
 				</td>

gui/slick/interfaces/default/inc_top.tmpl

@@ -231,6 +231,7 @@
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="$sbRoot/images/menu/system18-2.png" class="navbaricon hidden-xs" /><b class="caret hidden-xs"></b><span class="visible-xs">System <b class="caret"></b></span></a>
 							<ul class="dropdown-menu">
 								<li><a href="$sbRoot/home/updateCheck?pid=$sbPID"><i class="menu-icon-update"></i>&nbsp;Check For Updates</a></li>
+                                <li><a href="$sbRoot/changes"><i class="menu-icon-help"></i>&nbsp;Changelog</a></li>
                                 <li><a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm restart"><i class="menu-icon-restart"></i>&nbsp;Restart</a></li>
                                 <li><a href="$sbRoot/home/shutdown/?pid=$sbPID" class="confirm shutdown"><i class="menu-icon-shutdown"></i>&nbsp;Shutdown</a></li>
                                 <li><a href="$sbRoot/logout" class="confirm logout"><i class="menu-icon-shutdown"></i>&nbsp;Logout</a></li>

gui/slick/interfaces/default/news.tmpl → gui/slick/interfaces/default/markdown.tmpl

 #import sickbeard
 #from sickbeard.common import *
-#set global $title="News"
-#set global $header="News"
 
-#set global $topmenu="news"
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl")
 
-$newsdata
+$data
 
 #include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl")

lib/hachoir_core/__init__.py

-from lib.hachoir_core.version import VERSION as __version__, PACKAGE, WEBSITE, LICENSE
+from hachoir_core.version import VERSION as __version__, PACKAGE, WEBSITE, LICENSE
 

lib/hachoir_core/benchmark.py

-from lib.hachoir_core.tools import humanDurationNanosec
-from lib.hachoir_core.i18n import _
+from hachoir_core.tools import humanDurationNanosec
+from hachoir_core.i18n import _
 from math import floor
 from time import time
 

lib/hachoir_core/bits.py

@@ -3,8 +3,8 @@ Utilities to convert integers and binary strings to binary (number), binary
 string, number, hexadecimal, etc.
 """
 
-from lib.hachoir_core.endian import BIG_ENDIAN, LITTLE_ENDIAN
-from lib.hachoir_core.compatibility import reversed
+from hachoir_core.endian import BIG_ENDIAN, LITTLE_ENDIAN
+from hachoir_core.compatibility import reversed
 from itertools import chain, repeat
 from struct import calcsize, unpack, error as struct_error
 

lib/hachoir_core/cmd_line.py

 from optparse import OptionGroup
-from lib.hachoir_core.log import log
-from lib.hachoir_core.i18n import _, getTerminalCharset
-from lib.hachoir_core.tools import makePrintable
-import lib.hachoir_core.config as config
+from hachoir_core.log import log
+from hachoir_core.i18n import _, getTerminalCharset
+from hachoir_core.tools import makePrintable
+import hachoir_core.config as config
 
 def getHachoirOptions(parser):
     """

lib/hachoir_core/dict.py

@@ -2,8 +2,8 @@
 Dictionnary classes which store values order.
 """
 
-from lib.hachoir_core.error import HachoirError
-from lib.hachoir_core.i18n import _
+from hachoir_core.error import HachoirError
+from hachoir_core.i18n import _
 
 class UniqKeyError(HachoirError):
     """