Merge pull request #4715 from BillNasty/develop

Update torrentshack URL

Desktop.py

@@ -1,241 +0,0 @@
-from esky.util import appdir_from_executable #@UnresolvedImport
-from threading import Thread
-from version import VERSION
-from wx.lib.softwareupdate import SoftwareUpdate
-import os
-import sys
-import time
-import webbrowser
-import wx
-
-# Include proper dirs
-if hasattr(sys, 'frozen'):
-    import libs
-    base_path = os.path.dirname(os.path.dirname(os.path.abspath(libs.__file__)))
-else:
-    base_path = os.path.dirname(os.path.abspath(__file__))
-
-def icon():
-    icon = 'icon_windows.png'
-    if os.path.isfile('icon_mac.png'):
-        icon = 'icon_mac.png'
-
-    return wx.Icon(icon, wx.BITMAP_TYPE_PNG)
-
-lib_dir = os.path.join(base_path, 'libs')
-
-sys.path.insert(0, base_path)
-sys.path.insert(0, lib_dir)
-
-from couchpotato.environment import Env
-
-class TaskBarIcon(wx.TaskBarIcon):
-
-    TBMENU_OPEN = wx.NewId()
-    TBMENU_SETTINGS = wx.NewId()
-    TBMENU_EXIT = wx.ID_EXIT
-
-    closed = False
-    menu = False
-    enabled = False
-
-    def __init__(self, frame):
-        wx.TaskBarIcon.__init__(self)
-        self.frame = frame
-
-        self.SetIcon(icon())
-
-        self.Bind(wx.EVT_TASKBAR_LEFT_UP, self.OnTaskBarClick)
-        self.Bind(wx.EVT_TASKBAR_RIGHT_UP, self.OnTaskBarClick)
-
-        self.Bind(wx.EVT_MENU, self.onOpen, id = self.TBMENU_OPEN)
-        self.Bind(wx.EVT_MENU, self.onSettings, id = self.TBMENU_SETTINGS)
-        self.Bind(wx.EVT_MENU, self.onTaskBarClose, id = self.TBMENU_EXIT)
-
-    def OnTaskBarClick(self, evt):
-        menu = self.CreatePopupMenu()
-        self.PopupMenu(menu)
-        menu.Destroy()
-
-    def enable(self):
-        self.enabled = True
-
-        if self.menu:
-            self.open_menu.Enable(True)
-            self.setting_menu.Enable(True)
-
-            self.open_menu.SetText('Open')
-
-    def CreatePopupMenu(self):
-
-        if not self.menu:
-            self.menu = wx.Menu()
-            self.open_menu = self.menu.Append(self.TBMENU_OPEN, 'Open')
-            self.setting_menu = self.menu.Append(self.TBMENU_SETTINGS, 'About')
-            self.exit_menu = self.menu.Append(self.TBMENU_EXIT, 'Quit')
-
-            if not self.enabled:
-                self.open_menu.Enable(False)
-                self.setting_menu.Enable(False)
-
-                self.open_menu.SetText('Loading...')
-
-        return self.menu
-
-    def onOpen(self, event):
-        url = self.frame.parent.getSetting('base_url')
-        webbrowser.open(url)
-
-    def onSettings(self, event):
-        url = self.frame.parent.getSetting('base_url') + 'settings/about/'
-        webbrowser.open(url)
-
-    def onTaskBarClose(self, evt):
-        if self.closed:
-            return
-
-        self.closed = True
-
-        self.RemoveIcon()
-        wx.CallAfter(self.frame.Close)
-
-
-    def makeIcon(self, img):
-        if "wxMSW" in wx.PlatformInfo:
-            img = img.Scale(16, 16)
-        elif "wxGTK" in wx.PlatformInfo:
-            img = img.Scale(22, 22)
-
-        icon = wx.IconFromBitmap(img.CopyFromBitmap())
-        return icon
-
-
-class MainFrame(wx.Frame):
-
-    def __init__(self, parent):
-        wx.Frame.__init__(self, None, style = wx.FRAME_NO_TASKBAR)
-
-        self.parent = parent
-        self.tbicon = TaskBarIcon(self)
-
-
-class WorkerThread(Thread):
-
-    def __init__(self, desktop):
-        Thread.__init__(self)
-        self.daemon = True
-        self._desktop = desktop
-
-        self.start()
-
-    def run(self):
-
-        # Get options via arg
-        from couchpotato.runner import getOptions
-        args = ['--quiet']
-        self.options = getOptions(args)
-
-        # Load settings
-        settings = Env.get('settings')
-        settings.setFile(self.options.config_file)
-
-        # Create data dir if needed
-        self.data_dir = os.path.expanduser(Env.setting('data_dir'))
-        if self.data_dir == '':
-            from couchpotato.core.helpers.variable import getDataDir
-            self.data_dir = getDataDir()
-
-        if not os.path.isdir(self.data_dir):
-            os.makedirs(self.data_dir)
-
-        # Create logging dir
-        self.log_dir = os.path.join(self.data_dir, 'logs');
-        if not os.path.isdir(self.log_dir):
-            os.mkdir(self.log_dir)
-
-        try:
-            from couchpotato.runner import runCouchPotato
-            runCouchPotato(self.options, base_path, args, data_dir = self.data_dir, log_dir = self.log_dir, Env = Env, desktop = self._desktop)
-        except:
-            pass
-
-        self._desktop.frame.Close()
-        self._desktop.ExitMainLoop()
-
-
-class CouchPotatoApp(wx.App, SoftwareUpdate):
-
-    settings = {}
-    events = {}
-    restart = False
-    closing = False
-    triggered_onClose = False
-
-    def OnInit(self):
-
-        # Updater
-        base_url = 'https://api.couchpota.to/updates/%s'
-        self.InitUpdates(base_url % VERSION + '/', 'https://couchpota.to/updates/%s' % 'changelog.html',
-                         icon = icon())
-
-        self.frame = MainFrame(self)
-        self.frame.Bind(wx.EVT_CLOSE, self.onClose)
-
-        # CouchPotato thread
-        self.worker = WorkerThread(self)
-
-        return True
-
-    def onAppLoad(self):
-        self.frame.tbicon.enable()
-
-    def setSettings(self, settings = {}):
-        self.settings = settings
-
-    def getSetting(self, name):
-        return self.settings.get(name)
-
-    def addEvents(self, events = {}):
-        for name in events.iterkeys():
-            self.events[name] = events[name]
-
-    def onClose(self, event):
-
-        if not self.closing:
-            self.closing = True
-            self.frame.tbicon.onTaskBarClose(event)
-
-        onClose = self.events.get('onClose')
-        if onClose and not self.triggered_onClose:
-            self.triggered_onClose = True
-            onClose(event)
-
-    def afterShutdown(self, restart = False):
-        self.frame.Destroy()
-        self.restart = restart
-        self.ExitMainLoop()
-
-
-if __name__ == '__main__':
-
-    app = CouchPotatoApp(redirect = False)
-    app.MainLoop()
-
-    time.sleep(1)
-
-    if app.restart:
-
-        def appexe_from_executable(exepath):
-            appdir = appdir_from_executable(exepath)
-            exename = os.path.basename(exepath)
-
-            if sys.platform == "darwin":
-                if os.path.isdir(os.path.join(appdir, "Contents", "MacOS")):
-                    return os.path.join(appdir, "Contents", "MacOS", exename)
-
-            return os.path.join(appdir, exename)
-
-        exe = appexe_from_executable(sys.executable)
-        os.chdir(os.path.dirname(exe))
-
-        os.execv(exe, [exe] + sys.argv[1:])

