Merge remote-tracking branch 'refs/remotes/R4stl1n/master'

.gitignore

@@ -57,3 +57,6 @@ target/
 alliance_auth/settings.py
 *Thumbs.db
 nginx_config.txt
+
+# custom staticfiles
+static/*

alliance_auth/settings.py.example

@@ -122,11 +122,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 TEMPLATE_DIRS = (
-    'templates',
+    'customization/templates',
+    'stock/templates',
 )
 
 STATICFILES_DIRS = (
-    'static',
+    'customization/static',
+    'stock/static',
 )
 
 LOGIN_URL = '/login_user/'
@@ -147,6 +149,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 STATIC_URL = '/static/'
+STATIC_ROOT = '/home/allianceserver/allianceauth/static/'
 
 #####################################################
 ##

celerytask/tasks.py

@@ -369,17 +369,22 @@ def run_corp_update():
 
             # Update all allinace info's
             for all_alliance_info in EveManager.get_all_alliance_info():
-                all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id)
+                if EveApiManager.check_if_alliance_exists(all_alliance_info.alliance_id):
-                if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID):
+                    all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id)
-                    EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'],
+                    if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID):
-                                                    all_alliance_api_info['member_count'], False)
+                        EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'],
-                elif standing_level in corp_standings:
+                                                        all_alliance_api_info['member_count'], False)
-                    if int(all_alliance_info.alliance_id) in corp_standings[standing_level]:
+                    elif standing_level in corp_standings:
-                        if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][
+                        if int(all_alliance_info.alliance_id) in corp_standings[standing_level]:
-                            'standing']) >= settings.BLUE_STANDING:
+                            if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][
-                            EveManager.update_alliance_info(all_alliance_api_info['id'],
+                                'standing']) >= settings.BLUE_STANDING:
-                                                            all_alliance_api_info['executor_id'],
+                                EveManager.update_alliance_info(all_alliance_api_info['id'],
-                                                            all_alliance_api_info['member_count'], True)
+                                                                all_alliance_api_info['executor_id'],
+                                                                all_alliance_api_info['member_count'], True)
+                            else:
+                                EveManager.update_alliance_info(all_alliance_api_info['id'],
+                                                                all_alliance_api_info['executor_id'],
+                                                                all_alliance_api_info['member_count'], False)
                         else:
                             EveManager.update_alliance_info(all_alliance_api_info['id'],
                                                             all_alliance_api_info['executor_id'],
@@ -389,41 +394,44 @@ def run_corp_update():
                                                         all_alliance_api_info['executor_id'],
                                                         all_alliance_api_info['member_count'], False)
                 else:
-                    EveManager.update_alliance_info(all_alliance_api_info['id'],
+                    #alliance no longer exists
-                                                    all_alliance_api_info['executor_id'],
+                    all_alliance_info.delete()
-                                                    all_alliance_api_info['member_count'], False)
 
             # Update corp infos
             for all_corp_info in EveManager.get_all_corporation_info():
-                alliance = None
+                if EveApiManager.check_if_corp_exists(all_corp_info.corporation_id):
-                corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id)
+                    alliance = None
-                if corpinfo['alliance']['id'] is not None:
+                    corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id)
-                    alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id'])
+                    if corpinfo['alliance']['id'] is not None:
+                        alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id'])
 
-                if alliance is not None and all_corp_info.alliance is not None:
+                    if alliance is not None and all_corp_info.alliance is not None:
 
-                    if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID):
+                        if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID):
-                        EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False)
+                            EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False)
-                    elif int(alliance.alliance_id) in corp_standings[standing_level]:
+                        elif int(alliance.alliance_id) in corp_standings[standing_level]:
-                        if int(corp_standings[standing_level][int(alliance.alliance_id)][
+                            if int(corp_standings[standing_level][int(alliance.alliance_id)][
-                            'standing']) >= settings.BLUE_STANDING:
+                                'standing']) >= settings.BLUE_STANDING:
-                            EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
+                                EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
-                                                               True)
+                                                                   True)
+                            else:
+                                EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
+                                                                   False)
                         else:
                             EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
                                                                False)
                     else:
-                        EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
+                        if int(all_corp_info.corporation_id) in corp_standings[standing_level]:
-                                                           False)
+                            if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][
-                else:
+                                'standing']) >= settings.BLUE_STANDING:
-                    if int(all_corp_info.corporation_id) in corp_standings[standing_level]:
+                                EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True)
-                        if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][
+                            else:
-                            'standing']) >= settings.BLUE_STANDING:
+                                EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
-                            EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True)
                         else:
                             EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
-                    else:
+                else:
-                        EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
+                    #corp has closed
+                    all_corp_info.delete()
 
         # Remove irrelevent corp and alliance models
         # Check the corps

customization/.gitignore

@@ -0,0 +1,7 @@
+#Ignore everything
+*
+#Except these
+!.gitignore
+!README.md
+!templates
+!static

customization/README.md

@@ -0,0 +1,7 @@
+If you want to customize your site, place the custom files in the appropriate directories below.
+
+Place custom pages in the templates directory.
+
+Place custom images, css, etc in the static directory.
+
+Be sure to make folders are required to preserve the original file location.

customization/static/.gitignore

@@ -0,0 +1,5 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+!README.md

customization/static/README.md

@@ -0,0 +1,7 @@
+Place your custom static files in this folder. Maintain the folder structure of the original static folder. 
+
+For instance, if you have a custom background image for the index page, it would be located at:
+
+`customization/static/img/index_images/index_blank_bg.jpg`
+
+This directory will get searched first for the image, then fall back to the default.

customization/templates/.gitignore

@@ -0,0 +1,5 @@
+#Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+!README.md

customization/templates/README.md

@@ -0,0 +1,7 @@
+Place your custom templates in this folder.
+Maintain the folder structure of the original templates folder.
+For instance, if you have a custom index page, it would be located at:
+
+`customization/templates/public/index.html`
+
+This directory will get searched first, then fall back to the defaults.

services/managers/eve_api_manager.py

@@ -179,3 +179,38 @@ class EveApiManager():
             return False
 
         return False
+
+    @staticmethod
+    def check_if_alliance_exists(alliance_id):
+        try:
+            api = evelink.api.API()
+            eve = evelink.eve.EVE(api=api)
+            alliances = eve.alliances()
+            if int(alliance_id) in alliances[0]:
+                return True
+            else:
+                return False
+        except evelink.api.APIError as error:
+            print error
+            return False
+        except ValueError as error:
+            #attempts to catch error resulting from checking alliance_of nonetype models
+            print error
+            return False
+        return False
+
+    @staticmethod
+    def check_if_corp_exists(corp_id):
+        try:
+            api = evelink.api.API()
+            corp = evelink.corp.Corp(api=api)
+            corpinfo = corp.corporation_sheet(corp_id=corp_id)
+            if corpinfo[0]['members']['current'] > 0:
+                return True
+            else:
+                return False
+        except evelink.api.APIError as error:
+            #could be smart and check for error code523 to verify error due to no corp instead of catch-all
+            print error
+            return False
+        return False

static/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore