RedisServer-Queue 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

RedisServer_Queue/RedisServer.py

@@ -9,52 +9,30 @@ import os
 import sys
 import time
 import uuid
-
 import redis
 
-# 将当前文件夹添加到环境变量
-if os.path.basename(__file__) in ['run.py', 'main.py', '__main__.py']:
-    if '.py' in __file__:
-        sys.path.append(os.path.abspath(os.path.dirname(__file__)))
-    else:
-        sys.path.append(os.path.abspath(__file__))
-
-r = redis.Redis
-
-
-def init(rids_boj=None):
-    '''
-    初始化redis
-    :param rids_boj:
-    :return:
-    '''
-    global r
-    if rids_boj:
-        r = rids_boj
-    else:
-        r = r(host='localhost', port=6379, db=0)
-
 
 class RedisQueue:
-    def __init__(self, topic=None):
+    def __init__(self, r: redis.Redis, topic: str = 'test_queue'):
         self.topic = topic
+        self.r = r
 
     def get(self):
         # 弹出指定数量的数据
-        data = r.rpop(self.topic)
+        data = self.r.rpop(self.topic)
         return data if data else None
 
     def put(self, value):
         if isinstance(value, list):
-            r.lpush(self.topic, *value)
+            self.r.lpush(self.topic, *value)
         else:
-            r.lpush(self.topic, *[value])
+            self.r.lpush(self.topic, *[value])
 
     def clear(self):
-        r.delete(self.topic)
+        self.r.delete(self.topic)
 
     def size(self):
-        return r.llen(self.topic)
+        return self.r.llen(self.topic)
 
     def qsize(self):
         return self.size()
@@ -63,29 +41,29 @@ class RedisQueue:
         return [self.get() for _ in range(num)]
 
     def re_data(self):
-        ch_keys = r.keys(f"ack_{self.topic}_*")
+        ch_keys = self.r.keys(f"ack_{self.topic}_*")
         for key in ch_keys:
-            data = r.get(key)
+            data = self.r.get(key)
             if data:
-                q = RedisQueue(self.topic)
+                q = RedisQueue(self.r, self.topic)
                 t, _data = json.loads(data)
-                r.delete(key)
+                self.r.delete(key)
                 q.put(_data)
         return len(ch_keys)
 
     def get_all(self):
-        return r.lrange(self.topic, 0, -1)
+        return self.r.lrange(self.topic, 0, -1)
 
 
 class RedisMQ:
     def __init__(self):
         self.switch = 1
 
-    def start_receive(self, topic, callback, count=-1):
+    def start_receive(self, r, topic, callback, count=-1):
         while self.switch:
             data = r.rpop(topic)
             if data:
-                ch = RedisCh(topic, data)
+                ch = RedisCh(r, topic, data)
                 callback(ch, data)
                 if count == 1:
                     return
@@ -94,7 +72,7 @@ class RedisMQ:
             for key in ch_keys:
                 data = r.get(key)
                 if data:
-                    q = RedisQueue(topic)
+                    q = RedisQueue(r, topic)
                     t, _data = json.loads(data)
                     if time.time() - t > 10 * 60:
                         r.delete(key)
@@ -109,17 +87,19 @@ class RedisMQ:
 
 
 class RedisCh:
-    def __init__(self, topic, data):
+    def __init__(self, r, topic, data):
+        self.r = r
         self.topic = topic
         self.id = uuid.uuid4()
         r.set(f"ack_{topic}_{self.id}", json.dumps([time.time(), data.decode()]))
 
     def basic_ack(self):
-        r.delete(f"ack_{self.topic}_{self.id}")
+        self.r.delete(f"ack_{self.topic}_{self.id}")
 
 
 if __name__ == '__main__':
-    r.delete('test')
+    r1 = redis.Redis()
+    r1.delete('test')
     # a = RedisQueue("test")
     # a.put(1)
     # print(type(a.get()))

{RedisServer_Queue-0.0.3.dist-info → RedisServer_Queue-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: RedisServer-Queue
-Version: 0.0.3
+Version: 0.0.5
 Summary: RedisServer-Queue is a simple redis server
 Author-email: NelsonLongXiang <1169207670@qq.com>
 Project-URL: Homepage, https://github.com/NelsonLongxiang/RedisServer
@@ -13,3 +13,26 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 
 RedisServer-Queue is a simple redis server
+
+## Installation
+
+```bash
+pip install -i https://pypi.org/simple RedisServer-Queue
+```
+
+```commandline
+pip install --upgrade -i https://pypi.org/simple RedisServer-Queue
+```
+
+## Usage
+
+#### 请参考test目录下test.py文件
+
+## License
+
+[MIT](https://choosealicense.com/licenses/mit/)
+
+### 作者联系方式
+
+1. 作者邮箱：`1169207670@qq.com`
+2. Wechat: `1169207670`

RedisServer_Queue-0.0.5.dist-info/RECORD

@@ -0,0 +1,6 @@
+RedisServer_Queue/RedisServer.py,sha256=HhuGiyLnDzKSMu7EwI56zPRYJAncufGmsbD0JjYqORw,2883
+RedisServer_Queue-0.0.5.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+RedisServer_Queue-0.0.5.dist-info/METADATA,sha256=QzFR9MMW_lKJdHft1vXiEJhiE2ZQGKNpgZ3W_CffIRk,995
+RedisServer_Queue-0.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+RedisServer_Queue-0.0.5.dist-info/top_level.txt,sha256=rcsBD4X_qh4CYFrIE79f5ETrrVBFWcHmqrSydQVyDHI,18
+RedisServer_Queue-0.0.5.dist-info/RECORD,,

{RedisServer_Queue-0.0.3.dist-info → RedisServer_Queue-0.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

RedisServer_Queue-0.0.3.dist-info/RECORD

@@ -1,6 +0,0 @@
-RedisServer_Queue/RedisServer.py,sha256=xua8R_elXjfSw-izd6UWj7xqogvw0YriP5ugN04Q-Eg,3233
-RedisServer_Queue-0.0.3.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-RedisServer_Queue-0.0.3.dist-info/METADATA,sha256=525YnTUOGmGefTqLW3qdZtir2Zjm1kii3eYUs3CH7n4,598
-RedisServer_Queue-0.0.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-RedisServer_Queue-0.0.3.dist-info/top_level.txt,sha256=rcsBD4X_qh4CYFrIE79f5ETrrVBFWcHmqrSydQVyDHI,18
-RedisServer_Queue-0.0.3.dist-info/RECORD,,