From 64bd8b4b2dd8b22ed414e5292217beb83666fd24 Mon Sep 17 00:00:00 2001 From: afkarxyz Date: Sun, 5 Oct 2025 19:58:57 +0700 Subject: [PATCH] v3.7 --- TwitterXMediaBatchDownloader_Linux.py | 392 ++++++++++++++++++----- TwitterXMediaBatchDownloader_Mac.py | 392 ++++++++++++++++++----- TwitterXMediaBatchDownloader_Windows.py | 395 +++++++++++++++++++----- icons/database-export.svg | 1 + icons/database-import.svg | 1 + icons/download.svg | 1 + {Archived => icons}/icon.icns | Bin icons/icon.ico | Bin 0 -> 176786 bytes {Archived => icons}/icon.svg | 0 icons/reload.svg | 1 + icons/trash.svg | 1 + 11 files changed, 959 insertions(+), 225 deletions(-) create mode 100644 icons/database-export.svg create mode 100644 icons/database-import.svg create mode 100644 icons/download.svg rename {Archived => icons}/icon.icns (100%) create mode 100644 icons/icon.ico rename {Archived => icons}/icon.svg (100%) create mode 100644 icons/reload.svg create mode 100644 icons/trash.svg diff --git a/TwitterXMediaBatchDownloader_Linux.py b/TwitterXMediaBatchDownloader_Linux.py index f5ac357..d572973 100644 --- a/TwitterXMediaBatchDownloader_Linux.py +++ b/TwitterXMediaBatchDownloader_Linux.py @@ -14,11 +14,12 @@ from dataclasses import dataclass from PyQt6.QtWidgets import ( QApplication, QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLineEdit, QLabel, QFileDialog, QListWidget, QTextEdit, QTabWidget, QAbstractItemView, QProgressBar, QCheckBox, QDialog, - QDialogButtonBox, QComboBox, QListWidgetItem + QDialogButtonBox, QComboBox, QListWidgetItem, QMessageBox ) from PyQt6.QtCore import Qt, QThread, pyqtSignal, QUrl, QTimer, QTime, QSettings, QSize from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest from PyQt6.QtGui import QIcon, QTextCursor, QDesktopServices, QPixmap, QPainter, QPainterPath +from PyQt6.QtSvg import QSvgRenderer from getMetadata import get_metadata @dataclass @@ -351,9 +352,9 @@ class UpdateDialog(QDialog): class TwitterMediaDownloaderGUI(QWidget): def __init__(self): super().__init__() - self.current_version = "3.6" + self.current_version = "3.7" self.accounts = [] - self.temp_dir = os.path.join(tempfile.gettempdir(), "twitterxmediabatchdownloader") + self.temp_dir = os.path.join(Path.home(), ".twitterxmediabatchdownloader") os.makedirs(self.temp_dir, exist_ok=True) self.reset_state() @@ -471,7 +472,7 @@ class TwitterMediaDownloaderGUI(QWidget): self.setMinimumWidth(670) self.setMinimumHeight(350) - icon_path = os.path.join(os.path.dirname(__file__), "icon.svg") + icon_path = os.path.join(os.path.dirname(__file__), "icons", "icon.svg") if os.path.exists(icon_path): self.setWindowIcon(QIcon(icon_path)) @@ -557,25 +558,52 @@ class TwitterMediaDownloaderGUI(QWidget): def setup_account_buttons(self): self.btn_layout = QHBoxLayout() - self.download_selected_btn = QPushButton('Download Selected') - self.update_selected_btn = QPushButton('Update Selected') - self.remove_btn = QPushButton('Remove Selected') - self.clear_btn = QPushButton('Clear') + self.import_btn = QPushButton(' Import') + self.export_btn = QPushButton(' Export') + self.download_selected_btn = QPushButton(' Download') + self.update_selected_btn = QPushButton(' Update') + self.delete_btn = QPushButton(' Delete') - for btn in [self.download_selected_btn, self.update_selected_btn, self.remove_btn, self.clear_btn]: - btn.setMinimumWidth(120) + icon_dir = os.path.join(os.path.dirname(__file__), 'icons') + icon_color = self.palette().color(self.palette().ColorRole.ButtonText).name() + + self.import_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-import.svg'), icon_color)) + self.export_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-export.svg'), icon_color)) + self.download_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'download.svg'), icon_color)) + self.update_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'reload.svg'), icon_color)) + self.delete_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'trash.svg'), icon_color)) + + for btn in [self.import_btn, self.export_btn, self.download_selected_btn, + self.update_selected_btn, self.delete_btn]: + btn.setMinimumWidth(100) btn.setCursor(Qt.CursorShape.PointingHandCursor) + btn.setIconSize(QSize(18, 18)) + self.import_btn.clicked.connect(self.import_accounts) + self.export_btn.clicked.connect(self.export_accounts) self.download_selected_btn.clicked.connect(self.download_selected) self.update_selected_btn.clicked.connect(self.update_selected) - self.remove_btn.clicked.connect(self.remove_selected_accounts) - self.clear_btn.clicked.connect(self.clear_accounts) + self.delete_btn.clicked.connect(self.delete_accounts) self.btn_layout.addStretch() - for btn in [self.download_selected_btn, self.update_selected_btn, self.remove_btn, self.clear_btn]: + for btn in [self.import_btn, self.export_btn, self.download_selected_btn, + self.update_selected_btn, self.delete_btn]: self.btn_layout.addWidget(btn, 1) self.btn_layout.addStretch() + def update_button_icons(self): + if not hasattr(self, 'import_btn'): + return + + icon_dir = os.path.join(os.path.dirname(__file__), 'icons') + icon_color = self.palette().color(self.palette().ColorRole.ButtonText).name() + + self.import_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-import.svg'), icon_color)) + self.export_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-export.svg'), icon_color)) + self.download_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'download.svg'), icon_color)) + self.update_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'reload.svg'), icon_color)) + self.delete_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'trash.svg'), icon_color)) + def setup_process_tab(self): self.process_tab = QWidget() process_layout = QVBoxLayout() @@ -906,7 +934,7 @@ class TwitterMediaDownloaderGUI(QWidget): about_layout.addWidget(section_widget) - footer_label = QLabel(f"v{self.current_version} | gallery-dl v1.30.6 | September 2025") + footer_label = QLabel(f"v{self.current_version} | gallery-dl v1.30.9 | October 2025") about_layout.addWidget(footer_label, alignment=Qt.AlignmentFlag.AlignCenter) about_tab.setLayout(about_layout) @@ -1822,6 +1850,23 @@ class TwitterMediaDownloaderGUI(QWidget): self.update_button_states() + def create_colored_icon(self, svg_path, color): + with open(svg_path, 'r', encoding='utf-8') as f: + svg_content = f.read() + + svg_content = svg_content.replace('stroke="currentColor"', f'stroke="{color}"') + svg_content = svg_content.replace('fill="currentColor"', f'fill="{color}"') + + pixmap = QPixmap(24, 24) + pixmap.fill(Qt.GlobalColor.transparent) + + renderer = QSvgRenderer(svg_content.encode('utf-8')) + painter = QPainter(pixmap) + renderer.render(painter) + painter.end() + + return QIcon(pixmap) + def create_placeholder_icon(self, size=48): pixmap = QPixmap(size, size) pixmap.fill(Qt.GlobalColor.transparent) @@ -1907,34 +1952,46 @@ class TwitterMediaDownloaderGUI(QWidget): has_selected = len(self.account_list.selectedItems()) > 0 - self.download_selected_btn.setEnabled(has_accounts and has_selected) - self.update_selected_btn.setEnabled(has_accounts and has_selected) - self.remove_btn.setEnabled(has_accounts and has_selected) - self.clear_btn.setEnabled(has_accounts) + self.import_btn.setEnabled(True) + self.export_btn.setEnabled(has_accounts) + self.download_selected_btn.setEnabled(has_accounts) + self.update_selected_btn.setEnabled(has_accounts) + self.delete_btn.setEnabled(has_accounts) - if has_accounts: - self.download_selected_btn.show() - self.update_selected_btn.show() - self.remove_btn.show() - self.clear_btn.show() - else: - self.hide_account_buttons() + self.import_btn.show() + self.export_btn.show() + self.download_selected_btn.show() + self.update_selected_btn.show() + self.delete_btn.show() def hide_account_buttons(self): - buttons = [ - self.download_selected_btn, - self.update_selected_btn, - self.remove_btn, - self.clear_btn - ] - for btn in buttons: - btn.hide() + self.import_btn.setEnabled(True) + self.export_btn.setEnabled(False) + self.download_selected_btn.setEnabled(False) + self.update_selected_btn.setEnabled(False) + self.delete_btn.setEnabled(False) + + self.import_btn.show() + self.export_btn.show() + self.download_selected_btn.show() + self.update_selected_btn.show() + self.delete_btn.show() def download_selected(self): selected_items = self.account_list.selectedItems() + if not selected_items: - self.log_output.append('Warning: Please select accounts to download.') + reply = QMessageBox.question( + self, + 'Confirm Download All', + f'No accounts selected. Download all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.Yes: + self.download_accounts(list(range(len(self.accounts)))) return + self.download_accounts([self.account_list.row(item) for item in selected_items]) def download_all(self): @@ -1942,15 +1999,24 @@ class TwitterMediaDownloaderGUI(QWidget): def update_selected(self): selected_items = self.account_list.selectedItems() - if not selected_items: - self.log_output.append('Warning: Please select accounts to update.') - return - selected_accounts = [] - for item in selected_items: - index = self.account_list.row(item) - if index < len(self.accounts): - selected_accounts.append(self.accounts[index]) + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Update All', + f'No accounts selected. Update all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + selected_accounts = self.accounts.copy() + else: + selected_accounts = [] + for item in selected_items: + index = self.account_list.row(item) + if index < len(self.accounts): + selected_accounts.append(self.accounts[index]) if not selected_accounts: return @@ -2197,45 +2263,221 @@ class TwitterMediaDownloaderGUI(QWidget): self.worker.pause() self.pause_resume_btn.setText('Resume') - def remove_selected_accounts(self): - selected_indices = sorted([self.account_list.row(item) for item in self.account_list.selectedItems()], reverse=True) + def delete_accounts(self): + selected_items = self.account_list.selectedItems() - if not selected_indices: + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Delete All', + f'No accounts selected. Delete all {len(self.accounts)} account(s) and their cache files?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + + for account in self.accounts: + username = account.username + if username: + for is_batch in [True, False]: + cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) + try: + if os.path.exists(cache_file): + os.remove(cache_file) + self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') + except Exception as e: + self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') + + self.reset_state() + self.reset_ui() + self.tab_widget.setCurrentIndex(0) + else: + reply = QMessageBox.question( + self, + 'Confirm Delete', + f'Delete {len(selected_items)} selected account(s) and their cache files?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + + selected_indices = sorted([self.account_list.row(item) for item in selected_items], reverse=True) + + for index in selected_indices: + account = self.accounts[index] + username = account.username + if username: + for is_batch in [True, False]: + cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) + try: + if os.path.exists(cache_file): + os.remove(cache_file) + self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') + except Exception as e: + self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') + + self.accounts.pop(index) + + self.update_account_list() + self.update_button_states() + + def export_accounts(self): + self.tab_widget.setCurrentIndex(1) + + selected_items = self.account_list.selectedItems() + + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Export All', + f'No accounts selected. Export all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + self.log_output.append('Export cancelled') + return + selected_accounts = self.accounts.copy() + else: + selected_accounts = [] + for item in selected_items: + row = self.account_list.row(item) + if 0 <= row < len(self.accounts): + selected_accounts.append(self.accounts[row]) + + if not selected_accounts: + self.log_output.append('No valid accounts found for export') return - for index in selected_indices: - account = self.accounts[index] - username = account.username - if username: - for is_batch in [True, False]: - cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) - try: - if os.path.exists(cache_file): - os.remove(cache_file) - self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') - except Exception as e: - self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') - - self.accounts.pop(index) + export_dir = QFileDialog.getExistingDirectory(self, "Select Export Directory", self.last_output_path) + if not export_dir: + self.log_output.append('Export cancelled') + return + + self.log_output.append(f'Starting export of {len(selected_accounts)} account(s)...') + exported_count = 0 + + for account in selected_accounts: + try: + now = datetime.now() + date_str = now.strftime("%Y%m%d_%H%M%S") + + if account.fetch_mode == 'batch': + filename = f"{account.username}_batch_{date_str}.json" + else: + filename = f"{account.username}_{date_str}.json" + + filepath = os.path.join(export_dir, filename) + + export_data = { + 'username': account.username, + 'nick': account.nick, + 'followers': account.followers, + 'following': account.following, + 'posts': account.posts, + 'media_type': account.media_type, + 'profile_image': account.profile_image, + 'media_list': account.media_list, + 'fetch_mode': account.fetch_mode, + 'fetch_timestamp': account.fetch_timestamp, + 'export_timestamp': now.isoformat() + } + + with open(filepath, 'w', encoding='utf-8') as f: + json.dump(export_data, f, indent=2, ensure_ascii=False) + + exported_count += 1 + self.log_output.append(f'Exported: {filename}') + + except Exception as e: + self.log_output.append(f'Error exporting {account.username}: {str(e)}') + + self.log_output.append(f'Export completed: {exported_count}/{len(selected_accounts)} account(s) exported') + self.log_output.append(f'Export location: {export_dir}') + + def import_accounts(self): + self.tab_widget.setCurrentIndex(1) + + file_paths, _ = QFileDialog.getOpenFileNames( + self, + "Select JSON Files to Import", + self.last_output_path, + "JSON Files (*.json)" + ) + + if not file_paths: + self.log_output.append('Import cancelled') + return + + self.log_output.append(f'Starting import of {len(file_paths)} file(s)...') + imported_count = 0 + skipped_count = 0 + error_count = 0 + + for filepath in file_paths: + try: + with open(filepath, 'r', encoding='utf-8') as f: + data = json.load(f) + + username = data.get('username') + if not username: + self.log_output.append(f'Skipped {os.path.basename(filepath)}: No username found') + skipped_count += 1 + continue + + existing_account = next((acc for acc in self.accounts if acc.username == username), None) + if existing_account: + self.log_output.append(f'Skipped {username}: Already exists in dashboard') + skipped_count += 1 + continue + + account = Account( + username=username, + nick=data.get('nick', ''), + followers=data.get('followers', 0), + following=data.get('following', 0), + posts=data.get('posts', 0), + media_type=data.get('media_type', 'all'), + profile_image=data.get('profile_image'), + media_list=data.get('media_list', []), + fetch_mode=data.get('fetch_mode', 'all'), + fetch_timestamp=data.get('fetch_timestamp') + ) + + self.accounts.append(account) + + account_info = { + 'followers_count': account.followers, + 'friends_count': account.following, + 'statuses_count': account.posts, + 'nick': account.nick, + 'name': account.nick, + 'profile_image': account.profile_image + } + + cache_data = { + 'account_info': account_info, + 'timeline': account.media_list, + 'metadata': {}, + 'is_batch': (account.fetch_mode == 'batch'), + 'fetch_timestamp': account.fetch_timestamp + } + + self.save_cached_data(username, account.media_type, cache_data, is_batch=(account.fetch_mode == 'batch')) + + imported_count += 1 + media_count = len(account.media_list) if account.media_list else 0 + self.log_output.append(f'Imported: {username} ({media_count:,} media)') + + except Exception as e: + self.log_output.append(f'Error importing {os.path.basename(filepath)}: {str(e)}') + error_count += 1 self.update_account_list() self.update_button_states() - - def clear_accounts(self): - for account in self.accounts: - username = account.username - if username: - for is_batch in [True, False]: - cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) - try: - if os.path.exists(cache_file): - os.remove(cache_file) - self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') - except Exception as e: - self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') - - self.reset_state() - self.reset_ui() + self.log_output.append(f'Import completed: {imported_count} imported, {skipped_count} skipped, {error_count} errors') self.tab_widget.setCurrentIndex(0) diff --git a/TwitterXMediaBatchDownloader_Mac.py b/TwitterXMediaBatchDownloader_Mac.py index f5ac357..d572973 100644 --- a/TwitterXMediaBatchDownloader_Mac.py +++ b/TwitterXMediaBatchDownloader_Mac.py @@ -14,11 +14,12 @@ from dataclasses import dataclass from PyQt6.QtWidgets import ( QApplication, QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLineEdit, QLabel, QFileDialog, QListWidget, QTextEdit, QTabWidget, QAbstractItemView, QProgressBar, QCheckBox, QDialog, - QDialogButtonBox, QComboBox, QListWidgetItem + QDialogButtonBox, QComboBox, QListWidgetItem, QMessageBox ) from PyQt6.QtCore import Qt, QThread, pyqtSignal, QUrl, QTimer, QTime, QSettings, QSize from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest from PyQt6.QtGui import QIcon, QTextCursor, QDesktopServices, QPixmap, QPainter, QPainterPath +from PyQt6.QtSvg import QSvgRenderer from getMetadata import get_metadata @dataclass @@ -351,9 +352,9 @@ class UpdateDialog(QDialog): class TwitterMediaDownloaderGUI(QWidget): def __init__(self): super().__init__() - self.current_version = "3.6" + self.current_version = "3.7" self.accounts = [] - self.temp_dir = os.path.join(tempfile.gettempdir(), "twitterxmediabatchdownloader") + self.temp_dir = os.path.join(Path.home(), ".twitterxmediabatchdownloader") os.makedirs(self.temp_dir, exist_ok=True) self.reset_state() @@ -471,7 +472,7 @@ class TwitterMediaDownloaderGUI(QWidget): self.setMinimumWidth(670) self.setMinimumHeight(350) - icon_path = os.path.join(os.path.dirname(__file__), "icon.svg") + icon_path = os.path.join(os.path.dirname(__file__), "icons", "icon.svg") if os.path.exists(icon_path): self.setWindowIcon(QIcon(icon_path)) @@ -557,25 +558,52 @@ class TwitterMediaDownloaderGUI(QWidget): def setup_account_buttons(self): self.btn_layout = QHBoxLayout() - self.download_selected_btn = QPushButton('Download Selected') - self.update_selected_btn = QPushButton('Update Selected') - self.remove_btn = QPushButton('Remove Selected') - self.clear_btn = QPushButton('Clear') + self.import_btn = QPushButton(' Import') + self.export_btn = QPushButton(' Export') + self.download_selected_btn = QPushButton(' Download') + self.update_selected_btn = QPushButton(' Update') + self.delete_btn = QPushButton(' Delete') - for btn in [self.download_selected_btn, self.update_selected_btn, self.remove_btn, self.clear_btn]: - btn.setMinimumWidth(120) + icon_dir = os.path.join(os.path.dirname(__file__), 'icons') + icon_color = self.palette().color(self.palette().ColorRole.ButtonText).name() + + self.import_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-import.svg'), icon_color)) + self.export_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-export.svg'), icon_color)) + self.download_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'download.svg'), icon_color)) + self.update_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'reload.svg'), icon_color)) + self.delete_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'trash.svg'), icon_color)) + + for btn in [self.import_btn, self.export_btn, self.download_selected_btn, + self.update_selected_btn, self.delete_btn]: + btn.setMinimumWidth(100) btn.setCursor(Qt.CursorShape.PointingHandCursor) + btn.setIconSize(QSize(18, 18)) + self.import_btn.clicked.connect(self.import_accounts) + self.export_btn.clicked.connect(self.export_accounts) self.download_selected_btn.clicked.connect(self.download_selected) self.update_selected_btn.clicked.connect(self.update_selected) - self.remove_btn.clicked.connect(self.remove_selected_accounts) - self.clear_btn.clicked.connect(self.clear_accounts) + self.delete_btn.clicked.connect(self.delete_accounts) self.btn_layout.addStretch() - for btn in [self.download_selected_btn, self.update_selected_btn, self.remove_btn, self.clear_btn]: + for btn in [self.import_btn, self.export_btn, self.download_selected_btn, + self.update_selected_btn, self.delete_btn]: self.btn_layout.addWidget(btn, 1) self.btn_layout.addStretch() + def update_button_icons(self): + if not hasattr(self, 'import_btn'): + return + + icon_dir = os.path.join(os.path.dirname(__file__), 'icons') + icon_color = self.palette().color(self.palette().ColorRole.ButtonText).name() + + self.import_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-import.svg'), icon_color)) + self.export_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-export.svg'), icon_color)) + self.download_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'download.svg'), icon_color)) + self.update_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'reload.svg'), icon_color)) + self.delete_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'trash.svg'), icon_color)) + def setup_process_tab(self): self.process_tab = QWidget() process_layout = QVBoxLayout() @@ -906,7 +934,7 @@ class TwitterMediaDownloaderGUI(QWidget): about_layout.addWidget(section_widget) - footer_label = QLabel(f"v{self.current_version} | gallery-dl v1.30.6 | September 2025") + footer_label = QLabel(f"v{self.current_version} | gallery-dl v1.30.9 | October 2025") about_layout.addWidget(footer_label, alignment=Qt.AlignmentFlag.AlignCenter) about_tab.setLayout(about_layout) @@ -1822,6 +1850,23 @@ class TwitterMediaDownloaderGUI(QWidget): self.update_button_states() + def create_colored_icon(self, svg_path, color): + with open(svg_path, 'r', encoding='utf-8') as f: + svg_content = f.read() + + svg_content = svg_content.replace('stroke="currentColor"', f'stroke="{color}"') + svg_content = svg_content.replace('fill="currentColor"', f'fill="{color}"') + + pixmap = QPixmap(24, 24) + pixmap.fill(Qt.GlobalColor.transparent) + + renderer = QSvgRenderer(svg_content.encode('utf-8')) + painter = QPainter(pixmap) + renderer.render(painter) + painter.end() + + return QIcon(pixmap) + def create_placeholder_icon(self, size=48): pixmap = QPixmap(size, size) pixmap.fill(Qt.GlobalColor.transparent) @@ -1907,34 +1952,46 @@ class TwitterMediaDownloaderGUI(QWidget): has_selected = len(self.account_list.selectedItems()) > 0 - self.download_selected_btn.setEnabled(has_accounts and has_selected) - self.update_selected_btn.setEnabled(has_accounts and has_selected) - self.remove_btn.setEnabled(has_accounts and has_selected) - self.clear_btn.setEnabled(has_accounts) + self.import_btn.setEnabled(True) + self.export_btn.setEnabled(has_accounts) + self.download_selected_btn.setEnabled(has_accounts) + self.update_selected_btn.setEnabled(has_accounts) + self.delete_btn.setEnabled(has_accounts) - if has_accounts: - self.download_selected_btn.show() - self.update_selected_btn.show() - self.remove_btn.show() - self.clear_btn.show() - else: - self.hide_account_buttons() + self.import_btn.show() + self.export_btn.show() + self.download_selected_btn.show() + self.update_selected_btn.show() + self.delete_btn.show() def hide_account_buttons(self): - buttons = [ - self.download_selected_btn, - self.update_selected_btn, - self.remove_btn, - self.clear_btn - ] - for btn in buttons: - btn.hide() + self.import_btn.setEnabled(True) + self.export_btn.setEnabled(False) + self.download_selected_btn.setEnabled(False) + self.update_selected_btn.setEnabled(False) + self.delete_btn.setEnabled(False) + + self.import_btn.show() + self.export_btn.show() + self.download_selected_btn.show() + self.update_selected_btn.show() + self.delete_btn.show() def download_selected(self): selected_items = self.account_list.selectedItems() + if not selected_items: - self.log_output.append('Warning: Please select accounts to download.') + reply = QMessageBox.question( + self, + 'Confirm Download All', + f'No accounts selected. Download all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.Yes: + self.download_accounts(list(range(len(self.accounts)))) return + self.download_accounts([self.account_list.row(item) for item in selected_items]) def download_all(self): @@ -1942,15 +1999,24 @@ class TwitterMediaDownloaderGUI(QWidget): def update_selected(self): selected_items = self.account_list.selectedItems() - if not selected_items: - self.log_output.append('Warning: Please select accounts to update.') - return - selected_accounts = [] - for item in selected_items: - index = self.account_list.row(item) - if index < len(self.accounts): - selected_accounts.append(self.accounts[index]) + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Update All', + f'No accounts selected. Update all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + selected_accounts = self.accounts.copy() + else: + selected_accounts = [] + for item in selected_items: + index = self.account_list.row(item) + if index < len(self.accounts): + selected_accounts.append(self.accounts[index]) if not selected_accounts: return @@ -2197,45 +2263,221 @@ class TwitterMediaDownloaderGUI(QWidget): self.worker.pause() self.pause_resume_btn.setText('Resume') - def remove_selected_accounts(self): - selected_indices = sorted([self.account_list.row(item) for item in self.account_list.selectedItems()], reverse=True) + def delete_accounts(self): + selected_items = self.account_list.selectedItems() - if not selected_indices: + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Delete All', + f'No accounts selected. Delete all {len(self.accounts)} account(s) and their cache files?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + + for account in self.accounts: + username = account.username + if username: + for is_batch in [True, False]: + cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) + try: + if os.path.exists(cache_file): + os.remove(cache_file) + self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') + except Exception as e: + self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') + + self.reset_state() + self.reset_ui() + self.tab_widget.setCurrentIndex(0) + else: + reply = QMessageBox.question( + self, + 'Confirm Delete', + f'Delete {len(selected_items)} selected account(s) and their cache files?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + + selected_indices = sorted([self.account_list.row(item) for item in selected_items], reverse=True) + + for index in selected_indices: + account = self.accounts[index] + username = account.username + if username: + for is_batch in [True, False]: + cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) + try: + if os.path.exists(cache_file): + os.remove(cache_file) + self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') + except Exception as e: + self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') + + self.accounts.pop(index) + + self.update_account_list() + self.update_button_states() + + def export_accounts(self): + self.tab_widget.setCurrentIndex(1) + + selected_items = self.account_list.selectedItems() + + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Export All', + f'No accounts selected. Export all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + self.log_output.append('Export cancelled') + return + selected_accounts = self.accounts.copy() + else: + selected_accounts = [] + for item in selected_items: + row = self.account_list.row(item) + if 0 <= row < len(self.accounts): + selected_accounts.append(self.accounts[row]) + + if not selected_accounts: + self.log_output.append('No valid accounts found for export') return - for index in selected_indices: - account = self.accounts[index] - username = account.username - if username: - for is_batch in [True, False]: - cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) - try: - if os.path.exists(cache_file): - os.remove(cache_file) - self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') - except Exception as e: - self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') - - self.accounts.pop(index) + export_dir = QFileDialog.getExistingDirectory(self, "Select Export Directory", self.last_output_path) + if not export_dir: + self.log_output.append('Export cancelled') + return + + self.log_output.append(f'Starting export of {len(selected_accounts)} account(s)...') + exported_count = 0 + + for account in selected_accounts: + try: + now = datetime.now() + date_str = now.strftime("%Y%m%d_%H%M%S") + + if account.fetch_mode == 'batch': + filename = f"{account.username}_batch_{date_str}.json" + else: + filename = f"{account.username}_{date_str}.json" + + filepath = os.path.join(export_dir, filename) + + export_data = { + 'username': account.username, + 'nick': account.nick, + 'followers': account.followers, + 'following': account.following, + 'posts': account.posts, + 'media_type': account.media_type, + 'profile_image': account.profile_image, + 'media_list': account.media_list, + 'fetch_mode': account.fetch_mode, + 'fetch_timestamp': account.fetch_timestamp, + 'export_timestamp': now.isoformat() + } + + with open(filepath, 'w', encoding='utf-8') as f: + json.dump(export_data, f, indent=2, ensure_ascii=False) + + exported_count += 1 + self.log_output.append(f'Exported: {filename}') + + except Exception as e: + self.log_output.append(f'Error exporting {account.username}: {str(e)}') + + self.log_output.append(f'Export completed: {exported_count}/{len(selected_accounts)} account(s) exported') + self.log_output.append(f'Export location: {export_dir}') + + def import_accounts(self): + self.tab_widget.setCurrentIndex(1) + + file_paths, _ = QFileDialog.getOpenFileNames( + self, + "Select JSON Files to Import", + self.last_output_path, + "JSON Files (*.json)" + ) + + if not file_paths: + self.log_output.append('Import cancelled') + return + + self.log_output.append(f'Starting import of {len(file_paths)} file(s)...') + imported_count = 0 + skipped_count = 0 + error_count = 0 + + for filepath in file_paths: + try: + with open(filepath, 'r', encoding='utf-8') as f: + data = json.load(f) + + username = data.get('username') + if not username: + self.log_output.append(f'Skipped {os.path.basename(filepath)}: No username found') + skipped_count += 1 + continue + + existing_account = next((acc for acc in self.accounts if acc.username == username), None) + if existing_account: + self.log_output.append(f'Skipped {username}: Already exists in dashboard') + skipped_count += 1 + continue + + account = Account( + username=username, + nick=data.get('nick', ''), + followers=data.get('followers', 0), + following=data.get('following', 0), + posts=data.get('posts', 0), + media_type=data.get('media_type', 'all'), + profile_image=data.get('profile_image'), + media_list=data.get('media_list', []), + fetch_mode=data.get('fetch_mode', 'all'), + fetch_timestamp=data.get('fetch_timestamp') + ) + + self.accounts.append(account) + + account_info = { + 'followers_count': account.followers, + 'friends_count': account.following, + 'statuses_count': account.posts, + 'nick': account.nick, + 'name': account.nick, + 'profile_image': account.profile_image + } + + cache_data = { + 'account_info': account_info, + 'timeline': account.media_list, + 'metadata': {}, + 'is_batch': (account.fetch_mode == 'batch'), + 'fetch_timestamp': account.fetch_timestamp + } + + self.save_cached_data(username, account.media_type, cache_data, is_batch=(account.fetch_mode == 'batch')) + + imported_count += 1 + media_count = len(account.media_list) if account.media_list else 0 + self.log_output.append(f'Imported: {username} ({media_count:,} media)') + + except Exception as e: + self.log_output.append(f'Error importing {os.path.basename(filepath)}: {str(e)}') + error_count += 1 self.update_account_list() self.update_button_states() - - def clear_accounts(self): - for account in self.accounts: - username = account.username - if username: - for is_batch in [True, False]: - cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) - try: - if os.path.exists(cache_file): - os.remove(cache_file) - self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') - except Exception as e: - self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') - - self.reset_state() - self.reset_ui() + self.log_output.append(f'Import completed: {imported_count} imported, {skipped_count} skipped, {error_count} errors') self.tab_widget.setCurrentIndex(0) diff --git a/TwitterXMediaBatchDownloader_Windows.py b/TwitterXMediaBatchDownloader_Windows.py index 82952d1..17c1f5b 100644 --- a/TwitterXMediaBatchDownloader_Windows.py +++ b/TwitterXMediaBatchDownloader_Windows.py @@ -15,11 +15,12 @@ import qdarktheme from PyQt6.QtWidgets import ( QApplication, QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLineEdit, QLabel, QFileDialog, QListWidget, QTextEdit, QTabWidget, QAbstractItemView, QProgressBar, QCheckBox, QDialog, - QDialogButtonBox, QComboBox, QListWidgetItem + QDialogButtonBox, QComboBox, QListWidgetItem, QMessageBox ) from PyQt6.QtCore import Qt, QThread, pyqtSignal, QUrl, QTimer, QTime, QSettings, QSize from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest from PyQt6.QtGui import QIcon, QTextCursor, QDesktopServices, QPixmap, QPainter, QPainterPath +from PyQt6.QtSvg import QSvgRenderer from getMetadata import get_metadata @dataclass @@ -350,9 +351,9 @@ class UpdateDialog(QDialog): class TwitterMediaDownloaderGUI(QWidget): def __init__(self): super().__init__() - self.current_version = "3.6" + self.current_version = "3.7" self.accounts = [] - self.temp_dir = os.path.join(tempfile.gettempdir(), "twitterxmediabatchdownloader") + self.temp_dir = os.path.join(Path.home(), ".twitterxmediabatchdownloader") os.makedirs(self.temp_dir, exist_ok=True) self.reset_state() @@ -471,7 +472,7 @@ class TwitterMediaDownloaderGUI(QWidget): self.setFixedWidth(650) self.setMinimumHeight(350) - icon_path = os.path.join(os.path.dirname(__file__), "icon.svg") + icon_path = os.path.join(os.path.dirname(__file__), "icons", "icon.svg") if os.path.exists(icon_path): self.setWindowIcon(QIcon(icon_path)) @@ -553,25 +554,52 @@ class TwitterMediaDownloaderGUI(QWidget): def setup_account_buttons(self): self.btn_layout = QHBoxLayout() - self.download_selected_btn = QPushButton('Download Selected') - self.update_selected_btn = QPushButton('Update Selected') - self.remove_btn = QPushButton('Remove Selected') - self.clear_btn = QPushButton('Clear') + self.import_btn = QPushButton(' Import') + self.export_btn = QPushButton(' Export') + self.download_selected_btn = QPushButton(' Download') + self.update_selected_btn = QPushButton(' Update') + self.delete_btn = QPushButton(' Delete') - for btn in [self.download_selected_btn, self.update_selected_btn, self.remove_btn, self.clear_btn]: - btn.setMinimumWidth(120) + icon_dir = os.path.join(os.path.dirname(__file__), 'icons') + accent_color = self.current_theme_color + + self.import_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-import.svg'), accent_color)) + self.export_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-export.svg'), accent_color)) + self.download_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'download.svg'), accent_color)) + self.update_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'reload.svg'), accent_color)) + self.delete_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'trash.svg'), accent_color)) + + for btn in [self.import_btn, self.export_btn, self.download_selected_btn, + self.update_selected_btn, self.delete_btn]: + btn.setMinimumWidth(100) btn.setCursor(Qt.CursorShape.PointingHandCursor) + btn.setIconSize(QSize(18, 18)) + self.import_btn.clicked.connect(self.import_accounts) + self.export_btn.clicked.connect(self.export_accounts) self.download_selected_btn.clicked.connect(self.download_selected) self.update_selected_btn.clicked.connect(self.update_selected) - self.remove_btn.clicked.connect(self.remove_selected_accounts) - self.clear_btn.clicked.connect(self.clear_accounts) + self.delete_btn.clicked.connect(self.delete_accounts) self.btn_layout.addStretch() - for btn in [self.download_selected_btn, self.update_selected_btn, self.remove_btn, self.clear_btn]: + for btn in [self.import_btn, self.export_btn, self.download_selected_btn, + self.update_selected_btn, self.delete_btn]: self.btn_layout.addWidget(btn, 1) self.btn_layout.addStretch() + def update_button_icons(self): + if not hasattr(self, 'import_btn'): + return + + icon_dir = os.path.join(os.path.dirname(__file__), 'icons') + accent_color = self.current_theme_color + + self.import_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-import.svg'), accent_color)) + self.export_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'database-export.svg'), accent_color)) + self.download_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'download.svg'), accent_color)) + self.update_selected_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'reload.svg'), accent_color)) + self.delete_btn.setIcon(self.create_colored_icon(os.path.join(icon_dir, 'trash.svg'), accent_color)) + def setup_process_tab(self): self.process_tab = QWidget() process_layout = QVBoxLayout() @@ -1042,6 +1070,8 @@ class TwitterMediaDownloaderGUI(QWidget): } ) + self.update_button_icons() + def setup_about_tab(self): about_tab = QWidget() about_layout = QVBoxLayout() @@ -1073,7 +1103,7 @@ class TwitterMediaDownloaderGUI(QWidget): about_layout.addWidget(section_widget) - footer_label = QLabel(f"v{self.current_version} | gallery-dl v1.30.6 | September 2025") + footer_label = QLabel(f"v{self.current_version} | gallery-dl v1.30.9 | October 2025") about_layout.addWidget(footer_label, alignment=Qt.AlignmentFlag.AlignCenter) about_tab.setLayout(about_layout) @@ -1982,6 +2012,24 @@ class TwitterMediaDownloaderGUI(QWidget): self.update_button_states() + def create_colored_icon(self, svg_path, color): + with open(svg_path, 'r', encoding='utf-8') as f: + svg_content = f.read() + + svg_content = svg_content.replace('stroke="currentColor"', f'stroke="{color}"') + svg_content = svg_content.replace('fill="currentColor"', f'fill="{color}"') + + pixmap = QPixmap(24, 24) + pixmap.fill(Qt.GlobalColor.transparent) + + from PyQt6.QtSvg import QSvgRenderer + renderer = QSvgRenderer(svg_content.encode('utf-8')) + painter = QPainter(pixmap) + renderer.render(painter) + painter.end() + + return QIcon(pixmap) + def create_placeholder_icon(self, size=48): pixmap = QPixmap(size, size) pixmap.fill(Qt.GlobalColor.transparent) @@ -2065,47 +2113,68 @@ class TwitterMediaDownloaderGUI(QWidget): has_accounts = len(self.accounts) > 0 has_selected = len(self.account_list.selectedItems()) > 0 - self.download_selected_btn.setEnabled(has_accounts and has_selected) - self.update_selected_btn.setEnabled(has_accounts and has_selected) - self.remove_btn.setEnabled(has_accounts and has_selected) - self.clear_btn.setEnabled(has_accounts) + self.import_btn.setEnabled(True) + self.export_btn.setEnabled(has_accounts) + self.download_selected_btn.setEnabled(has_accounts) + self.update_selected_btn.setEnabled(has_accounts) + self.delete_btn.setEnabled(has_accounts) - if has_accounts: - self.download_selected_btn.show() - self.update_selected_btn.show() - self.remove_btn.show() - self.clear_btn.show() - else: - self.hide_account_buttons() + self.import_btn.show() + self.export_btn.show() + self.download_selected_btn.show() + self.update_selected_btn.show() + self.delete_btn.show() def hide_account_buttons(self): - buttons = [ - self.download_selected_btn, - self.update_selected_btn, - self.remove_btn, - self.clear_btn - ] - for btn in buttons: - btn.hide() + self.import_btn.setEnabled(True) + self.export_btn.setEnabled(False) + self.download_selected_btn.setEnabled(False) + self.update_selected_btn.setEnabled(False) + self.delete_btn.setEnabled(False) + + self.import_btn.show() + self.export_btn.show() + self.download_selected_btn.show() + self.update_selected_btn.show() + self.delete_btn.show() def download_selected(self): selected_items = self.account_list.selectedItems() + if not selected_items: - self.log_output.append('Warning: Please select accounts to download.') + reply = QMessageBox.question( + self, + 'Confirm Download All', + f'No accounts selected. Download all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.Yes: + self.download_accounts(list(range(len(self.accounts)))) return + self.download_accounts([self.account_list.row(item) for item in selected_items]) def update_selected(self): selected_items = self.account_list.selectedItems() - if not selected_items: - self.log_output.append('Warning: Please select accounts to update.') - return - selected_accounts = [] - for item in selected_items: - index = self.account_list.row(item) - if index < len(self.accounts): - selected_accounts.append(self.accounts[index]) + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Update All', + f'No accounts selected. Update all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + selected_accounts = self.accounts.copy() + else: + selected_accounts = [] + for item in selected_items: + index = self.account_list.row(item) + if index < len(self.accounts): + selected_accounts.append(self.accounts[index]) if not selected_accounts: return @@ -2351,45 +2420,221 @@ class TwitterMediaDownloaderGUI(QWidget): self.worker.pause() self.pause_resume_btn.setText('Resume') - def remove_selected_accounts(self): - selected_indices = sorted([self.account_list.row(item) for item in self.account_list.selectedItems()], reverse=True) + def delete_accounts(self): + selected_items = self.account_list.selectedItems() - if not selected_indices: + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Delete All', + f'No accounts selected. Delete all {len(self.accounts)} account(s) and their cache files?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + + for account in self.accounts: + username = account.username + if username: + for is_batch in [True, False]: + cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) + try: + if os.path.exists(cache_file): + os.remove(cache_file) + self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') + except Exception as e: + self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') + + self.reset_state() + self.reset_ui() + self.tab_widget.setCurrentIndex(0) + else: + reply = QMessageBox.question( + self, + 'Confirm Delete', + f'Delete {len(selected_items)} selected account(s) and their cache files?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + return + + selected_indices = sorted([self.account_list.row(item) for item in selected_items], reverse=True) + + for index in selected_indices: + account = self.accounts[index] + username = account.username + if username: + for is_batch in [True, False]: + cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) + try: + if os.path.exists(cache_file): + os.remove(cache_file) + self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') + except Exception as e: + self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') + + self.accounts.pop(index) + + self.update_account_list() + self.update_button_states() + + def export_accounts(self): + self.tab_widget.setCurrentIndex(1) + + selected_items = self.account_list.selectedItems() + + if not selected_items: + reply = QMessageBox.question( + self, + 'Confirm Export All', + f'No accounts selected. Export all {len(self.accounts)} account(s)?', + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + QMessageBox.StandardButton.No + ) + if reply == QMessageBox.StandardButton.No: + self.log_output.append('Export cancelled') + return + selected_accounts = self.accounts.copy() + else: + selected_accounts = [] + for item in selected_items: + row = self.account_list.row(item) + if 0 <= row < len(self.accounts): + selected_accounts.append(self.accounts[row]) + + if not selected_accounts: + self.log_output.append('No valid accounts found for export') return - for index in selected_indices: - account = self.accounts[index] - username = account.username - if username: - for is_batch in [True, False]: - cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) - try: - if os.path.exists(cache_file): - os.remove(cache_file) - self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') - except Exception as e: - self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') - - self.accounts.pop(index) + export_dir = QFileDialog.getExistingDirectory(self, "Select Export Directory", self.last_output_path) + if not export_dir: + self.log_output.append('Export cancelled') + return + + self.log_output.append(f'Starting export of {len(selected_accounts)} account(s)...') + exported_count = 0 + + for account in selected_accounts: + try: + now = datetime.now() + date_str = now.strftime("%Y%m%d_%H%M%S") + + if account.fetch_mode == 'batch': + filename = f"{account.username}_batch_{date_str}.json" + else: + filename = f"{account.username}_{date_str}.json" + + filepath = os.path.join(export_dir, filename) + + export_data = { + 'username': account.username, + 'nick': account.nick, + 'followers': account.followers, + 'following': account.following, + 'posts': account.posts, + 'media_type': account.media_type, + 'profile_image': account.profile_image, + 'media_list': account.media_list, + 'fetch_mode': account.fetch_mode, + 'fetch_timestamp': account.fetch_timestamp, + 'export_timestamp': now.isoformat() + } + + with open(filepath, 'w', encoding='utf-8') as f: + json.dump(export_data, f, indent=2, ensure_ascii=False) + + exported_count += 1 + self.log_output.append(f'Exported: {filename}') + + except Exception as e: + self.log_output.append(f'Error exporting {account.username}: {str(e)}') + + self.log_output.append(f'Export completed: {exported_count}/{len(selected_accounts)} account(s) exported') + self.log_output.append(f'Export location: {export_dir}') + + def import_accounts(self): + self.tab_widget.setCurrentIndex(1) + + file_paths, _ = QFileDialog.getOpenFileNames( + self, + "Select JSON Files to Import", + self.last_output_path, + "JSON Files (*.json)" + ) + + if not file_paths: + self.log_output.append('Import cancelled') + return + + self.log_output.append(f'Starting import of {len(file_paths)} file(s)...') + imported_count = 0 + skipped_count = 0 + error_count = 0 + + for filepath in file_paths: + try: + with open(filepath, 'r', encoding='utf-8') as f: + data = json.load(f) + + username = data.get('username') + if not username: + self.log_output.append(f'Skipped {os.path.basename(filepath)}: No username found') + skipped_count += 1 + continue + + existing_account = next((acc for acc in self.accounts if acc.username == username), None) + if existing_account: + self.log_output.append(f'Skipped {username}: Already exists in dashboard') + skipped_count += 1 + continue + + account = Account( + username=username, + nick=data.get('nick', ''), + followers=data.get('followers', 0), + following=data.get('following', 0), + posts=data.get('posts', 0), + media_type=data.get('media_type', 'all'), + profile_image=data.get('profile_image'), + media_list=data.get('media_list', []), + fetch_mode=data.get('fetch_mode', 'all'), + fetch_timestamp=data.get('fetch_timestamp') + ) + + self.accounts.append(account) + + account_info = { + 'followers_count': account.followers, + 'friends_count': account.following, + 'statuses_count': account.posts, + 'nick': account.nick, + 'name': account.nick, + 'profile_image': account.profile_image + } + + cache_data = { + 'account_info': account_info, + 'timeline': account.media_list, + 'metadata': {}, + 'is_batch': (account.fetch_mode == 'batch'), + 'fetch_timestamp': account.fetch_timestamp + } + + self.save_cached_data(username, account.media_type, cache_data, is_batch=(account.fetch_mode == 'batch')) + + imported_count += 1 + media_count = len(account.media_list) if account.media_list else 0 + self.log_output.append(f'Imported: {username} ({media_count:,} media)') + + except Exception as e: + self.log_output.append(f'Error importing {os.path.basename(filepath)}: {str(e)}') + error_count += 1 self.update_account_list() self.update_button_states() - - def clear_accounts(self): - for account in self.accounts: - username = account.username - if username: - for is_batch in [True, False]: - cache_file = self.get_cache_file_path(username, account.media_type, is_batch=is_batch) - try: - if os.path.exists(cache_file): - os.remove(cache_file) - self.log_output.append(f'Removed temp file: {os.path.basename(cache_file)}') - except Exception as e: - self.log_output.append(f'Warning: Could not remove temp file {os.path.basename(cache_file)}: {str(e)}') - - self.reset_state() - self.reset_ui() + self.log_output.append(f'Import completed: {imported_count} imported, {skipped_count} skipped, {error_count} errors') self.tab_widget.setCurrentIndex(0) def update_timer(self): diff --git a/icons/database-export.svg b/icons/database-export.svg new file mode 100644 index 0000000..3ad4f2c --- /dev/null +++ b/icons/database-export.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/database-import.svg b/icons/database-import.svg new file mode 100644 index 0000000..2cfa364 --- /dev/null +++ b/icons/database-import.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/download.svg b/icons/download.svg new file mode 100644 index 0000000..eedb82f --- /dev/null +++ b/icons/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Archived/icon.icns b/icons/icon.icns similarity index 100% rename from Archived/icon.icns rename to icons/icon.icns diff --git a/icons/icon.ico b/icons/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1c5fa5d0d981d61f5a75086a0478ea30fcaaf993 GIT binary patch literal 176786 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 \ No newline at end of file diff --git a/icons/trash.svg b/icons/trash.svg new file mode 100644 index 0000000..cf4d334 --- /dev/null +++ b/icons/trash.svg @@ -0,0 +1 @@ + \ No newline at end of file