couchpotato/core/_base/updater/main.py

@@ -79,9 +79,7 @@ class Updater(Plugin):
                 try:
                     if self.conf('notification'):
                         info = self.updater.info()
-                        version_date = 'the future!'
-                        if info['update_version']['date']:
-                            version_date = datetime.fromtimestamp(info['update_version']['date'])
+                        version_date = datetime.fromtimestamp(info['update_version']['date'])
                         fireEvent('updater.updated', 'Updated to a new version with hash "%s", this version is from %s' % (info['update_version']['hash'], version_date), data = info)
                 except:
                     log.error('Failed notifying for update: %s', traceback.format_exc())
@@ -99,9 +97,7 @@ class Updater(Plugin):
         if self.updater.check():
             if not self.available_notified and self.conf('notification') and not self.conf('automatic'):
                 info = self.updater.info()
-                version_date = 'the future!'
-                if info['update_version']['date']:
-                    version_date = datetime.fromtimestamp(info['update_version']['date'])
+                version_date = datetime.fromtimestamp(info['update_version']['date'])
                 fireEvent('updater.available', message = 'A new update with hash "%s" is available, this version is from %s' % (info['update_version']['hash'], version_date), data = info)
                 self.available_notified = True
             return True

couchpotato/core/media/_base/providers/base.py

