moved the modules into package

.gitignore

@@ -56,4 +56,4 @@ docs/_build/
 # PyBuilder
 target/
 
-static/zim/*.zim
+zimbalaka/static/zim/*.zim

run.py

@@ -0,0 +1,3 @@
+from zimbalaka import app
+
+app.run( debug=True )

zimbalaka.py → zimbalaka/__init__.py

@@ -6,8 +6,8 @@
 import os
 
 app = Flask(__name__)
-app.config['CELERY_BROKER_URL'] = 'redis://localhost:6379/0'
-app.config['CELERY_RESULT_BACKEND'] = 'redis://localhost:6379/0'
+app.config.from_object('zimbalaka.default_settings')
+# app.config.from_envvar('ZIMBALAKA_SETTINGS') # used for loading production config
 
 celery = Celery(app.name, broker=app.config['CELERY_BROKER_URL'])
 celery.conf.update(app.config)
@@ -52,7 +52,3 @@ def download(task_id,filename):
     except IOError:
         return 'The file you have requested has been deleted from the server. Zim files are stored only for 59 minutes.'
 
-
-if __name__ == "__main__":
-    app.debug = True
-    app.run()

zimbalaka/default_settings.py

@@ -0,0 +1,10 @@
+# The default settings is for the **development**
+# NOTE You **MUST** change this before running production
+
+DEBUG = True
+SECRET_KEY = 'development key'
+
+# Celery conf when using REDIS as broker
+# NOTE Change this if you want to use a different broker
+CELERY_BROKER_URL = 'redis://localhost:6379/0'
+CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'

utils.py → zimbalaka/utils.py

@@ -48,7 +48,8 @@ def clean_page(html):
         doc.remove(sec.strip())
     # add the styles
     if not os.path.isfile(os.path.join(dloc,"assets","style1.css")):
-        shutil.copytree("assets", dloc+'/assets') # copt the stylesheets to the tmp folder
+        shutil.copytree(os.path.join( os.path.dirname(__file__), 'assets'),
+                os.path.join( dloc,'assets') ) # copt the stylesheets to the tmp folder
     doc('head').append('<link rel="stylesheet" href="assets/style1.css" type="text/css">')
     doc('head').append('<link rel="stylesheet" href="assets/style2.css" type="text/css">')
     # place the images
@@ -126,7 +127,7 @@ def zimit(title, articles):
     command = "/usr/local/bin/zimwriterfs -w "+w+" -f "+f+" -l "+l+" -t "+t+" -d "+d+" -c "+c+" -p "+p+" "+directory+" "+zimfile
     call(command, shell=True)
     tmpdir, zim = os.path.split(zimfile)
-    newzim = "static/zim/"+zim
+    newzim = os.path.join( os.path.dirname( __file__ ), 'static', 'zim', zim)
     shutil.copy(zimfile, newzim)
     shutil.rmtree(tmpdir)
     print newzim #TODO Fix the following
@@ -137,4 +138,4 @@ def zimit(title, articles):
     if len(sys.argv) < 2:
         print "insufficient params"
     else:
-        zimit(sys.argv[1])
+        zimit(sys.argv[1], sys.argv[2])