Revert "py2app fixes"

This reverts commit f70767be28.

CouchPotato.py

@@ -1,167 +1,63 @@
-from threading import Thread
+#!/usr/bin/env python
-from wx.lib.softwareupdate import SoftwareUpdate
+# -*- coding: utf-8 -*-
+'''Wrapper for the command line interface.'''
+
+from os.path import dirname
 import os
 import sys
-import webbrowser
+import subprocess
-import wx
+import time
 
 
-# Include proper dirs
+# Root path
-if hasattr(sys, 'frozen'):
+base_path = dirname(os.path.abspath(__file__))
-    import libs
-    base_path = os.path.dirname(os.path.dirname(os.path.abspath(libs.__file__)))
-    print base_path
-else:
-    base_path = os.path.dirname(os.path.abspath(__file__))
 
-lib_dir = os.path.join(base_path, 'libs')
+# Insert local directories into path
+sys.path.insert(0, os.path.join(base_path, 'libs'))
 
-sys.path.insert(0, base_path)
+from couchpotato.core.logger import CPLog
-sys.path.insert(0, lib_dir)
+log = CPLog(__name__)
 
 # Get options via arg
 from couchpotato.runner import getOptions
-from couchpotato.runner import runCouchPotato
+from couchpotato.core.helpers.variable import getDataDir
-
+options = getOptions(base_path, sys.argv[1:])
-
+data_dir = getDataDir()
-class TaskBarIcon(wx.TaskBarIcon):
+
-
+def start():
-    TBMENU_OPEN = wx.NewId()
+    try:
-    TBMENU_SETTINGS = wx.NewId()
+        args = [sys.executable] + sys.argv
-    TBMENU_ABOUT = wx.ID_ABOUT
+        new_environ = os.environ.copy()
-    TBMENU_EXIT = wx.ID_EXIT
+        new_environ['cp_main'] = 'true'
-
+
-    def __init__(self, frame):
+        if os.name == 'nt':
-        wx.TaskBarIcon.__init__(self)
+            for key, value in new_environ.iteritems():
-        self.frame = frame
+                if isinstance(value, unicode):
-
+                    new_environ[key] = value.encode('iso-8859-1')
-        icon = wx.Icon('icon.ico', wx.BITMAP_TYPE_ANY)
+
-        self.SetIcon(icon)
+        subprocess.call(args, env = new_environ)
-
+        return os.path.isfile(os.path.join(data_dir, 'restart'))
-        self.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.onTaskBarActivate)
+    except KeyboardInterrupt, e:
-
+        pass
-        self.Bind(wx.EVT_MENU, self.onOpen, id = self.TBMENU_OPEN)
+    except Exception, e:
-        self.Bind(wx.EVT_MENU, self.onSettings, id = self.TBMENU_SETTINGS)
+        log.critical(e)
-        self.Bind(wx.EVT_MENU, self.onAbout, id = self.TBMENU_ABOUT)
+        return 0
-        self.Bind(wx.EVT_MENU, self.onTaskBarClose, id = self.TBMENU_EXIT)
-
-
-    def CreatePopupMenu(self):
-        menu = wx.Menu()
-        menu.Append(self.TBMENU_OPEN, "Open")
-        menu.Append(self.TBMENU_SETTINGS, "Settings")
-        menu.Append(self.TBMENU_ABOUT, "About")
-        menu.Append(self.TBMENU_EXIT, "Close")
-        return 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/'
-        webbrowser.open(url)
-
-    def onAbout(self, event):
-        print 'onAbout'
-
-    def onTaskBarActivate(self, evt):
-        if not self.frame.IsShown():
-            self.frame.Show(True)
-        self.frame.Raise()
-
-    def onTaskBarClose(self, evt):
-        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)
-
-        self.parent = parent
-        self.tbicon = TaskBarIcon(self)
-
 
