aboutsummarybugs & patchesrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/discord_image_bridge/fsmanager.py7
-rw-r--r--src/discord_image_bridge/utils.py4
2 files changed, 2 insertions, 9 deletions
diff --git a/src/discord_image_bridge/fsmanager.py b/src/discord_image_bridge/fsmanager.py
index 7acaa3b..7313889 100644
--- a/src/discord_image_bridge/fsmanager.py
+++ b/src/discord_image_bridge/fsmanager.py
@@ -16,18 +16,14 @@ def hash2meta_fname(hash):
class MetaFile:
def __init__(self, hash):
self.hash=hash
- print("init")
def __enter__(self):
fname=hash2meta_fname(self.hash)
- print("Opening "+fname)
self.fd=open( fname, "r+" if os.path.isfile(fname) else "x+" )
- print("Opened metafile "+self.fd.name)
fcntl.lockf(self.fd, fcntl.LOCK_EX)
return self
def read(self):
- print("Read")
self.fd.seek(0)
if self.fd.read(1):
self.fd.seek(0)
@@ -36,7 +32,6 @@ class MetaFile:
return {}
def write(self, data):
- print("Write")
self.fd.seek(0)
self.fd.truncate()
json.dump(data, self.fd)
@@ -51,12 +46,10 @@ class DataFile:
self.fd=fd
def __enter__(self):
- print("Lock")
fcntl.lockf(self.fd, fcntl.LOCK_EX)
return self.fd
def __exit__(self, type, value, exception):
- print("Unlock")
fcntl.lockf(self.fd, fcntl.LOCK_UN)
diff --git a/src/discord_image_bridge/utils.py b/src/discord_image_bridge/utils.py
index 79fd209..e92ed5b 100644
--- a/src/discord_image_bridge/utils.py
+++ b/src/discord_image_bridge/utils.py
@@ -90,7 +90,7 @@ def on_ready(plugin:discord.DiscordWsManager, client:discord.DiscordWsClient):
fname=attachment["filename"]
def callback(hash, disk_fname):
- cherrypy.log("Writing meta")
+ cherrypy.log("Writing meta for hash "+hash)
with fsmanager.MetaFile(hash) as metafd:
data=metafd.read()
if not "sources" in data:
@@ -102,7 +102,7 @@ def on_ready(plugin:discord.DiscordWsManager, client:discord.DiscordWsClient):
"attachment":id
})
metafd.write(data)
- cherrypy.log("Done")
+ #cherrypy.log("Done")
download_pool.exec(args=(attachment["url"], fname),callback=callback)