ui fix

Author: GitTimeraider

app.py

@@ -202,6 +202,44 @@ def add_repository():
         schedule_type = request.form['schedule_type']
         retention_count = int(request.form['retention_count'])
 
+        # Handle custom schedule fields
+        custom_interval = None
+        custom_unit = None
+        custom_hour = 2
+        custom_minute = 0
+        
+        if schedule_type == 'custom':
+            custom_interval = int(request.form.get('custom_interval', 1))
+            custom_unit = request.form.get('custom_unit', 'days')
+            custom_time = request.form.get('custom_time', '02:00')
+            
+            # Validate custom schedule parameters
+            if custom_unit == 'days' and (custom_interval < 1 or custom_interval > 365):
+                flash('Custom interval for days must be between 1 and 365', 'error')
+                return render_template('add_repository.html')
+            elif custom_unit == 'weeks' and (custom_interval < 1 or custom_interval > 52):
+                flash('Custom interval for weeks must be between 1 and 52', 'error')
+                return render_template('add_repository.html')
+            elif custom_unit == 'months' and (custom_interval < 1 or custom_interval > 12):
+                flash('Custom interval for months must be between 1 and 12', 'error')
+                return render_template('add_repository.html')
+            
+            try:
+                time_parts = custom_time.split(':')
+                custom_hour = int(time_parts[0])
+                custom_minute = int(time_parts[1])
+                
+                if custom_hour < 0 or custom_hour > 23:
+                    flash('Hour must be between 0 and 23', 'error')
+                    return render_template('add_repository.html')
+                if custom_minute < 0 or custom_minute > 59:
+                    flash('Minute must be between 0 and 59', 'error')
+                    return render_template('add_repository.html')
+                    
+            except (IndexError, ValueError):
+                flash('Invalid time format. Please use HH:MM format', 'error')
+                return render_template('add_repository.html')
+        
         # Extract repo name from URL
         repo_name = repo_url.split('/')[-1].replace('.git', '')
 
@@ -213,6 +251,10 @@ def add_repository():
             backup_format=backup_format,
             schedule_type=schedule_type,
             retention_count=retention_count,
+            custom_interval=custom_interval,
+            custom_unit=custom_unit,
+            custom_hour=custom_hour,
+            custom_minute=custom_minute,
             is_active=True
         )
 
@@ -239,10 +281,56 @@ def edit_repository(repo_id):
         repository.retention_count = int(request.form['retention_count'])
         repository.is_active = 'is_active' in request.form
 
+        # Handle custom schedule fields
+        if repository.schedule_type == 'custom':
+            custom_interval = int(request.form.get('custom_interval', 1))
+            custom_unit = request.form.get('custom_unit', 'days')
+            custom_time = request.form.get('custom_time', '02:00')
+            
+            # Validate custom schedule parameters
+            if custom_unit == 'days' and (custom_interval < 1 or custom_interval > 365):
+                flash('Custom interval for days must be between 1 and 365', 'error')
+                return render_template('edit_repository.html', repository=repository)
+            elif custom_unit == 'weeks' and (custom_interval < 1 or custom_interval > 52):
+                flash('Custom interval for weeks must be between 1 and 52', 'error')
+                return render_template('edit_repository.html', repository=repository)
+            elif custom_unit == 'months' and (custom_interval < 1 or custom_interval > 12):
+                flash('Custom interval for months must be between 1 and 12', 'error')
+                return render_template('edit_repository.html', repository=repository)
+            
+            repository.custom_interval = custom_interval
+            repository.custom_unit = custom_unit
+            
+            try:
+                time_parts = custom_time.split(':')
+                repository.custom_hour = int(time_parts[0])
+                repository.custom_minute = int(time_parts[1])
+                
+                if repository.custom_hour < 0 or repository.custom_hour > 23:
+                    flash('Hour must be between 0 and 23', 'error')
+                    return render_template('edit_repository.html', repository=repository)
+                if repository.custom_minute < 0 or repository.custom_minute > 59:
+                    flash('Minute must be between 0 and 59', 'error')
+                    return render_template('edit_repository.html', repository=repository)
+                    
+            except (IndexError, ValueError):
+                flash('Invalid time format. Please use HH:MM format', 'error')
+                return render_template('edit_repository.html', repository=repository)
+        else:
+            # Reset custom fields when not using custom schedule
+            repository.custom_interval = None
+            repository.custom_unit = None
+            repository.custom_hour = 2
+            repository.custom_minute = 0
+        
         db.session.commit()
 
         # Reschedule the backup job
-        scheduler.remove_job(f'backup_{repo_id}', jobstore=None)
+        try:
+            scheduler.remove_job(f'backup_{repo_id}', jobstore=None)
+        except:
+            pass
+        
         if repository.is_active:
             schedule_backup_job(repository)
 