@@ -5,6 +5,11 @@ import time
 import traceback
 import xml.etree.ElementTree as XMLTree
 
+try:
+    from xml.etree.ElementTree import ParseError as XmlParseError
+except ImportError:
+    from xml.parsers.expat import ExpatError as XmlParseError
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import ss
 from couchpotato.core.helpers.variable import tryFloat, mergeDicts, md5, \
@@ -94,7 +99,7 @@ class Provider(Plugin):
                 try:
                     data = XMLTree.fromstring(ss(data))
                     return self.getElements(data, item_path)
-                except XMLTree.ParseError:
+                except XmlParseError:
                     log.error('Invalid XML returned, check "%s" manually for issues', url)
                 except:
                     log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))

couchpotato/core/media/_base/providers/torrent/torrentshack.py

@@ -13,12 +13,12 @@ log = CPLog(__name__)
 class Base(TorrentProvider):
 
     urls = {
-        'test': 'https://theshack.us.to/',
-        'login': 'https://theshack.us.to/login.php',
-        'login_check': 'https://theshack.us.to/inbox.php',
-        'detail': 'https://theshack.us.to/torrent/%s',
-        'search': 'https://theshack.us.to/torrents.php?action=advanced&searchstr=%s&scene=%s&filter_cat[%d]=1',
-        'download': 'https://theshack.us.to/%s',
+        'test': 'https://torrentshack.me/',
+        'login': 'https://torrentshack.me/login.php',
+        'login_check': 'https://torrentshack.me/inbox.php',
+        'detail': 'https://torrentshack.me/torrent/%s',
+        'search': 'https://torrentshack.me/torrents.php?action=advanced&searchstr=%s&scene=%s&filter_cat[%d]=1',
+        'download': 'https://torrentshack.me/%s',
     }
 
     http_time_between_calls = 1  # Seconds
