Merge pull request #15 from shirokun20/feat/multi-source-migration-phase-4

Feat/multi source migration phase 4

Author: shirokun20

.github/workflows/build.yml

@@ -147,78 +147,85 @@ jobs:
           TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
           TELEGRAM_CHANNEL_ID: ${{ secrets.TELEGRAM_CHANNEL_ID }}
         run: |
+          set -e
           # Check if APK files exist
           if [ ! -d "apk-output" ] || [ -z "$(ls -A apk-output/*.apk 2>/dev/null)" ]; then
             echo "❌ No APK files found in apk-output/"
             exit 1
           fi
 
-          # Get version from pubspec.yaml for caption
+          # Get version from pubspec.yaml
           VERSION=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | cut -d '+' -f 1)
+          SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-8)
+          
+          echo "📦 Version: $VERSION"
+          echo "🔗 Commit: $SHORT_SHA"
 
-          # Priority: ARM64 > ARM > x86_64
-          # Only upload ARM64 and ARM to save bandwidth and telegram storage
-          # x86_64 is mainly for emulators/testing
+          # Absolute path for reliability
+          OUTPUT_DIR="$(pwd)/apk-output"
           UPLOADED_COUNT=0
           
           # Upload ARM64 (highest priority - 95% of users)
-          for apk in apk-output/*arm64-v8a*.apk; do
+          for apk in "$OUTPUT_DIR"/*arm64-v8a*.apk; do
             if [ -f "$apk" ]; then
+              filename=$(basename "$apk")
               size=$(stat -c%s "$apk" 2>/dev/null || stat -f%z "$apk" 2>/dev/null || echo "0")
               size_mb=$((size / 1024 / 1024))
 
               if [ $size_mb -gt 50 ]; then
-                echo "⚠️ Skipping $apk - too large (${size_mb}MB > 50MB limit)"
+                echo "⚠️ Skipping $filename - too large (${size_mb}MB > 50MB limit)"
                 continue
               fi
 
-              echo "📤 Uploading ARM64: $apk (${size_mb}MB)..."
-              response=$(curl -s --max-time 600 --connect-timeout 60 --retry 3 --retry-delay 10 \
+              echo "📤 Uploading ARM64: $filename (${size_mb}MB)..."
+              
+              # Use -S to show errors but keep it quiet otherwise
+              response=$(curl -S --max-time 600 --connect-timeout 60 --retry 3 --retry-delay 10 \
                 -F chat_id="$TELEGRAM_CHANNEL_ID" \
                 -F document=@"$apk" \
-                -F caption="📱 Kuro-N v${VERSION} - ARM64 | ✅ Recommended for modern devices (Android 5.0+) | 💾 ${size_mb}MB | 🔗 ${GITHUB_SHA::8}" \
+                -F caption="📱 Kuro-N v${VERSION} - ARM64 | ✅ Recommended for modern devices | 💾 ${size_mb}MB | 🔗 $SHORT_SHA" \
                 "https://api.telegram.org/bot$TELEGRAM_BOT_TOKEN/sendDocument")
 
-                if echo "$response" | grep -q '"ok":true'; then
-                  echo "✅ Successfully uploaded ARM64 APK (${size_mb}MB)"
-                  UPLOADED_COUNT=$((UPLOADED_COUNT + 1))
-                else
-                echo "❌ Failed to upload: $response"
+              if echo "$response" | grep -q '"ok":true'; then
+                echo "✅ Successfully uploaded ARM64: $filename"
+                UPLOADED_COUNT=$((UPLOADED_COUNT + 1))
+              else
+                echo "❌ Failed to upload $filename: $response"
                 exit 1
               fi
             fi
           done
 
           # Upload ARM (compatibility for older devices)
-          for apk in apk-output/*armeabi-v7a*.apk; do
+          for apk in "$OUTPUT_DIR"/*armeabi-v7a*.apk; do
             if [ -f "$apk" ]; then
+              filename=$(basename "$apk")
               size=$(stat -c%s "$apk" 2>/dev/null || stat -f%z "$apk" 2>/dev/null || echo "0")
               size_mb=$((size / 1024 / 1024))
 
               if [ $size_mb -gt 50 ]; then
-                echo "⚠️ Skipping $apk - too large (${size_mb}MB > 50MB limit)"
+                echo "⚠️ Skipping $filename - too large (${size_mb}MB > 50MB limit)"
                 continue
               fi
 
-              echo "📤 Uploading ARM: $apk (${size_mb}MB)..."
-              response=$(curl -s --max-time 600 --connect-timeout 60 --retry 3 --retry-delay 10 \
+              echo "📤 Uploading ARM: $filename (${size_mb}MB)..."
+              
+              response=$(curl -S --max-time 600 --connect-timeout 60 --retry 3 --retry-delay 10 \
                 -F chat_id="$TELEGRAM_CHANNEL_ID" \
                 -F document=@"$apk" \
-                -F caption="📱 Kuro-N v${VERSION} - ARMv7 | 📦 For older devices | 💾 ${size_mb}MB | 🔗 ${GITHUB_SHA::8}" \
+                -F caption="📱 Kuro-N v${VERSION} - ARMv7 | 📦 For older devices | 💾 ${size_mb}MB | 🔗 $SHORT_SHA" \
                 "https://api.telegram.org/bot$TELEGRAM_BOT_TOKEN/sendDocument")
 
-                if echo "$response" | grep -q '"ok":true'; then
-                  echo "✅ Successfully uploaded ARM APK (${size_mb}MB)"
-                  UPLOADED_COUNT=$((UPLOADED_COUNT + 1))
-                else
-                echo "❌ Failed to upload: $response"
+              if echo "$response" | grep -q '"ok":true'; then
+                echo "✅ Successfully uploaded ARM: $filename"
+                UPLOADED_COUNT=$((UPLOADED_COUNT + 1))
+              else
+                echo "❌ Failed to upload $filename: $response"
                 exit 1
               fi
             fi
           done
 
-          # Note: x86_64 not uploaded to save space (mainly for emulators)
-          echo ""
           echo "🎉 Upload complete! Total uploaded: $UPLOADED_COUNT APKs"
 
       # Extract Version from pubspec.yaml

lib/core/config/api_config.dart

@@ -1,39 +1,41 @@
-/// API Configuration
-///
-/// Centralized configuration for API endpoints and settings.
-library;
-
+import 'package:nhasixapp/core/config/remote_config_service.dart';
+import 'package:nhasixapp/core/di/service_locator.dart';
+import 'package:nhasixapp/core/config/config_models.dart' as models;
+ 
 /// Configuration class for nhentai API
 class ApiConfig {
   ApiConfig._();
-
+ 
+  static models.SourceConfig? get _nhentaiConfig =>
+      getIt<RemoteConfigService>().getConfig('nhentai');
+ 
   // ============ nhentai API ============
 
   /// Base URL for nhentai API
-  static const String nhentaiApiBase = 'https://nhentai.net/api';
-
+  static String get nhentaiApiBase => _nhentaiConfig?.api?.apiBase ?? 'https://nhentai.net/api';
+ 
   /// nhentai website base URL (for fallback scraping)
-  static const String nhentaiWebBase = 'https://nhentai.net';
-
+  static String get nhentaiWebBase => _nhentaiConfig?.baseUrl ?? 'https://nhentai.net';
+ 
   /// API request timeout in milliseconds
-  static const int apiTimeout = 30000;
-
+  static int get apiTimeout => _nhentaiConfig?.api?.timeout ?? 30000;
+ 
   /// Enable automatic fallback to HTML scraper if API fails
-  static const bool enableApiFallback = true;
-
+  static bool get enableApiFallback => _nhentaiConfig?.features?.related ?? true;
+ 
   /// Maximum retry attempts for API requests
-  static const int maxRetryAttempts = 3;
-
+  static int get maxRetryAttempts => _nhentaiConfig?.network?.retry?.maxAttempts ?? 3;
+ 
   /// Delay between retries in milliseconds
-  static const int retryDelayMs = 1000;
+  static int get retryDelayMs => _nhentaiConfig?.network?.retry?.delayMs ?? 1000;
 
   // ============ Rate Limiting ============
-
+ 
   /// Minimum delay between API requests in milliseconds
-  static const int minRequestDelayMs = 200;
-
+  static int get minRequestDelayMs => _nhentaiConfig?.network?.rateLimit?.minDelayMs ?? 200;
+ 
   /// Maximum requests per minute
-  static const int maxRequestsPerMinute = 60;
+  static int get maxRequestsPerMinute => _nhentaiConfig?.network?.rateLimit?.requestsPerMinute ?? 60;
 
   // ============ Endpoints ============
 

lib/core/config/config_models.dart

@@ -520,9 +520,18 @@ class AppConfig {
 @JsonSerializable()
 class AppLimits {
   final int defaultPageSize;
+  final int maxBatchSize;
   final int maxConcurrentDownloads;
-
-  AppLimits({this.defaultPageSize = 20, this.maxConcurrentDownloads = 3});
+  final int searchHistoryLimit;
+  final int imagePreloadBuffer;
+
+  AppLimits({
+    this.defaultPageSize = 20,
+    this.maxBatchSize = 1000,
+    this.maxConcurrentDownloads = 3,
+    this.searchHistoryLimit = 50,
+    this.imagePreloadBuffer = 5,
+  });
 
   factory AppLimits.fromJson(Map<String, dynamic> json) =>
       _$AppLimitsFromJson(json);
@@ -532,9 +541,26 @@ class AppLimits {
 @JsonSerializable()
 class AppDurations {
   final int splashDelayMs;
-  final int snackbarDurationMs;
-
-  AppDurations({this.splashDelayMs = 2000, this.snackbarDurationMs = 3000});
+  final int snackbarShortMs;
+  final int snackbarLongMs;
+  final int pageTransitionMs;
+  final int searchDebounceMs;
+  final int networkTimeoutMs;
+  final int cacheExpirationHours;
+  final int readerAutoHideDelaySeconds;
+  final int progressUpdateIntervalMs;
+
+  AppDurations({
+    this.splashDelayMs = 1000,
+    this.snackbarShortMs = 2000,
+    this.snackbarLongMs = 4000,
+    this.pageTransitionMs = 300,
+    this.searchDebounceMs = 300,
+    this.networkTimeoutMs = 30000,
+    this.cacheExpirationHours = 24,
+    this.readerAutoHideDelaySeconds = 3,
+    this.progressUpdateIntervalMs = 100,
+  });
 
   factory AppDurations.fromJson(Map<String, dynamic> json) =>
       _$AppDurationsFromJson(json);
@@ -544,9 +570,22 @@ class AppDurations {
 @JsonSerializable()
 class AppUiConfig {
   final int gridColumnsPortrait;
+  final int gridColumnsLandscape;
+  final double minCardWidth;
   final double cardAspectRatio;
-
-  AppUiConfig({this.gridColumnsPortrait = 2, this.cardAspectRatio = 0.7});
+  final double cardBorderRadius;
+  final double defaultPadding;
+  final int titleMaxLength;
+
+  AppUiConfig({
+    this.gridColumnsPortrait = 2,
+    this.gridColumnsLandscape = 3,
+    this.minCardWidth = 150.0,
+    this.cardAspectRatio = 0.65,
+    this.cardBorderRadius = 12.0,
+    this.defaultPadding = 16.0,
+    this.titleMaxLength = 40,
+  });
 
   factory AppUiConfig.fromJson(Map<String, dynamic> json) =>
       _$AppUiConfigFromJson(json);
@@ -556,8 +595,14 @@ class AppUiConfig {
 @JsonSerializable()
 class AppStorage {
   final String backupFolderName;
+  final int maxImageSizeKb;
+  final int pdfPartsSizePages;
 
-  AppStorage({this.backupFolderName = 'nhasix_backup'});
+  AppStorage({
+    this.backupFolderName = 'nhasix',
+    this.maxImageSizeKb = 200,
+    this.pdfPartsSizePages = 100,
+  });
 
   factory AppStorage.fromJson(Map<String, dynamic> json) =>
       _$AppStorageFromJson(json);

lib/core/config/config_models.g.dart

@@ -4,6 +4,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter/services.dart';
 import 'package:logger/logger.dart';
 import 'package:nhasixapp/core/config/config_models.dart';
+import 'package:nhasixapp/core/constants/app_constants.dart' as constants;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter/foundation.dart'; // Add this import
 
@@ -127,7 +128,7 @@ class RemoteConfigService {
         _versionUrl,
         options: Options(
           responseType: ResponseType.json,
-          receiveTimeout: const Duration(seconds: 10),
+          receiveTimeout: constants.AppDurations.networkTimeout,
         ),
       );