[IMP] reorganize project directory structure
Restructure the project for better organization and maintainability:
New structure:
./upgrade.sh - Main entry point (unchanged)
./lib/common.sh - Shared bash functions
./lib/python/ - Python utility scripts
./scripts/ - Workflow scripts (prepare_db, finalize_db)
./config/ - Configuration files (compose.yml)
./versions/{13..18}.0/ - Version-specific migration scripts
File renames:
- pre_migration_view_checking.py -> lib/python/check_views.py
- post_migration_fix_duplicated_views.py -> lib/python/fix_duplicated_views.py
- post_migration_cleanup_obsolete_modules.py -> lib/python/cleanup_modules.py
Benefits:
- Single entry point visible at root level
- Clear separation between shared code, scripts, and config
- Shorter, cleaner Python script names (context given by caller)
- Easier navigation and maintenance
This commit is contained in:
Stéphan Sainléger
126
lib/python/check_views.py
Normal file
126
lib/python/check_views.py
Normal file
@@ -0,0 +1,126 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Pre-Migration Cleanup Script for Odoo
|
||||
Run this BEFORE migrating to identify and clean up custom views.
|
||||
|
||||
Usage: odoo shell -d dbname < pre_migration_cleanup.py
|
||||
"""
|
||||
|
||||
print("\n" + "="*80)
|
||||
print("PRE-MIGRATION CLEANUP - VIEW ANALYSIS")
|
||||
print("="*80 + "\n")
|
||||
|
||||
# 1. Find all custom (COW) views
|
||||
print("STEP 1: Identifying Custom/COW Views")
|
||||
print("-"*80)
|
||||
|
||||
all_views = env['ir.ui.view'].search(['|', ('active', '=', True), ('active', '=', False)])
|
||||
cow_views = all_views.filtered(lambda v: not v.model_data_id)
|
||||
|
||||
print(f"Total views in database: {len(all_views)}")
|
||||
print(f"Custom views (no module): {len(cow_views)}")
|
||||
print(f"Module views: {len(all_views) - len(cow_views)}\n")
|
||||
|
||||
if cow_views:
|
||||
print("Custom views found:\n")
|
||||
print(f"{'ID':<8} {'Active':<8} {'Key':<50} {'Name':<40}")
|
||||
print("-"*120)
|
||||
|
||||
for view in cow_views[:50]: # Show first 50
|
||||
active_str = "✓" if view.active else "✗"
|
||||
key_str = view.key[:48] if view.key else "N/A"
|
||||
name_str = view.name[:38] if view.name else "N/A"
|
||||
print(f"{view.id:<8} {active_str:<8} {key_str:<50} {name_str:<40}")
|
||||
|
||||
if len(cow_views) > 50:
|
||||
print(f"\n... and {len(cow_views) - 50} more custom views")
|
||||
|
||||
# 2. Find duplicate views
|
||||
print("\n" + "="*80)
|
||||
print("STEP 2: Finding Duplicate Views (Same Key)")
|
||||
print("-"*80 + "\n")
|
||||
|
||||
from collections import defaultdict
|
||||
|
||||
keys = defaultdict(list)
|
||||
for view in all_views.filtered(lambda v: v.key and v.active):
|
||||
keys[view.key].append(view)
|
||||
|
||||
duplicates = {k: v for k, v in keys.items() if len(v) > 1}
|
||||
|
||||
print(f"Found {len(duplicates)} keys with duplicate views:\n")
|
||||
|
||||
if duplicates:
|
||||
for key, views in sorted(duplicates.items()):
|
||||
print(f"\nKey: {key} ({len(views)} duplicates)")
|
||||
for view in views:
|
||||
module = view.model_data_id.module if view.model_data_id else "⚠️ Custom/DB"
|
||||
print(f" ID {view.id:>6}: {module:<25} | {view.name}")
|
||||
|
||||
# 3. Find views that might have xpath issues
|
||||
print("\n" + "="*80)
|
||||
print("STEP 3: Finding Views with XPath Expressions")
|
||||
print("-"*80 + "\n")
|
||||
|
||||
import re
|
||||
|
||||
views_with_xpath = []
|
||||
xpath_pattern = r'<xpath[^>]+expr="([^"]+)"'
|
||||
|
||||
for view in all_views.filtered(lambda v: v.active and v.inherit_id):
|
||||
xpaths = re.findall(xpath_pattern, view.arch_db)
|
||||
if xpaths:
|
||||
views_with_xpath.append({
|
||||
'view': view,
|
||||
'xpaths': xpaths,
|
||||
'is_custom': not bool(view.model_data_id)
|
||||
})
|
||||
|
||||
print(f"Found {len(views_with_xpath)} views with xpath expressions")
|
||||
|
||||
custom_xpath_views = [v for v in views_with_xpath if v['is_custom']]
|
||||
print(f" - {len(custom_xpath_views)} are custom views (potential issue!)")
|
||||
print(f" - {len(views_with_xpath) - len(custom_xpath_views)} are module views\n")
|
||||
|
||||
if custom_xpath_views:
|
||||
print("Custom views with xpaths (risk for migration issues):\n")
|
||||
for item in custom_xpath_views:
|
||||
view = item['view']
|
||||
print(f"ID {view.id}: {view.name}")
|
||||
print(f" Key: {view.key}")
|
||||
print(f" Inherits from: {view.inherit_id.key}")
|
||||
print(f" XPath count: {len(item['xpaths'])}")
|
||||
print(f" Sample xpaths: {item['xpaths'][:2]}")
|
||||
print()
|
||||
|
||||
# 4. Summary and recommendations
|
||||
print("=" * 80)
|
||||
print("SUMMARY AND RECOMMENDATIONS")
|
||||
print("=" * 80 + "\n")
|
||||
|
||||
print(f"📊 Statistics:")
|
||||
print(f" • Total views: {len(all_views)}")
|
||||
print(f" • Custom views: {len(cow_views)}")
|
||||
print(f" • Duplicate view keys: {len(duplicates)}")
|
||||
print(f" • Custom views with xpaths: {len(custom_xpath_views)}\n")
|
||||
|
||||
print(f"\n📋 RECOMMENDED ACTIONS BEFORE MIGRATION:\n")
|
||||
|
||||
if custom_xpath_views:
|
||||
print(f"1. Archive or delete {len(custom_xpath_views)} custom views with xpaths:")
|
||||
print(f" • Review each one and determine if still needed")
|
||||
print(f" • Archive unnecessary ones: env['ir.ui.view'].browse([ids]).write({{'active': False}})")
|
||||
print(f" • Plan to recreate important ones as proper module views after migration\n")
|
||||
|
||||
if duplicates:
|
||||
print(f"2. Fix {len(duplicates)} duplicate view keys:")
|
||||
print(f" • Manually review and delete obsolete duplicates, keeping the most appropriate one")
|
||||
print(f" • Document the remaining appropriate ones as script post_migration_fix_duplicated_views.py will run AFTER the migration and delete all duplicates.\n")
|
||||
|
||||
if cow_views:
|
||||
print(f"3. Review {len(cow_views)} custom views:")
|
||||
print(f" • Document which ones are important")
|
||||
print(f" • Export their XML for reference")
|
||||
print(f" • Consider converting to module views\n")
|
||||
|
||||
print("=" * 80 + "\n")
|
||||
128
lib/python/cleanup_modules.py
Normal file
128
lib/python/cleanup_modules.py
Normal file
@@ -0,0 +1,128 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Post-Migration Obsolete Module Cleanup
|
||||
Run this AFTER migration to detect and remove modules that exist in the database
|
||||
but no longer exist in the filesystem (addons paths).
|
||||
"""
|
||||
|
||||
print("\n" + "="*80)
|
||||
print("POST-MIGRATION OBSOLETE MODULE CLEANUP")
|
||||
print("="*80 + "\n")
|
||||
|
||||
import odoo.modules.module as module_lib
|
||||
|
||||
# Get all modules from database
|
||||
all_modules = env['ir.module.module'].search([])
|
||||
|
||||
print(f"Analyzing {len(all_modules)} modules in database...\n")
|
||||
|
||||
# Detect obsolete modules (in database but not in filesystem)
|
||||
obsolete_modules = []
|
||||
for mod in all_modules:
|
||||
mod_path = module_lib.get_module_path(mod.name, display_warning=False)
|
||||
if not mod_path:
|
||||
obsolete_modules.append(mod)
|
||||
|
||||
if not obsolete_modules:
|
||||
print("✓ No obsolete modules found! Database is clean.")
|
||||
print("=" * 80 + "\n")
|
||||
exit()
|
||||
|
||||
# Separate modules by state
|
||||
safe_to_delete = [m for m in obsolete_modules if m.state != 'installed']
|
||||
installed_obsolete = [m for m in obsolete_modules if m.state == 'installed']
|
||||
|
||||
# Display obsolete modules
|
||||
print(f"Obsolete modules found: {len(obsolete_modules)}\n")
|
||||
|
||||
if installed_obsolete:
|
||||
print("-" * 80)
|
||||
print("⚠️ OBSOLETE INSTALLED MODULES (require attention)")
|
||||
print("-" * 80)
|
||||
for mod in sorted(installed_obsolete, key=lambda m: m.name):
|
||||
print(f" • {mod.name:40} | ID: {mod.id}")
|
||||
print()
|
||||
|
||||
if safe_to_delete:
|
||||
print("-" * 80)
|
||||
print("OBSOLETE UNINSTALLED MODULES (safe to delete)")
|
||||
print("-" * 80)
|
||||
for mod in sorted(safe_to_delete, key=lambda m: m.name):
|
||||
print(f" • {mod.name:40} | State: {mod.state:15} | ID: {mod.id}")
|
||||
print()
|
||||
|
||||
# Summary
|
||||
print("=" * 80)
|
||||
print("SUMMARY")
|
||||
print("=" * 80 + "\n")
|
||||
print(f" • Obsolete uninstalled modules (safe to delete): {len(safe_to_delete)}")
|
||||
print(f" • Obsolete INSTALLED modules (caution!): {len(installed_obsolete)}")
|
||||
|
||||
# Delete uninstalled modules
|
||||
if safe_to_delete:
|
||||
print("\n" + "=" * 80)
|
||||
print("DELETING OBSOLETE UNINSTALLED MODULES")
|
||||
print("=" * 80 + "\n")
|
||||
|
||||
deleted_count = 0
|
||||
failed_deletes = []
|
||||
|
||||
for mod in safe_to_delete:
|
||||
try:
|
||||
mod_name = mod.name
|
||||
mod_id = mod.id
|
||||
mod.unlink()
|
||||
print(f"✓ Deleted: {mod_name} (ID: {mod_id})")
|
||||
deleted_count += 1
|
||||
except Exception as e:
|
||||
print(f"✗ Failed: {mod.name} - {e}")
|
||||
failed_deletes.append({'name': mod.name, 'id': mod.id, 'reason': str(e)})
|
||||
|
||||
# Commit changes
|
||||
print("\n" + "=" * 80)
|
||||
print("COMMITTING CHANGES")
|
||||
print("=" * 80 + "\n")
|
||||
|
||||
try:
|
||||
env.cr.commit()
|
||||
print("✓ All changes committed successfully!")
|
||||
except Exception as e:
|
||||
print(f"✗ Commit failed: {e}")
|
||||
print("Changes were NOT saved!")
|
||||
exit(1)
|
||||
|
||||
# Final result
|
||||
print("\n" + "=" * 80)
|
||||
print("RESULT")
|
||||
print("=" * 80 + "\n")
|
||||
print(f" • Successfully deleted modules: {deleted_count}")
|
||||
print(f" • Failed deletions: {len(failed_deletes)}")
|
||||
|
||||
if failed_deletes:
|
||||
print("\n⚠️ Modules not deleted:")
|
||||
for item in failed_deletes:
|
||||
print(f" • {item['name']} (ID: {item['id']}): {item['reason']}")
|
||||
|
||||
if installed_obsolete:
|
||||
print("\n" + "=" * 80)
|
||||
print("⚠️ WARNING: OBSOLETE INSTALLED MODULES")
|
||||
print("=" * 80 + "\n")
|
||||
print("The following modules are marked 'installed' but no longer exist")
|
||||
print("in the filesystem. They may cause problems.\n")
|
||||
print("Options:")
|
||||
print(" 1. Check if these modules were renamed/merged in the new version")
|
||||
print(" 2. Manually uninstall them if possible")
|
||||
print(" 3. Force delete them (risky, may break dependencies)\n")
|
||||
|
||||
for mod in sorted(installed_obsolete, key=lambda m: m.name):
|
||||
# Find modules that depend on this module
|
||||
dependents = env['ir.module.module'].search([
|
||||
('state', '=', 'installed'),
|
||||
('dependencies_id.name', '=', mod.name)
|
||||
])
|
||||
dep_info = f" <- Dependents: {dependents.mapped('name')}" if dependents else ""
|
||||
print(f" • {mod.name}{dep_info}")
|
||||
|
||||
print("\n" + "=" * 80)
|
||||
print("CLEANUP COMPLETED!")
|
||||
print("=" * 80 + "\n")
|
||||
192
lib/python/fix_duplicated_views.py
Normal file
192
lib/python/fix_duplicated_views.py
Normal file
@@ -0,0 +1,192 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Post-Migration Duplicate View Fixer
|
||||
Run this AFTER migration to fix duplicate views automatically.
|
||||
"""
|
||||
|
||||
print("\n" + "="*80)
|
||||
print("POST-MIGRATION DUPLICATE VIEW FIXER")
|
||||
print("="*80 + "\n")
|
||||
|
||||
from collections import defaultdict
|
||||
|
||||
# Find all duplicate views
|
||||
all_views = env['ir.ui.view'].search(['|', ('active', '=', True), ('active', '=', False)])
|
||||
keys = defaultdict(list)
|
||||
|
||||
for view in all_views:
|
||||
if view.key:
|
||||
keys[view.key].append(view)
|
||||
|
||||
duplicates = {k: v for k, v in keys.items() if len(v) > 1}
|
||||
|
||||
print(f"Found {len(duplicates)} keys with duplicate views\n")
|
||||
|
||||
if not duplicates:
|
||||
print("✓ No duplicate views found! Database is clean.")
|
||||
print("=" * 80 + "\n")
|
||||
exit()
|
||||
|
||||
# Process duplicates
|
||||
views_to_delete = []
|
||||
redirect_log = []
|
||||
|
||||
for key, views in sorted(duplicates.items()):
|
||||
print(f"\nProcessing key: {key}")
|
||||
print("-" * 80)
|
||||
|
||||
# Sort views: module views first, then by ID (older first)
|
||||
sorted_views = sorted(views, key=lambda v: (
|
||||
0 if v.model_data_id else 1, # Module views first
|
||||
v.id # Older views first (lower ID = older)
|
||||
))
|
||||
|
||||
# Keep the first view (should be module view or oldest)
|
||||
keep = sorted_views[0]
|
||||
to_delete = sorted_views[1:]
|
||||
|
||||
module_keep = keep.model_data_id.module if keep.model_data_id else "Custom/DB"
|
||||
print(f"KEEP: ID {keep.id:>6} | Module: {module_keep:<20} | {keep.name}")
|
||||
|
||||
for view in to_delete:
|
||||
module = view.model_data_id.module if view.model_data_id else "Custom/DB"
|
||||
print(f"DELETE: ID {view.id:>6} | Module: {module:<20} | {view.name}")
|
||||
|
||||
# Find and redirect children
|
||||
children = env['ir.ui.view'].search([('inherit_id', '=', view.id)])
|
||||
if children:
|
||||
print(f" → Redirecting {len(children)} children {children.ids} to view {keep.id}")
|
||||
for child in children:
|
||||
child_module = child.model_data_id.module if child.model_data_id else "Custom/DB"
|
||||
redirect_log.append({
|
||||
'child_id': child.id,
|
||||
'child_name': child.name,
|
||||
'child_module': child_module,
|
||||
'from': view.id,
|
||||
'to': keep.id
|
||||
})
|
||||
try:
|
||||
children.write({'inherit_id': keep.id})
|
||||
print(f" ✓ Redirected successfully")
|
||||
except Exception as e:
|
||||
print(f" ✗ Redirect failed: {e}")
|
||||
continue
|
||||
|
||||
views_to_delete.append(view)
|
||||
|
||||
# Summary before deletion
|
||||
print("\n" + "="*80)
|
||||
print("SUMMARY")
|
||||
print("="*80 + "\n")
|
||||
|
||||
print(f"Views to delete: {len(views_to_delete)}")
|
||||
print(f"Child views to redirect: {len(redirect_log)}\n")
|
||||
|
||||
if redirect_log:
|
||||
print("Redirections that will be performed:")
|
||||
for item in redirect_log[:10]: # Show first 10
|
||||
print(f" • View {item['child_id']} ({item['child_module']})")
|
||||
print(f" '{item['child_name']}'")
|
||||
print(f" Parent: {item['from']} → {item['to']}")
|
||||
|
||||
if len(redirect_log) > 10:
|
||||
print(f" ... and {len(redirect_log) - 10} more redirections")
|
||||
|
||||
# Delete duplicate views
|
||||
print("\n" + "="*80)
|
||||
print("DELETING DUPLICATE VIEWS")
|
||||
print("="*80 + "\n")
|
||||
|
||||
deleted_count = 0
|
||||
failed_deletes = []
|
||||
|
||||
# Sort views by ID descending (delete newer/child views first)
|
||||
views_to_delete_sorted = sorted(views_to_delete, key=lambda v: v.id, reverse=True)
|
||||
|
||||
for view in views_to_delete_sorted:
|
||||
try:
|
||||
# Create savepoint to isolate each deletion
|
||||
env.cr.execute('SAVEPOINT delete_view')
|
||||
|
||||
view_id = view.id
|
||||
view_name = view.name
|
||||
view_key = view.key
|
||||
|
||||
# Double-check it has no children
|
||||
remaining_children = env['ir.ui.view'].search([('inherit_id', '=', view_id)])
|
||||
if remaining_children:
|
||||
print(f"⚠️ Skipping view {view_id}: Still has {len(remaining_children)} children")
|
||||
failed_deletes.append({
|
||||
'id': view_id,
|
||||
'reason': f'Still has {len(remaining_children)} children'
|
||||
})
|
||||
env.cr.execute('ROLLBACK TO SAVEPOINT delete_view')
|
||||
continue
|
||||
|
||||
view.unlink()
|
||||
env.cr.execute('RELEASE SAVEPOINT delete_view')
|
||||
print(f"✓ Deleted view {view_id}: {view_key}")
|
||||
deleted_count += 1
|
||||
|
||||
except Exception as e:
|
||||
env.cr.execute('ROLLBACK TO SAVEPOINT delete_view')
|
||||
print(f"✗ Failed to delete view {view.id}: {e}")
|
||||
failed_deletes.append({
|
||||
'id': view.id,
|
||||
'name': view.name,
|
||||
'reason': str(e)
|
||||
})
|
||||
|
||||
# Commit changes
|
||||
print("\n" + "="*80)
|
||||
print("COMMITTING CHANGES")
|
||||
print("="*80 + "\n")
|
||||
|
||||
try:
|
||||
env.cr.commit()
|
||||
print("✓ All changes committed successfully!")
|
||||
except Exception as e:
|
||||
print(f"✗ Commit failed: {e}")
|
||||
print("Changes were NOT saved!")
|
||||
exit(1)
|
||||
|
||||
# Final verification
|
||||
print("\n" + "="*80)
|
||||
print("FINAL VERIFICATION")
|
||||
print("="*80 + "\n")
|
||||
|
||||
# Re-check for duplicates
|
||||
all_views_after = env['ir.ui.view'].search([('active', '=', True)])
|
||||
keys_after = defaultdict(list)
|
||||
|
||||
for view in all_views_after:
|
||||
if view.key:
|
||||
keys_after[view.key].append(view)
|
||||
|
||||
duplicates_after = {k: v for k, v in keys_after.items() if len(v) > 1}
|
||||
|
||||
print(f"Results:")
|
||||
print(f" • Successfully deleted: {deleted_count} views")
|
||||
print(f" • Failed deletions: {len(failed_deletes)}")
|
||||
print(f" • Child views redirected: {len(redirect_log)}")
|
||||
print(f" • Remaining duplicates: {len(duplicates_after)}")
|
||||
|
||||
if failed_deletes:
|
||||
print(f"\n⚠️ Failed deletions:")
|
||||
for item in failed_deletes:
|
||||
print(f" • View {item['id']}: {item['reason']}")
|
||||
|
||||
if duplicates_after:
|
||||
print(f"\n⚠️ Still have {len(duplicates_after)} duplicate keys:")
|
||||
for key, views in sorted(duplicates_after.items())[:5]:
|
||||
print(f" • {key}: {len(views)} views")
|
||||
for view in views:
|
||||
module = view.model_data_id.module if view.model_data_id else "Custom/DB"
|
||||
print(f" - ID {view.id} ({module})")
|
||||
print(f"\n Run this script again to attempt another cleanup.")
|
||||
else:
|
||||
print(f"\n✓ All duplicates resolved!")
|
||||
|
||||
print("\n" + "="*80)
|
||||
print("FIX COMPLETED!")
|
||||
print("="*80)
|
||||
Reference in New Issue
Block a user