@@ -82,7 +82,7 @@ config = [{
             'tab': 'searcher',
             'list': 'torrent_providers',
             'name': 'TorrentShack',
-            'description': '<a href="http://torrentshack.eu/">TorrentShack</a>',
+            'description': '<a href="https://torrentshack.me/">TorrentShack</a>',
             'wizard': True,
             'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABmElEQVQoFQXBzY2cVRiE0afqvd84CQiAnxWWtyxsS6ThINBYg2Dc7mZBMEjE4mzs6e9WcY5+ePNuVFJJodQAoLo+SaWCy9rcV8cmjah3CI6iYu7oRU30kE5xxELRfamklY3k1NL19sSm7vPzP/ZdNZzKVDaY2sPZJBh9fv5ITrmG2+Vp4e1sPchVqTCQZJnVXi+/L4uuAJGly1+Pw8CprLbi8Om7tbT19/XRqJUk11JP9uHj9ulxhXbvJbI9qJvr5YkGXFG2IBT8tXczt+sfzDZCp3765f3t9tHEHGEDACma77+8o4oATKk+/PfW9YmHruRFjWoVSFsVsGu1YSKq6Oc37+n98unPZSRlY7vsKDqN+92X3yR9+PdXee3iJNKMStqdcZqoTJbUSi5JOkpfRlhSI0mSpEmCFKoU7FqSNOLAk54uGwCStMUCgLrVic62g7oDoFmmdI+P3S0pDe1xvDqb6XrZqbtzShWNoh9fv/XQHaDdM9OqrZi2M7M3UrB2vlkPS1IbdEBk7UiSoD6VlZ6aKWer4aH4f/AvKoHUTjuyAAAAAElFTkSuQmCC',
             'options': [

couchpotato/core/media/_base/providers/torrent/yify.py

@@ -38,7 +38,7 @@ class Base(TorrentProvider):
 
         search_url = self.urls['search'] % (domain, getIdentifier(movie))
 
-        data = self.getJsonData(search_url)
+        data = self.getJsonData(search_url) or {}
         data = data.get('data')
 
         if isinstance(data, dict) and data.get('movies'):

couchpotato/core/plugins/scanner.py

@@ -63,8 +63,8 @@ class Scanner(Plugin):
     }
 
     file_sizes = {  # in MB
-        'movie': {'min': 300},
-        'trailer': {'min': 2, 'max': 250},
+        'movie': {'min': 200},
+        'trailer': {'min': 2, 'max': 199},
         'backdrop': {'min': 0, 'max': 5},
     }
 

installer.iss

@@ -1,52 +0,0 @@
-#define MyAppName "CouchPotato"
-#define MyAppVer "2.6.3"
-#define MyAppBit "win32"
-//#define MyAppBit "win-amd64"
-
-[Setup]
-AppName={#MyAppName}
-AppVersion=2
-AppVerName={#MyAppName}
-DefaultDirName={userappdata}\{#MyAppName}\application
-DisableProgramGroupPage=yes
-DisableDirPage=yes
-UninstallDisplayIcon=./icon.ico
-SetupIconFile=./icon.ico
-OutputDir=./dist
-OutputBaseFilename={#MyAppName}-{#MyAppVer}.{#MyAppBit}.installer
-AppPublisher=Your Mom
-AppPublisherURL=http://couchpota.to
-PrivilegesRequired=none
-WizardSmallImageFile=installer_icon.bmp
-WizardImageFile=installer_banner.bmp
-UsePreviousAppDir=no
-
-[Messages]
-WelcomeLabel1=Installing [name]!
-WelcomeLabel2=This wizard will install [name] to your AppData folder. It does this so it can use the build in updater without needing admin rights.
-
-[CustomMessages]
-LaunchProgram=Launch {#MyAppName} right now.
-
-[Files]
-Source: "./dist/{#MyAppName}-{#MyAppVer}.{#MyAppBit}/*"; Flags: recursesubdirs; DestDir: "{app}"
-
-[Icons]
-Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppName}.exe"
-Name: "{userstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppName}.exe"; Tasks: startup
-
-[Tasks]
-Name: "startup"; Description: "Run {#MyAppName} at startup"; Flags: unchecked
-
-[Run]
-Filename: {app}\{#MyAppName}.exe; Description: {cm:LaunchProgram,{#MyAppName}}; Flags: nowait postinstall skipifsilent
-
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{app}\appdata"
-Type: filesandordirs; Name: "{app}\Microsoft.VC90.CRT"
-Type: filesandordirs; Name: "{app}\updates"
-Type: filesandordirs; Name: "{app}\CouchPotato*"
-Type: filesandordirs; Name: "{app}\python27.dll"
-Type: filesandordirs; Name: "{app}\unins000.dat"
-Type: filesandordirs; Name: "{app}\unins000.exe"

setup.py

@@ -1,133 +0,0 @@
-from esky import bdist_esky
-from setuptools import setup
-import os
-import sys
-import version
-
-
-# Include proper dirs
-base_path = os.path.dirname(os.path.abspath(__file__))
-lib_dir = os.path.join(base_path, 'libs')
-
-sys.path.insert(0, base_path)
-sys.path.insert(0, lib_dir)
-
-def getDataFiles(dirs):
-    data_files = []
-    for directory in dirs:
-        for root, dirs, files in os.walk(directory):
-            if files:
-                for filename in files:
-                    if filename[:-4] is not '.pyc':
-                        data_files.append((root, [os.path.join(root, filename)]))
-
-    return data_files
-
-includes = [
-    'telnetlib',
-    'xml.etree.ElementTree',
-    'xml.etree.cElementTree',
-    'xml.dom',
-    'xml.dom.minidom',
-    'netrc',
-    'csv',
-    'HTMLParser',
-    'version',
-    'distutils',
-    'lxml', 'lxml.etree', 'lxml._elementpath', 'gzip',
-]
-
-excludes = [
-    'doctest',
-    'pdb',
-    'unittest',
-    'difflib',
-    'bsddb',
-    'pywin.debugger', 'pywin.debugger.dbgcon', 'pywin.dialogs',
-    'Tkconstants', 'Tkinter',
-    'curses',
-    '_gtkagg', '_tkagg',
-]
-
-# Windows
-if sys.platform == "win32":
-    import py2exe
-
-    sys.path.append('C:\Windows\WinSxS\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.21022.8_none_bcb86ed6ac711f91')
-
-    FREEZER = 'py2exe'
-    FREEZER_OPTIONS = dict(
-        compressed = 0,
-        bundle_files = 3,
-        dll_excludes = [
-            'msvcp90.dll',
-            'msvcr90.dll',
-            'msvcr71.dll',
-            'mswsock.dll',
-            'powrprof.dll',
-            'USP10.dll',
-            'libgdk-win32-2.0-0.dll',
-            'libgobject-2.0-0.dll',
-            'tcl84.dll',
-            'tk84.dll'
-        ],
-        packages = ['couchpotato', 'libs'],
-        includes = includes,
-        excludes = excludes,
-        skip_archive = 1,
-    )
-    exeICON = os.path.join(base_path, 'icon.ico')
-    DATA_FILES = getDataFiles([r'.\\couchpotato', r'.\\libs'])
-    DATA_FILES.append('icon_windows.png')
-    file_ext = 'win32.zip'
-
-
-# OSX
-elif sys.platform == "darwin":
-    import py2app
-
-    FREEZER = 'py2app'
-    FREEZER_OPTIONS = dict(
-        arch = 'intel',
-        optimize = 0,
-        strip = True,
-        argv_emulation = False,
-        site_packages = False,
-        iconfile = 'icon.icns',
-        plist = dict(
-            LSUIElement = True,
-        ),
-        packages = ['couchpotato', 'libs'],
-        includes = includes,
-        excludes = excludes,
-    )
-    exeICON = None
-    DATA_FILES = ['icon_mac.png']
-
-    file_ext = 'macosx-10_6-intel.zip'
-
-# Common
-NAME = "CouchPotato"
-APP = [bdist_esky.Executable("Desktop.py", name = NAME, icon = exeICON, gui_only = True,)]
-ESKY_OPTIONS = dict(
-    freezer_module = FREEZER,
-    freezer_options = FREEZER_OPTIONS,
-    bundle_msvcrt = True,
-)
-
-# Build the app and the esky bundle
-setup(
-    name = NAME,
-    scripts = APP,
-    version = version.VERSION,
-    author = "Ruud",
-    author_email = "info@couchpota.to",
-    description = 'CouchPotato %s' % version.VERSION,
-    data_files = DATA_FILES,
-    options = dict(bdist_esky = ESKY_OPTIONS),
-)
-
-#distpath = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'dist')
-#zipfilename = os.path.join(distpath, '%s-%s.%s' % (NAME, version.VERSION, file_ext))
-#zfile = zipfile.ZipFile(zipfilename, "r")
-#zfile.extractall(distpath)

version.py

@@ -1,2 +1,2 @@
-VERSION = '2.6.3'
-BRANCH = 'desktop'
+VERSION = None
+BRANCH = 'develop'