remake many certs

.drone.yml

@@ -18,8 +18,8 @@ steps:
 - name: pull into the folduh
   commands:
   - cd /usr/share/$DRONE_REPO_NAME
-  - git pull
-  - chown -R jack:jack .
+  - su -c "git pull" jack
+  #- chown -R jack:jack .
   when:
     branch:
     - BIG_DICK_COCK

README.md

@@ -1 +0,0 @@
-Оно собирает хуи!

exporto.py

@@ -1,32 +1,13 @@
-from sqlalchemy import create_engine, Integer, String, BIGINT, Column, DateTime 
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
-from sqlalchemy import select, update
-
-
-
 from flask import Flask 
 
+#### https://docs.python-arango.com/en/main/
+from arango import ArangoClient
+ 
+
+
 app = Flask(__name__)
 
  
-engine = create_engine('postgresql+psycopg2://postgres:postgres@postgres.vdk2ch.ru:5432/jack_bot', echo=True)
-Session = sessionmaker(bind=engine)
-
-
-Base = declarative_base()
-
-
-
-class user(Base):
-    __tablename__ = 'users'
-
-    id = Column(Integer, primary_key=True)
-    user_id = Column(Integer)
-    user_fullname = Column(String)
-    dick_size = (Column(Integer))
-    datetimes = (Column(DateTime))
-    chat_id = Column(BIGINT)
 
 
  
@@ -34,14 +15,24 @@ class user(Base):
 def get_top_dicks():
 
 
-    session = Session()
+    arango_client = ArangoClient(hosts='https://arango.guaranteedstruggle.host') 
+    pipisa_db     = arango_client.db('pipisa', username='root', password='stolendick527') 
+    dicks_collection = pipisa_db.collection('dicks')  
 
-    top = session.query(user.user_fullname, user.dick_size, user.user_id, user.chat_id).order_by(user.dick_size.desc()).all()
+    dicks = dicks_collection.all( ) 
+    dicks = [[
+        d['user_fullname'],
+        d['dick_size'],
+        d['user_id'],
+        d['chat_id'],
+        d['attempts'],
+    ] for d in dicks]
+ 
+    dicks  = sorted(dicks, key=lambda dick: dick[1], reverse=True) 
+
+    return dicks
 
  
-    session.close()
-
-    return top
    
 
 @app.route('/metrics')
@@ -54,6 +45,13 @@ def metrics():
     for dick in docks:
         metrics += 'pipisio{user="%s", user_id="%s", chat_id="%s"} %s\n' % (dick[0], dick[2], dick[3], dick[1])
 
+    # текущее число попыток
+    for dick in docks:
+        metrics += 'pipisio_attempto{user="%s", user_id="%s", chat_id="%s"} %s\n' % (dick[0], dick[2], dick[3], dick[4]) 
+ 
+
+    docks = [ d for d in docks if d[3] == -1001355646177] 
+
     # расстояние до следующего впереди  
     for k in range(len(docks)):
 
@@ -69,13 +67,11 @@ def metrics():
                 i -= 1
                 upper_dick_size = docks[i][1]
   
-            if i == 0:
-                metrics += 'pipisio_topdick_distanso{user="%s", user_id="%s", chat_id="%s"} %s\n' % (docks[k][0], docks[k][2], docks[k][3], 0) 
-            else:
-                metrics += 'pipisio_topdick_distanso{user="%s", user_id="%s", chat_id="%s"} %s\n' % (docks[k][0], docks[k][2], docks[k][3], (upper_dick_size - docks[k][1])) 
+            metrics += 'pipisio_topdick_distanso{user="%s", user_id="%s", chat_id="%s"} %s\n' % (docks[k][0], docks[k][2], docks[k][3], (upper_dick_size - docks[k][1])) 
 
     return metrics
 
+
+
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=9992)
-    engine.dispose()

requirements.txt

@@ -0,0 +1,6 @@
+aiogram
+sqdb
+sqlalchemy
+graypy
+flask
+psycopg2