diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 45f758e9..db78f88b 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -367,19 +367,23 @@ def run_corp_update(): blue_info['ticker'], blue_info['members']['current'], True, blue_alliance) - # 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 (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): - EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) - elif standing_level in corp_standings: - if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], True) + # 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 (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): + EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) + elif standing_level in corp_standings: + if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_alliance_info(all_alliance_api_info['id'], + 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'], @@ -388,52 +392,63 @@ def run_corp_update(): 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'], - all_alliance_api_info['member_count'], False) - # Update corp infos - for all_corp_info in EveManager.get_all_corporation_info(): - alliance = None - corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) - if corpinfo['alliance']['id'] is not None: - alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) + # Update corp infos + for all_corp_info in EveManager.get_all_corporation_info(): + alliance = None + corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_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): - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) - elif int(alliance.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(alliance.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - True) + 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) + elif int(alliance.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(alliance.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + 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, - False) - else: - if int(all_corp_info.corporation_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + if int(all_corp_info.corporation_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) - else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) # Remove irrelevent corp and alliance models # Check the corps for all_corp_info in EveManager.get_all_corporation_info(): - if (settings.IS_CORP and all_corp_info.corporation_id != settings.CORP_ID) or (not settings.IS_CORP and all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID): - if not all_corp_info.is_blue: + if settings.IS_CORP: + if all_corp_info.corporation_id != settings.CORP_ID: + if not all_corp_info.is_blue: + all_corp_info.delete() + else: + if all_corp_info.alliance is not None: + if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: + if not all_corp_info.is_blue: + all_corp_info.delete() + elif not all_corp_info.is_blue: all_corp_info.delete() # Check the alliances for all_alliance_info in EveManager.get_all_alliance_info(): - if (not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID): + if settings.IS_CORP: + if all_alliance_info.is_blue is not True: + if corpinfo.alliance is not None: + if all_alliance_info.alliance_id != corpinfo.alliance.alliance_id: + all_alliance_info.delete() + else: + all_alliance_info.delete() + elif all_alliance_info.alliance_id != settings.ALLIANCE_ID: if all_alliance_info.is_blue is not True: all_alliance_info.delete() diff --git a/requirements.txt b/requirements.txt index 86464bf7..7f6251f2 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ # Python Stuff # - see bootstrap.sh mysql-python +mysqlclient evelink dnspython passlib diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 91d29ec3..938bdca5 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -16,7 +16,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # CD to install its guest extension from. # Create a forwarded port mapping which allows access to a specific port - # within the machine from a port on the host machine. + # within the machine from a port on the host machine. + config.vm.provider "virtualbox" do |v| + v.memory = 1024 + v.cpus = 2 + end + config.vm.network :forwarded_port, guest: 3306, host: 3306 config.vm.network :forwarded_port, guest: 9090, host: 9090 config.vm.network :forwarded_port, guest: 8000, host: 8000 diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index b933faf5..9bc4baaf 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export DEBIAN_FRONTEND=noninteractive sudo add-apt-repository ppa:upubuntu-com/xampp @@ -10,16 +11,7 @@ sudo apt-get -y install libtool sudo apt-get -y install git sudo apt-get -y install python-dev libyaml-dev libffi-dev sudo apt-get -y install python-pip -sudo apt-get -y install mysql-server mysql-client - -#Python 3 stuff -sudo apt-get -y install python-software-properties -sudo add-apt-repository ppa:fkrull/deadsnakes -sudo apt-get -y update -sudo apt-get -y install python3.3 - -#virtualenv stuff -sudo apt-get -y install python-virtualenv +sudo apt-get -y install mysql-server mysql-client libmysqlclient-dev cd /vagrant/ @@ -28,8 +20,6 @@ sudo pip install --upgrade pip # Pip moved location after upgrade from 1.0 sudo ln -s /usr/local/bin/pip /usr/bin/pip 2>/dev/null -sudo apt-get -y install libmysqlclient-dev - sudo pip install --allow-external mysql-connector-python mysql-connector-python sudo pip install --allow-external python-openfire python-openfire==0.2.3-beta sudo pip install https://github.com/eve-val/evelink/zipball/master @@ -51,10 +41,8 @@ sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_jabber sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_mumble sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_killboard -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceauth'@'localhost' IDENTIFIED BY 'allianceauth'" -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceauth'@'localhost'"; -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'alliancemumble'@'localhost' IDENTIFIED BY 'alliancemumble'" -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'alliancemumble'@'localhost'"; +sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceserver'@'localhost' IDENTIFIED BY 'password'" +sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceserver'@'localhost'"; sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges @@ -72,5 +60,6 @@ echo 'Next steps:\n' echo '1. Adjust mysql root password if you feel so inclined.' echo '2. Adjust all the stuff in ./alliance_auth/settings.py.' echo '3. Run sudo python manage.py syncdb to set up the database tables' -echo "4. run cd /vagrant/; ./startup.sh to start, and ./shutdown.sh to stop." +echo '4. Run python manage.py shell < run_alliance_corp_update.py' +echo "5. run cd /vagrant/; ./startup.sh to start, and ./shutdown.sh to stop." echo '--------'