feat: fix stupid bug

.gitignore

@@ -1,6 +1,7 @@
 ### Custom
 
-# New data directories
+*.db
+
 content/**/**
 !content/.gitkeep
 

README.md

@@ -124,15 +124,17 @@ docker push michaelfromyeg/bereal-wrapped-cli
 
 ### Current Developments
 
-* [ ] Add a SQLite database; expire videos after 24-hours
-* [ ] Make files, paths specific to user (i.e., a phone number)
-* [ ] Clean-up steps
+* [x] Add a SQLite database; expire videos after 24-hours
+* [x] Make files, paths specific to user (i.e., a phone number)
+* [x] Clean-up steps
 * [ ] Add 'no sound' option
+  * [x] Default music
 * [ ] Display RealMoji
 * [ ] Toggle date label setting
 * [ ] Show render progress on webpage
 * [ ] Batching algorithm for videos
-* [ ] Better phone number support (start with CLI)
+* [x] Better phone number support (start with CLI)
+* [ ] Move files to cloud storage (e.g., AWS)
 
 ## Remarks
 

bereal/cli.py

@@ -8,7 +8,7 @@
 from typing import Any, Callable
 
 from .bereal import memories, send_code, verify_code
-from .images import cleanup_images, create_images
+from .images import create_images
 from .logger import logger
 from .utils import CONTENT_PATH, YEARS, Mode, str2mode, year2dates
 from .videos import build_slideshow
@@ -90,7 +90,7 @@ def validate() -> tuple[str, str] | None:
     token = retry_api(
         "Verifying your authentication token...",
         verify_code,
-        {"session": otp_session, "code": user_code},
+        {"otp_session": otp_session, "otp_code": user_code},
         "Hmm... there was an issue verifying the code.",
     )
     if token is None:
@@ -185,7 +185,9 @@ def step(idx: int, retval: dict[str, Any] | None) -> dict[str, Any] | None:
             video_file = f"{short_token}-{retval['phone']}-{retval['year']}.mp4"
 
             build_slideshow(retval["image_folder"], retval["song_path"], video_file, retval["mode"])
-            cleanup_images(retval["phone"], retval["year"])
+
+            # TODO(michaelfromyeg): delete images in production
+            # cleanup_images(retval["phone"], retval["year"])
         case _:
             raise ValueError(f"Invalid step: {idx}")
 

bereal/images.py

@@ -108,12 +108,12 @@ def create_images(
     os.makedirs(primary_folder, exist_ok=True)
     os.makedirs(secondary_folder, exist_ok=True)
 
-    os.makedirs(output_folder, exist_ok=True)
-
     if os.path.isdir(output_folder):
         logger.info("Skipping 'create_images' stage; already created!")
         return output_folder
 
+    os.makedirs(output_folder, exist_ok=True)
+
     # Get a list of primary filenames
     primary_filenames = os.listdir(primary_folder)
 

bereal/server.py

@@ -14,7 +14,7 @@
 from itsdangerous import SignatureExpired, URLSafeTimedSerializer
 
 from .bereal import memories, send_code, verify_code
-from .images import cleanup_images, create_images
+from .images import create_images
 from .logger import logger
 from .utils import (
     CONTENT_PATH,
@@ -38,7 +38,8 @@
 else:
     CORS(app, resources={r"/*": {"origins": "https://michaeldemar.co"}})
 
-app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///tokens.db"
+basedir = os.path.abspath(os.path.dirname(__file__))
+app.config["SQLALCHEMY_DATABASE_URI"] = f'sqlite:///{os.path.join(basedir, "tokens.db")}'
 app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 db = SQLAlchemy(app)
 
@@ -150,7 +151,9 @@ def create_video() -> tuple[Response, int]:
 
     image_folder = create_images(phone, year)
     build_slideshow(image_folder, song_path, video_file, mode)
-    cleanup_images(phone, year)
+
+    # TODO(michaelfromyeg): delete images in production
+    # cleanup_images(phone, year)
 
     return jsonify({"videoUrl": video_file}), 200
 

client/src/components/Form.tsx

@@ -9,6 +9,8 @@ const BASE_URL = IS_PRODUCTION
   : "http://localhost:5000";
 
 const Footer: React.FC = () => {
+  const [loading, setLoading] = useState<boolean>(false);
+
   const [stage, setStage] = useState<Stage>("phoneInput");
   const [phoneNumber, setPhoneNumber] = useState<string>("");
   const [countryCode, setCountryCode] = useState<string>("");
@@ -30,6 +32,8 @@ const Footer: React.FC = () => {
 
         setStage("settings");
       } else {
+        setLoading(true);
+
         const response = await axios.post(`${BASE_URL}/request-otp`, {
           phone: `${countryCode}${phoneNumber}`,
         });
@@ -42,11 +46,14 @@ const Footer: React.FC = () => {
       }
     } catch (error) {
       console.error("Error sending OTP:", error);
+    } finally {
+      setLoading(false);
     }
   };
 
   const handleOtpSubmit = async () => {
     try {
+      setLoading(true);
       const response = await axios.post(`${BASE_URL}/validate-otp`, {
         phone: `${countryCode}${phoneNumber}`,
         otp_session: otpSession,
@@ -67,6 +74,8 @@ const Footer: React.FC = () => {
       setStage("settings");
     } catch (error) {
       console.error("Error validating OTP:", error);
+    } finally {
+      setLoading(false);
     }
   };
 
@@ -84,6 +93,7 @@ const Footer: React.FC = () => {
     }
 
     try {
+      setLoading(true);
       const response = await axios.post(`${BASE_URL}/video`, formData, {
         headers: {
           "Content-Type": "multipart/form-data",
@@ -98,6 +108,8 @@ const Footer: React.FC = () => {
       setStage("videoDisplay");
     } catch (error) {
       console.error("Error submitting settings:", error);
+    } finally {
+      setLoading(false);
     }
   };
 
@@ -137,7 +149,9 @@ const Footer: React.FC = () => {
               value={phoneNumber}
               onChange={(e) => setPhoneNumber(e.target.value)}
             />
-            <button onClick={handlePhoneSubmit}>Send OTP</button>
+            <button onClick={handlePhoneSubmit} disabled={loading}>
+              Send OTP
+            </button>
           </>
         )}
         {stage === "otpInput" && (
@@ -155,7 +169,9 @@ const Footer: React.FC = () => {
               value={otpCode}
               onChange={(e) => setOtpCode(e.target.value)}
             />
-            <button onClick={handleOtpSubmit}>Validate OTP</button>
+            <button onClick={handleOtpSubmit} disabled={loading}>
+              Validate OTP
+            </button>
           </>
         )}
         {stage === "settings" && (
@@ -200,7 +216,9 @@ const Footer: React.FC = () => {
               <option value="classic">Classic (30 seconds)</option>
               <option value="full">Full</option>
             </select>
-            <button onClick={handleSettingsSubmit}>Submit</button>
+            <button onClick={handleSettingsSubmit} disabled={loading}>
+              Submit
+            </button>
           </>
         )}
         {stage === "videoDisplay" && (