-class WorkerThread(Thread):
+from couchpotato.runner import runCouchPotato
-
+if __name__ == '__main__':
-    def __init__(self, desktop):
-        Thread.__init__(self)
-        self._desktop = desktop
-
-        self.start()
-
-    def run(self):
-
-        args = ['--nogit', '--console_log']#, '--quiet']
-        options = getOptions(base_path, args)
 
+    if os.environ.get('cp_main', 'false') == 'true':
         try:
-            runCouchPotato(options, base_path, args, desktop = self._desktop)
+            runCouchPotato(options, base_path, sys.argv[1:])
-        except KeyboardInterrupt, e:
-            raise
         except Exception, e:
-            raise
+            log.critical(e)
-        finally:
+    else:
-            pass
+        while 1:
-
+            restart = start()
-
+            if not restart:
-class CouchPotatoApp(wx.App, SoftwareUpdate):
+                break
-
+
-    settings = {}
+    from couchpotato.core.event import fireEvent
-    events = {}
+    fireEvent('app.crappy_shutdown', single = True)
-    restart = False
+    time.sleep(1)
-
+    sys.exit()
-    def OnInit(self):
-
-        # Updater
-        base_url = 'http://couchpotatoapp.com/updates/'
-        self.InitUpdates(base_url, base_url + 'changelog.txt',
-                         icon = wx.Icon('icon.ico'))
-
-        self.frame = MainFrame(self)
-        self.frame.Bind(wx.EVT_CLOSE, self.onClose)
-
-        # CouchPotato thread
-        self.worker = WorkerThread(self)
-
-        return True
-
-    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):
-        onClose = self.events.get('onClose')
-        if self.events.get('onClose'):
-            onClose(event)
-        else:
-            self.afterShutdown()
-
-    def afterShutdown(self, restart = False):
-        self.frame.Destroy()
-        self.restart = restart
-
-
-if __name__ == '__main__':
-    app = CouchPotatoApp(redirect = False)
-    app.MainLoop()
-
-    #path = os.path.join(sys.path[0].decode(sys.getfilesystemencoding()), sys.argv[0])
-    #if app.restart:
-    #    wx.Process.Open(sys.executable + ' ' + path)

README.md

@@ -1 +1,5 @@
-CouchPotato Desktop
+CouchPotato Server
+=====
+
+CouchPotato (CP) is an automatic NZB and torrent downloader. You can keep a "movies I want"-list and it will search for NZBs/torrents of these movies every X hours.
+Once a movie is found, it will send it to SABnzbd or download the torrent to a specified directory.

couchpotato/core/_base/_core/main.py

@@ -1,3 +1,4 @@
+from couchpotato import app
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.helpers.request import jsonified
@@ -6,6 +7,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 from flask import request
+from flask.helpers import url_for
 import os
 import time
 import traceback
@@ -27,7 +29,6 @@ class Core(Plugin):
         addEvent('app.crappy_restart', self.crappyRestart)
         addEvent('app.load', self.launchBrowser, priority = 1)
         addEvent('app.base_url', self.createBaseUrl)
-        addEvent('app.api_url', self.createApiUrl)
 
         addEvent('setting.save.core.password', self.md5Password)
 
@@ -42,10 +43,16 @@ class Core(Plugin):
         })
 
     def crappyShutdown(self):
-        self.urlopen('%sapp.shutdown' % self.createApiUrl())
+        ctx = app.test_request_context()
+        ctx.push()
+        self.urlopen('%s%sapp.shutdown' % (fireEvent('app.base_url', single = True), url_for('api.index')))
+        ctx.pop()
 
     def crappyRestart(self):
-        self.urlopen('%sapp.restart' % self.createApiUrl())
+        ctx = app.test_request_context()
+        ctx.push()
+        self.urlopen('%s%sapp.restart' % (fireEvent('app.base_url', single = True), url_for('api.index')))
+        ctx.pop()
 
     def shutdown(self):
         self.initShutdown()
@@ -56,7 +63,6 @@ class Core(Plugin):
         return 'restarting'
 
     def initShutdown(self, restart = False):
