lecture-manager 2.3.2__tar.gz → 2.3.3__tar.gz

{lecture_manager-2.3.2 → lecture_manager-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lecture-manager
-Version: 2.3.2
+Version: 2.3.3
 Summary: Unified media manager for YouTube lectures and Facebook content with terminal and web interface
 Home-page: https://github.com/blee-design/lecture-manager
 Author: Udaya Raj Joshi

{lecture_manager-2.3.2 → lecture_manager-2.3.3}/lecture_manager/__init__.py

@@ -6,4 +6,4 @@ YouTube Lecture Manager package.
 
 from .facebook_manager import add_facebook_entry, get_facebook_entry_by_id, list_facebook_entries, delete_facebook_entry
 
-__version__ = "2.3.2"
+__version__ = "2.3.3"

{lecture_manager-2.3.2 → lecture_manager-2.3.3}/lecture_manager/facebook.py

@@ -42,6 +42,7 @@ def _is_video_link(url):
         '/watch',
         '/reel/',
         '/share/r/',
+        '/share/v/',      # <-- Add this line
         '/videos/',
         '/video/',
     ]
@@ -51,25 +52,14 @@ def _is_video_link(url):
 def _download_video(url, custom_name=None):
     from .facebook_manager import add_facebook_entry
 
-    """
-    Download a single Facebook video/Reel.
-    After download, organise into ROOT_DIR/facebook/videos/ and add to DB.
-    """
-    # Ensure cookies.txt is fresh
     _ensure_cookie_file()
+    cookie_opt = {'cookiefile': 'cookies.txt'} if os.path.exists('cookies.txt') else {'cookiesfrombrowser': ('edge',)}
 
-    # Determine cookie option
-    if os.path.exists('cookies.txt'):
-        cookie_opt = {'cookiefile': 'cookies.txt'}
-    else:
-        cookie_opt = {'cookiesfrombrowser': ('edge',)}
-
-    # ---- Try to get metadata ----
+    # Fetch metadata
     title = None
     uploader = None
     description = None
     facebook_id = None
-
     ydl_opts_info = {
         'quiet': True,
         'no_warnings': True,
@@ -77,7 +67,6 @@ def _download_video(url, custom_name=None):
         'ignoreerrors': True,
         **cookie_opt
     }
-
     try:
         with yt_dlp.YoutubeDL(ydl_opts_info) as ydl:
             info = ydl.extract_info(url, download=False)
@@ -87,12 +76,11 @@ def _download_video(url, custom_name=None):
                 description = info.get('description')
                 if description:
                     description = description.split('\n')[0].strip()
-                # Try to get a stable ID
                 facebook_id = info.get('id') or _extract_facebook_id(url)
     except Exception as e:
         print_colored(f"[!] Could not fetch metadata: {e}", COLORS.YELLOW)
 
-    # ---- Determine filename ----
+    # Determine filename
     if custom_name:
         filename_base = custom_name
     elif title and title.lower() != 'video':
@@ -112,7 +100,7 @@ def _download_video(url, custom_name=None):
 
     print_colored(f"[i] Saving as: {filename_base}", COLORS.GREEN)
 
-    # ---- Download ----
+    # Download
     os.makedirs(DOWNLOAD_DIR, exist_ok=True)
     temp_filename = f"{filename_base}.%(ext)s"
     temp_path_pattern = os.path.join(DOWNLOAD_DIR, temp_filename)
@@ -130,13 +118,21 @@ def _download_video(url, custom_name=None):
         with yt_dlp.YoutubeDL(ydl_opts_download) as ydl:
             print_colored(f"[⏳] Downloading Facebook video...", COLORS.BLUE)
             ydl.download([url])
-        # Find the downloaded file
-        # yt-dlp may add extra extensions; we'll glob for the base name
-        downloaded_files = [f for f in os.listdir(DOWNLOAD_DIR) if f.startswith(filename_base)]
-        if not downloaded_files:
+
+        # ---- Improved file detection ----
+        import glob
+        pattern = os.path.join(DOWNLOAD_DIR, f"{filename_base}.*")
+        matches = glob.glob(pattern)
+        if not matches:
+            all_files = os.listdir(DOWNLOAD_DIR)
+            matches = [os.path.join(DOWNLOAD_DIR, f) for f in all_files
+                       if filename_base in f and f.lower().endswith(('.mp4', '.mkv', '.webm', '.avi', '.mov'))]
+        if not matches:
             print_colored("[!] Could not locate downloaded file.", COLORS.RED)
             return
