punky
/
botany
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #24 from PaperMountainStudio/python3 

Use python3
pull/32/head
Jake Funke 2020-04-03 14:55:10 -07:00 committed by GitHub
parent 595a4d7e31 c089f8fe67
commit ea92373f37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -13,7 +13,7 @@ Check in and water your plant every 24h to keep it growing. 5 days without water
## getting started ## getting started
botany is designed for unix-based systems. Clone into a local directory using `$ git clone https://github.com/jifunks/botany.git`. botany is designed for unix-based systems. Clone into a local directory using `$ git clone https://github.com/jifunks/botany.git`.
Run with `$ python botany.py`. Run with `$ python3 botany.py`.
*Note - botany.py must initially be run by the user who cloned/unzipped botany.py - this initalizes the shared data file permissions.* *Note - botany.py must initially be run by the user who cloned/unzipped botany.py - this initalizes the shared data file permissions.*
@ -64,7 +64,7 @@ A once-weekly cron on clear_weekly_users.py should be set up to keep weekly visi
## requirements ## requirements
* Unix-based OS (Mac, Linux) * Unix-based OS (Mac, Linux)
* Python 2.x * Python 3.x
* Recommended: 80x24 minimum terminal, fixed-width font * Recommended: 80x24 minimum terminal, fixed-width font
## credits ## credits

11
botany.py
View File

@ -1,6 +1,5 @@
#!/usr/bin/env python2 #!/usr/bin/env python3
from __future__ import division
import time import time
import pickle import pickle
import json import json
@ -249,7 +248,7 @@ class Plant(object):
else: else:
with open(visitor_filepath, mode='w') as f: with open(visitor_filepath, mode='w') as f:
json.dump([], f) json.dump([], f)
os.chmod(visitor_filepath, 0666) os.chmod(visitor_filepath, 0o666)
if not guest_timestamps: if not guest_timestamps:
return self.watered_timestamp return self.watered_timestamp
all_timestamps = [self.watered_timestamp] + guest_timestamps all_timestamps = [self.watered_timestamp] + guest_timestamps
@ -473,7 +472,7 @@ class DataManager(object):
sqlite_dir_path = os.path.join(self.game_dir,'sqlite') sqlite_dir_path = os.path.join(self.game_dir,'sqlite')
if not os.path.exists(sqlite_dir_path): if not os.path.exists(sqlite_dir_path):
os.makedirs(sqlite_dir_path) os.makedirs(sqlite_dir_path)
os.chmod(sqlite_dir_path, 0777) os.chmod(sqlite_dir_path, 0o777)
conn = sqlite3.connect(self.garden_db_path) conn = sqlite3.connect(self.garden_db_path)
init_table_string = """CREATE TABLE IF NOT EXISTS garden ( init_table_string = """CREATE TABLE IF NOT EXISTS garden (
plant_id tinytext PRIMARY KEY, plant_id tinytext PRIMARY KEY,
@ -490,9 +489,9 @@ class DataManager(object):
# init only, creates and sets permissions for garden db and json # init only, creates and sets permissions for garden db and json
if os.stat(self.garden_db_path).st_uid == os.getuid(): if os.stat(self.garden_db_path).st_uid == os.getuid():
os.chmod(self.garden_db_path, 0666) os.chmod(self.garden_db_path, 0o666)
open(self.garden_json_path, 'a').close() open(self.garden_json_path, 'a').close()
os.chmod(self.garden_json_path, 0666) os.chmod(self.garden_json_path, 0o666)
def migrate_database(self): def migrate_database(self):
conn = sqlite3.connect(self.garden_db_path) conn = sqlite3.connect(self.garden_db_path)

2
clear_weekly_users.py
View File

@ -6,6 +6,6 @@ garden_db_path = os.path.join(game_dir, 'sqlite/garden_db.sqlite')
conn = sqlite3.connect(garden_db_path) conn = sqlite3.connect(garden_db_path)
c = conn.cursor() c = conn.cursor()
c.execute("DELETE FROM visitors") c.execute("DELETE FROM visitors")
print "Cleared weekly users" print("Cleared weekly users")
conn.commit() conn.commit()
conn.close() conn.close()

8
testsql.py
View File

@ -40,10 +40,10 @@ def update_garden_db():
# ) # )
# """.format(pid = "asdfasdf", pown = "jake", pdes = "big cool plant", page="25d", psco = str(25), pdead = str(False)) # """.format(pid = "asdfasdf", pown = "jake", pdes = "big cool plant", page="25d", psco = str(25), pdead = str(False))
print c.execute(update_query) print(c.execute(update_query))
conn.commit() conn.commit()
conn.close() conn.close()
#print "bigggg booom" #print("bigggg booom")
def retrieve_garden_from_db(garden_db_path): def retrieve_garden_from_db(garden_db_path):
# Builds a dict of dicts from garden sqlite db # Builds a dict of dicts from garden sqlite db
@ -68,7 +68,7 @@ def retrieve_garden_from_db(garden_db_path):
#init_database() #init_database()
#update_garden_db() #update_garden_db()
results = retrieve_garden_from_db(garden_db_path) results = retrieve_garden_from_db(garden_db_path)
print results print(results)
# con = sqlite3.connect(garden_db_path) # # con = sqlite3.connect(garden_db_path) #
@ -77,7 +77,7 @@ print results
# cur.execute("select * from garden ORDER BY score desc") # # cur.execute("select * from garden ORDER BY score desc") #
# blah = cur.fetchall() # # blah = cur.fetchall() #
# con.close() # con.close()
# print blah # print(blah)