Added an option to receive always a random device id

Author: b1n4ryj4n

README.md

@@ -22,12 +22,21 @@ This is a simple implementation of the KOReader (https://github.com/koreader/kor
 ## Or via Docker
 
 ```bash
-> docker build --rm=true --tag=kosync .
+> docker build --rm=true --tag=kosync:latest .
 
 > docker-compose up -d
 
 ```
 
+## Environment Variables
+
+* RECEIVE_RANDOM_DEVICE_ID ("True"|"False")
+
+Set it true to retrieve always a random device id to force a progress sync. 
+This is usefull if you only sync your progress from only one device and 
+usually delete the *.sdr files with some cleaning tools.
+
+
 ## Dockerhub
 
 There is also a dockerhub image available if you are not able to build yourself the image.
@@ -41,6 +50,10 @@ For linux/amd64 you can use `docker pull b1n4ryj4n/koreader-sync` and for linux/
 
 ## Changelog
 
+## [0.0.3] - 2021-03-20
+### Added
+- Added an environment variable option to receive always a random device id
+
 ## [0.0.2] - 2021-02-21
 ### Added
 - Merged ["Dockerfile: use multi-stage build to optimize image size"](https://github.com/b1n4ryj4n/koreader-sync/pull/3)

docker-compose.yml

@@ -1,10 +1,12 @@
 version: '3'
 services:
   kosync:
-    image: kosync
+    image: kosync:latest
     container_name: kosync
     ports:
       - 8081:8081
     volumes:
       - ./data:/app/data
+    environment:
+      - RECEIVE_RANDOM_DEVICE_ID=False
     restart: always

kosync.py

@@ -1,17 +1,21 @@
 # -*- coding: utf-8 -*-
 import time
+import uuid
+from distutils.util import strtobool
+from os import getenv
 from typing import Optional
 
+from dotenv import load_dotenv
 from fastapi import FastAPI, Header
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel
-from tinydb import TinyDB, Query
+from tinydb import Query, TinyDB
 
 app = FastAPI(openapi_url=None, redoc_url=None)
-db = TinyDB('data/db.json')
-users = db.table('users')
-documents = db.table('documents')
-
+db = TinyDB("data/db.json")
+users = db.table("users")
+documents = db.table("documents")
+load_dotenv()
 
 class KosyncUser(BaseModel):
     username: Optional[str] = None
@@ -110,10 +114,16 @@ def get_progress(document: Optional[str] = None, x_auth_user: Optional[str] = He
         # get document progress if user has the document
         result = documents.get((QDocument.username == x_auth_user) & (QDocument.document == document))
         if result:
+            rrdi = bool(strtobool(getenv("RECEIVE_RANDOM_DEVICE_ID", "False")))
+            if rrdi == False:
+                device_id = result["device_id"]
+            else:
+                device_id = uuid.uuid1()
+                device_id = str(device_id.hex).upper()
             return JSONResponse(status_code=200,
                                 content={'username': x_auth_user, 'document': result["document"],
                                          'progress': result["progress"], 'percentage': result["percentage"],
-                                         'device': result["device"], 'device_id': result["device_id"],
+                                         'device': result["device"], 'device_id': device_id,
                                          'timestamp': result["timestamp"]})
     else:
         return JSONResponse(status_code=401, content={"message": f"Unauthorized"})

requirements.txt

@@ -1,3 +1,4 @@
 fastapi==0.68.1
 tinydb==4.5.1
-uvicorn==0.15.0
+uvicorn==0.15.0
+python-dotenv==0.19.2