@@ -315,6 +403,61 @@ def schedule_backup_job(repository):
         trigger = CronTrigger(day_of_week=0, hour=2, minute=0)  # Sunday 2 AM
     elif repository.schedule_type == 'monthly':
         trigger = CronTrigger(day=1, hour=2, minute=0)  # 1st of month 2 AM
+    elif repository.schedule_type == 'custom':
+        # Handle custom schedule
+        hour = repository.custom_hour or 2
+        minute = repository.custom_minute or 0
+        interval = repository.custom_interval or 1
+        unit = repository.custom_unit or 'days'
+        
+        if unit == 'days':
+            # For daily intervals, use interval_trigger if more than 1 day
+            if interval == 1:
+                trigger = CronTrigger(hour=hour, minute=minute)  # Daily
+            else:
+                # Use interval trigger for multi-day schedules
+                from apscheduler.triggers.interval import IntervalTrigger
+                from datetime import datetime, time
+                # Calculate next run time at the specified hour/minute
+                now = datetime.now()
+                start_date = now.replace(hour=hour, minute=minute, second=0, microsecond=0)
+                if start_date <= now:
+                    start_date = start_date.replace(day=start_date.day + 1)
+                trigger = IntervalTrigger(days=interval, start_date=start_date)
+        elif unit == 'weeks':
+            # For weekly intervals
+            if interval == 1:
+                trigger = CronTrigger(day_of_week=0, hour=hour, minute=minute)  # Every Sunday
+            else:
+                from apscheduler.triggers.interval import IntervalTrigger
+                from datetime import datetime
+                now = datetime.now()
+                start_date = now.replace(hour=hour, minute=minute, second=0, microsecond=0)
+                # Find next Sunday
+                days_until_sunday = (6 - now.weekday()) % 7
+                if days_until_sunday == 0 and start_date <= now:
+                    days_until_sunday = 7
+                start_date = start_date.replace(day=start_date.day + days_until_sunday)
+                trigger = IntervalTrigger(weeks=interval, start_date=start_date)
+        elif unit == 'months':
+            # For monthly intervals
+            if interval == 1:
+                trigger = CronTrigger(day=1, hour=hour, minute=minute)  # 1st of every month
+            else:
+                from apscheduler.triggers.interval import IntervalTrigger
+                from datetime import datetime
+                now = datetime.now()
+                start_date = now.replace(day=1, hour=hour, minute=minute, second=0, microsecond=0)
+                if start_date <= now:
+                    # Move to next month
+                    if start_date.month == 12:
+                        start_date = start_date.replace(year=start_date.year + 1, month=1)
+                    else:
+                        start_date = start_date.replace(month=start_date.month + 1)
+                # Note: Using weeks approximation for months since APScheduler doesn't have months interval
+                trigger = IntervalTrigger(weeks=interval*4, start_date=start_date)
+        else:
+            return  # Invalid unit
     else:
         return  # Manual only
 

init_db.py

@@ -1,6 +1,7 @@
 import os
 from app import app
 from models import db
+from migrate_db import migrate_database
 
 def ensure_sqlite_path():
     uri = app.config.get('SQLALCHEMY_DATABASE_URI')
@@ -18,8 +19,13 @@ def ensure_sqlite_path():
     db_file = ensure_sqlite_path()
     with app.app_context():
         try:
+            # Create tables if they don't exist
             db.create_all()
             print("Database initialized successfully!")
+            
+            # Run migration to add new columns if needed
+            migrate_database()
+            
             if db_file and os.path.exists(db_file):
                 st = os.stat(db_file)
                 print(f"Database file created: {db_file} (size {st.st_size} bytes, perms {oct(st.st_mode)[-3:]})")

models.py

@@ -21,8 +21,13 @@ class Repository(db.Model):
     url = db.Column(db.String(200), nullable=False)
     github_token = db.Column(db.String(200))  # For private repos
     backup_format = db.Column(db.String(20), default='folder')  # folder, zip, tar.gz
-    schedule_type = db.Column(db.String(20), default='daily')  # manual, hourly, daily, weekly, monthly
+    schedule_type = db.Column(db.String(20), default='daily')  # manual, hourly, daily, weekly, monthly, custom
     retention_count = db.Column(db.Integer, default=5)  # Number of backups to keep
+    # Custom schedule fields
+    custom_interval = db.Column(db.Integer)  # For custom schedule: interval value (e.g., 3 for "every 3 days")
+    custom_unit = db.Column(db.String(10))   # For custom schedule: unit (days, weeks, months)
+    custom_hour = db.Column(db.Integer, default=2)      # Hour to run backup (0-23)
+    custom_minute = db.Column(db.Integer, default=0)    # Minute to run backup (0-59)
     is_active = db.Column(db.Boolean, default=True)
     last_backup = db.Column(db.DateTime)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)

templates/add_repository.html

@@ -47,20 +47,49 @@ <h4 class="mb-0">
 
                         <div class="col-md-6 mb-3">
                             <label for="schedule_type" class="form-label">Backup Schedule <span class="text-danger">*</span></label>