-        temp_path = os.path.join(DOWNLOAD_DIR, downloaded_files[0])
+        if len(matches) > 1:
+            matches.sort(key=lambda p: os.path.getsize(p), reverse=True)
+        temp_path = matches[0]
         print_colored(f"[✓] Downloaded to {temp_path}", COLORS.GREEN)
 
         # ---- Compute MD5 and move to final directory ----
@@ -148,11 +144,13 @@ def _download_video(url, custom_name=None):
         os.makedirs(FACEBOOK_VIDEO_DIR, exist_ok=True)
         final_path = os.path.join(FACEBOOK_VIDEO_DIR, new_filename)
 
-        # Move to final location
+        # If final file already exists, remove it (replace)
+        if os.path.exists(final_path):
+            os.remove(final_path)
         shutil.move(temp_path, final_path)
         print_colored(f"[✓] File stored at: {final_path}", COLORS.BLUE)
 
-        # ---- Insert into database ----
+        # ---- Insert into database (upsert) ----
         if not facebook_id:
             facebook_id = _extract_facebook_id(url)
         entry_id = add_facebook_entry(

{lecture_manager-2.3.2 → lecture_manager-2.3.3}/lecture_manager/facebook_manager.py

@@ -14,6 +14,7 @@ from .db import get_connection
 from .file_sharing import _load_share_db, _save_share_db, SHARE_DIR
 
 
+
 FACEBOOK_VIDEO_DIR = os.path.join(ROOT_DIR, 'facebook', 'videos')
 FACEBOOK_PHOTO_DIR = os.path.join(ROOT_DIR, 'facebook', 'photos')
 TABLE_NAME = 'facebook_entries'
@@ -168,12 +169,21 @@ def _extract_facebook_id(url):
     # fallback: use the last part of the URL
     return url.rstrip('/').split('/')[-1]
 
+def _extract_facebook_id_from_url_or_id(identifier):
+    """If identifier is a URL, extract the Facebook ID; otherwise return as-is."""
+    if isinstance(identifier, str) and identifier.startswith('http'):
+        from .facebook import _extract_facebook_id
+        return _extract_facebook_id(identifier)
+    return identifier
+
 def add_facebook_lecture(url_or_id):
     """
     Handle adding a Facebook video or photo.
     Detects type, downloads, organises, and stores in DB.
     """
     from .facebook import _is_video_link, _download_video, _download_single_photo
+    from .youtube import _ensure_cookie_file
+    import yt_dlp
 
     print("\n" + "═" * 50)
     print_colored("  ADD FACEBOOK CONTENT", COLORS.CYAN, bold=True)
@@ -183,6 +193,54 @@ def add_facebook_lecture(url_or_id):
         print_colored("[!] Please provide a full Facebook URL.", COLORS.RED)
         return
 
+    # ---- Resolve to canonical ID using yt-dlp ----
+        # ---- Resolve to canonical ID using yt-dlp ----
+    facebook_id = None
+    try:
+        _ensure_cookie_file()
+        ydl_opts = {
+            'quiet': True,
+            'extract_flat': False,   # get full info, not just metadata
+            'ignoreerrors': True,
+            'cookiefile': 'cookies.txt' if os.path.exists('cookies.txt') else None,
+        }
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            info = ydl.extract_info(url_or_id, download=False)
+            if info and isinstance(info, dict):
+                # Try multiple possible fields
+                facebook_id = info.get('id') or info.get('display_id') or info.get('webpage_url_basename')
+                if not facebook_id:
+                    # Some Facebook videos have ID in 'url' or 'original_url'
+                    if info.get('url'):
+                        import re
+                        match = re.search(r'facebook\.com/watch/?\?v=(\d+)', info['url'])
+                        if match:
+                            facebook_id = match.group(1)
+    except Exception as e:
+        print_colored(f"[!] Could not resolve URL: {e}", COLORS.YELLOW)
+
+    # ---- Fallback to old extraction method ----
+    if not facebook_id:
+        from .facebook import _extract_facebook_id
+        facebook_id = _extract_facebook_id(url_or_id)
+
+    if not facebook_id:
+        print_colored("[!] Could not extract a valid Facebook ID from the URL.", COLORS.RED)
+        return
+
+    # ---- Check if this Facebook ID already exists ----
+    existing = get_facebook_entry_by_id(facebook_id)
+    if existing:
+        print_colored(f"[!] Facebook ID {facebook_id} already exists in the database.", COLORS.YELLOW)
+        print_colored(f"   Title: {existing.get('title', 'Unknown')}", COLORS.BLUE)
+        print_colored(f"   Type: {existing.get('type', 'Unknown')}", COLORS.BLUE)
+        print_colored(f"   ID: {existing.get('id', 'Unknown')}", COLORS.BLUE)
+        overwrite = input(color_text("Download and overwrite? (y/n): ", COLORS.MAGENTA)).strip().lower()
+        if overwrite != 'y':
+            print_colored("Cancelled.", COLORS.YELLOW)
+            return
+        print_colored("[i] Overwriting existing entry...", COLORS.BLUE)
+
     custom_name = input(color_text("Enter a custom name (or press Enter to auto-detect): ", COLORS.MAGENTA)).strip()
     if not custom_name:
         custom_name = None
@@ -199,8 +257,9 @@ def add_facebook_lecture(url_or_id):
 
 def add_facebook_entry(facebook_id, entry_type, title, uploader, url, file_hash=None, original_filename=None, notes=None):
     """
-    Insert a new Facebook entry into the database.
-    Returns the inserted ID or None on error.
+    Insert or update a Facebook entry in the database.
+    If facebook_id already exists, update the record with new values.
+    Returns the inserted/updated ID or None on error.
     """
     conn = get_connection()
     cursor = conn.cursor()
@@ -209,6 +268,15 @@ def add_facebook_entry(facebook_id, entry_type, title, uploader, url, file_hash=
             INSERT INTO {TABLE_NAME}
             (facebook_id, type, title, uploader, url, file_hash, original_filename, notes)
             VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
+            ON DUPLICATE KEY UPDATE
+                type = VALUES(type),
+                title = VALUES(title),
+                uploader = VALUES(uploader),
+                url = VALUES(url),
+                file_hash = VALUES(file_hash),
+                original_filename = VALUES(original_filename),
+                notes = VALUES(notes),
+                download_date = NOW()
         """, (facebook_id, entry_type, title, uploader, url, file_hash, original_filename, notes))
         conn.commit()
         inserted_id = cursor.lastrowid
@@ -216,7 +284,7 @@ def add_facebook_entry(facebook_id, entry_type, title, uploader, url, file_hash=
         conn.close()
         return inserted_id
     except Exception as e:
-        print_colored(f"[!] Failed to insert Facebook entry: {e}", COLORS.RED)
+        print_colored(f"[!] Failed to insert/update Facebook entry: {e}", COLORS.RED)
         cursor.close()
         conn.close()
         return None
@@ -228,10 +296,10 @@ def get_facebook_entry_by_id(identifier):
     """
     conn = get_connection()
     cursor = conn.cursor(dictionary=True)
-    # Try by facebook_id, then id, then file_hash
+    # Use CAST to avoid implicit integer conversion
     sql = f"""
         SELECT * FROM {TABLE_NAME}
-        WHERE facebook_id = %s OR id = %s OR file_hash = %s
+        WHERE facebook_id = %s OR CAST(id AS CHAR) = %s OR file_hash = %s
     """
     cursor.execute(sql, (identifier, identifier, identifier))
     row = cursor.fetchone()
@@ -356,6 +424,7 @@ def export_facebook_csv():
 def export_facebook_json():
     """Export all Facebook entries to a JSON file."""
     import json
+    from datetime import datetime
     conn = get_connection()
     cursor = conn.cursor(dictionary=True)
     cursor.execute("SELECT * FROM facebook_entries ORDER BY download_date DESC")
@@ -370,6 +439,11 @@ def export_facebook_json():
         filename = "facebook_export.json"
     if not filename.endswith('.json'):
         filename += '.json'
+    # Convert datetime objects to strings
+    for row in rows:
+        for key, value in row.items():
+            if isinstance(value, datetime):
+                row[key] = value.isoformat()
     try:
         with open(filename, 'w', encoding='utf-8') as f:
             json.dump(rows, f, indent=2, ensure_ascii=False)

{lecture_manager-2.3.2 → lecture_manager-2.3.3}/lecture_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lecture-manager
-Version: 2.3.2
+Version: 2.3.3
 Summary: Unified media manager for YouTube lectures and Facebook content with terminal and web interface
 Home-page: https://github.com/blee-design/lecture-manager
 Author: Udaya Raj Joshi

{lecture_manager-2.3.2 → lecture_manager-2.3.3}/setup.py

@@ -36,7 +36,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="lecture-manager",
-    version="2.3.2",                     # Hardcoded (no import from package)
+    version = "2.3.3",                     # Hardcoded (no import from package)
     description="Unified media manager for YouTube lectures and Facebook content with terminal and web interface",
     long_description=long_description,
     long_description_content_type="text/markdown",