-        log.info('Shutting down' if not restart else 'Restarting')
 
         fireEvent('app.shutdown')
 
@@ -116,7 +122,3 @@ class Core(Plugin):
         port = Env.setting('port')
 
         return '%s:%d' % (cleanHost(host).rstrip('/'), int(port))
-
-    def createApiUrl(self):
-
-        return '%s/%s/' % (self.createBaseUrl(), Env.setting('api_key'))

couchpotato/core/_base/desktop/main.py

@@ -7,28 +7,25 @@ log = CPLog(__name__)
 
 if Env.get('desktop'):
 
+    #import os
+    #import sys
+    import wx
+
     class Desktop(Plugin):
 
         def __init__(self):
 
             desktop = Env.get('desktop')
             desktop.setSettings({
-                'base_url': fireEvent('app.base_url', single = True),
+                'url': fireEvent('app.base_url', single = True)
-                'api_url': fireEvent('app.api_url', single = True),
-                'api': Env.setting('api'),
             })
 
-            # Events from desktop
+            def onClose(event):
-            desktop.addEvents({
+                return fireEvent('app.crappy_shutdown')
-                'onClose': self.onClose,
+            desktop.close_handler = onClose
-            })
 
-            # Events to desktop
             addEvent('app.after_shutdown', desktop.afterShutdown)
 
-        def onClose(self, event):
-            return fireEvent('app.crappy_shutdown', single = True)
-
 else:
 
     class Desktop(Plugin):

couchpotato/environment.py

@@ -14,7 +14,7 @@ class Env(object):
     _args = None
     _quiet = False
     _deamonize = False
-    _desktop = None
+    _version = 0.5
 
     ''' Data paths and directories '''
     _app_dir = ""

libs/guessit/fileutils.py

@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import ntpath
 import os.path
 
 
@@ -44,7 +45,7 @@ def split_path(path):
     """
     result = []
     while True:
-        head, tail = os.path.split(path)
+        head, tail = ntpath.split(path)
 
         # on Unix systems, the root folder is '/'
         if head == '/' and tail == '':

setup.py

@@ -1,86 +0,0 @@
-from esky import bdist_esky
-from setuptools import setup
-import sys
-import version
-import os
-
-
-# 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)
-
-
-
-# Windows
-if sys.platform == "win32":
-    import py2exe
-
-    FREEZER = 'py2exe'
-    FREEZER_OPTIONS = dict(
-        compressed = 0,
-        optimize = 0,
-        bundle_files = 3,
-        dll_excludes = [
-            'MSVCP90.dll',
-            'mswsock.dll',
-            'powrprof.dll',
-            'USP10.dll',
-        ],
-        packages = ['couchpotato', 'libs'],
-        includes = [
-            'telnetlib',
-            'xml.etree.ElementTree',
-            'xml.etree.cElementTree',
-            'xml.dom',
-            'xml.dom.minidom',
-        ],
-    )
-    exeICON = 'icon.ico'
-
-
-# OSX
-elif sys.platform == "darwin":
-    import py2app
-
-    FREEZER = 'py2app'
-    FREEZER_OPTIONS = dict(
-        argv_emulation = False,
-        iconfile = 'icon.icns',
-        plist = dict(
-            LSUIElement = True,
-        ),
-        packages = ['couchpotato', 'libs'],
-        includes = [
-            'telnetlib',
-            'xml.etree.ElementTree',
-            'xml.etree.cElementTree',
-            'xml.dom',
-            'xml.dom.minidom',
-        ],
-    )
-    exeICON = None
-
-# Common
-NAME = "CouchPotato"
-APP = [bdist_esky.Executable("CouchPotato.py", gui_only = True, icon = exeICON,)]
-DATA_FILES = ['icon.ico']
-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,
-    data_files = DATA_FILES,
-    options = dict(bdist_esky = ESKY_OPTIONS),
-)
-
-

version.py

@@ -1 +0,0 @@
-VERSION = '0.5'