-                            <select class="form-select" id="schedule_type" name="schedule_type" required>
+                            <select class="form-select" id="schedule_type" name="schedule_type" required onchange="toggleCustomSchedule()">
                                 <option value="manual">Manual Only</option>
                                 <option value="hourly">Every Hour</option>
                                 <option value="daily" selected>Daily (2 AM)</option>
                                 <option value="weekly">Weekly (Sunday 2 AM)</option>
                                 <option value="monthly">Monthly (1st, 2 AM)</option>
+                                <option value="custom">Custom Schedule</option>
                             </select>
                             <div class="form-text">
                                 When to automatically backup this repository
                             </div>
                         </div>
                     </div>
 
-                    <div class="mb-3">
+                    <!-- Custom Schedule Options -->
+                    <div id="custom-schedule-options" class="row" style="display: none;">
+                        <div class="col-md-4 mb-3">
+                            <label for="custom_interval" class="form-label">Every</label>
+                            <input type="number" class="form-control" id="custom_interval" name="custom_interval" 
+                                   min="1" max="365" value="1">
+                            <div class="form-text">
+                                <span id="interval-help">Enter a number between 1-365</span>
+                            </div>
+                        </div>
+                        <div class="col-md-4 mb-3">
+                            <label for="custom_unit" class="form-label">Unit</label>
+                            <select class="form-select" id="custom_unit" name="custom_unit" onchange="updateIntervalLimits()">
+                                <option value="days">Days</option>
+                                <option value="weeks">Weeks</option>
+                                <option value="months">Months</option>
+                            </select>
+                        </div>
+                        <div class="col-md-4 mb-3">
+                            <label for="custom_time" class="form-label">At Time</label>
+                            <input type="time" class="form-control" id="custom_time" name="custom_time" value="02:00">
+                            <div class="form-text">
+                                Time to run the backup (24-hour format)
+                            </div>
+                        </div>
+                    </div>
+                    
+                    <div class="row">
+                        <div class="col-12 mb-3">
                         <label for="retention_count" class="form-label">Retention Count <span class="text-danger">*</span></label>
                         <input type="number" class="form-control" id="retention_count" name="retention_count" 
                                value="5" min="1" max="50" required>
@@ -97,6 +126,49 @@ <h4 class="mb-0">
 
 {% block scripts %}
 <script>
+function toggleCustomSchedule() {
+    const scheduleType = document.getElementById('schedule_type').value;
+    const customOptions = document.getElementById('custom-schedule-options');
+    
+    if (scheduleType === 'custom') {
+        customOptions.style.display = 'block';
+        // Make custom fields required when custom is selected
+        document.getElementById('custom_interval').required = true;
+        document.getElementById('custom_unit').required = true;
+        document.getElementById('custom_time').required = true;
+        updateIntervalLimits();
+    } else {
+        customOptions.style.display = 'none';
+        // Remove required attribute when custom is not selected
+        document.getElementById('custom_interval').required = false;
+        document.getElementById('custom_unit').required = false;
+        document.getElementById('custom_time').required = false;
+    }
+}
+
+function updateIntervalLimits() {
+    const unit = document.getElementById('custom_unit').value;
+    const intervalInput = document.getElementById('custom_interval');
+    const helpText = document.getElementById('interval-help');
+    
+    if (unit === 'days') {
+        intervalInput.max = 365;
+        helpText.textContent = 'Enter a number between 1-365';
+    } else if (unit === 'weeks') {
+        intervalInput.max = 52;
+        helpText.textContent = 'Enter a number between 1-52';
+        if (parseInt(intervalInput.value) > 52) {
+            intervalInput.value = 52;
+        }
+    } else if (unit === 'months') {
+        intervalInput.max = 12;
+        helpText.textContent = 'Enter a number between 1-12';
+        if (parseInt(intervalInput.value) > 12) {
+            intervalInput.value = 12;
+        }
+    }
+}
+
 document.getElementById('repo_url').addEventListener('blur', function() {
     const url = this.value;
     if (url && url.includes('github.com/')) {
@@ -108,5 +180,10 @@ <h4 class="mb-0">
         }
     }
 });
+
+// Initialize custom schedule toggle on page load
+document.addEventListener('DOMContentLoaded', function() {
+    toggleCustomSchedule();
+});
 </script>
 {% endblock %}

templates/dashboard.html

@@ -90,7 +90,11 @@ <h5 class="mb-0">
                             <strong>{{ repo.name }}</strong>
                             <br>
                             <small class="text-muted">
-                                {{ repo.schedule_type.title() }} backup
+                                {% if repo.schedule_type == 'custom' %}
+                                    Every {{ repo.custom_interval }} {{ repo.custom_unit }} backup
+                                {% else %}
+                                    {{ repo.schedule_type.title() }} backup
+                                {% endif %}
                                 {% if repo.last_backup %}
                                     - Last: {{ repo.last_backup.strftime('%Y-%m-%d %H:%M') }}
                                 {% endif %}