diff --git a/Aaru.Server.Task/Program.cs b/Aaru.Server.Task/Program.cs index 3502e79d..8e0e6578 100644 --- a/Aaru.Server.Task/Program.cs +++ b/Aaru.Server.Task/Program.cs @@ -36,11 +36,11 @@ using System.IO; using System.Linq; using System.Net; using System.Text.Json; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using HtmlAgilityPack; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Task +namespace Aaru.Server.Task { internal class Program { diff --git a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs index 1da8cdbe..b52d4681 100644 --- a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs @@ -3,15 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class AtasController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs index a0f528c1..8c6955c2 100644 --- a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class BlockDescriptorsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs index f5bb3b5c..fcc5d635 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class ChsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs index 6d1dd52a..35928a87 100644 --- a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class CommandsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs index fd109d79..ddd0bf2b 100644 --- a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs @@ -1,12 +1,12 @@ using System; using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class CompactDiscOffsetsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs index beceb946..b26e8991 100644 --- a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class DeviceStatsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs index bdc7f877..5af3de0d 100644 --- a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs @@ -1,13 +1,13 @@ using System; using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class DevicesController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs index e519636b..8c7ceb06 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class FilesystemsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs index 264f31ec..b4e99c49 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class FiltersController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs index 8f0260c7..f906f695 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class FireWiresController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/HomeController.cs b/Aaru.Server/Areas/Admin/Controllers/HomeController.cs index 38b7e9aa..f408eda9 100644 --- a/Aaru.Server/Areas/Admin/Controllers/HomeController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/HomeController.cs @@ -34,7 +34,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class HomeController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs index 359550c2..c1e3ebd3 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class MediaFormatsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs index 36f336ff..f874df74 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class MediasController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs index ccf62ef2..5a57a82c 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs @@ -1,12 +1,12 @@ using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class MmcController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs index f3336278..570d6c91 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class MmcFeaturesController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs index c7703013..7e48ceb5 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class MmcSdsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs index b95a109a..3c01b75e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class OperatingSystemsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs index 774d66fa..47c22fdf 100644 --- a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class PartitionsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs index 1e4bc0c1..0ae18e59 100644 --- a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class PcmciasController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs index 4131edc2..a3e6c66f 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs @@ -1,13 +1,13 @@ using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class ReportsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs index a88d60ec..05670066 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class ScsiModesController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs index e3c66dba..231598c4 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class ScsiPagesController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs index c8665735..b0854f62 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs @@ -3,15 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class ScsisController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs index cb1cf6ee..101589c8 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class SscsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs index 8de6b7f4..414aed61 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs @@ -1,12 +1,12 @@ using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class SupportedDensitiesController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs index d147e135..f5968051 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Threading.Tasks; using System.Web; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Structs.Devices.SCSI; using DiscImageChef.Decoders.ATA; @@ -8,7 +9,6 @@ using DiscImageChef.Decoders.Bluray; using DiscImageChef.Decoders.CD; using DiscImageChef.Decoders.DVD; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -17,7 +17,7 @@ using DDS = DiscImageChef.Decoders.Bluray.DDS; using DMI = DiscImageChef.Decoders.Xbox.DMI; using Spare = DiscImageChef.Decoders.Bluray.Spare; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class TestedMediasController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs index 6a40b134..beaf1202 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs @@ -1,12 +1,12 @@ using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class TestedSequentialMediasController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs index 6e4c5dd5..6ddec396 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class UsbProductsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs index 8c7d0810..1f055d8c 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class UsbVendorsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs index 0429663b..e1ccff7e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class UsbsController : Controller diff --git a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs index 865652ee..0b457d2b 100644 --- a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Server.Areas.Admin.Controllers +namespace Aaru.Server.Areas.Admin.Controllers { [Area("Admin"), Authorize] public class VersionsController : Controller diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml index 0e9e49ad..05b5cb89 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.ATA -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.Ata @{ diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml index c2d88955..261ee61b 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.ATA -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.Ata @{ diff --git a/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml index 33795709..0611eec3 100644 --- a/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml @@ -12,7 +12,7 @@ // Filename : Index.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml index 650654b6..ac7b7c66 100644 --- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml @@ -12,7 +12,7 @@ // Filename : Index.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml index b8b12df7..e4478ce4 100644 --- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml +++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml @@ -12,7 +12,7 @@ // Filename : Edit.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml index 33d48ec1..f676781b 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml @@ -13,7 +13,7 @@ // Filename : Edit.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml index 6dad77f7..2bbc1f2f 100644 --- a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml @@ -12,7 +12,7 @@ // Filename : Index.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml index 0cfd995f..6c5d6d4e 100644 --- a/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.SCSI -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.Mmc @{ diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml index ff5b2918..353e5ef9 100644 --- a/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.SCSI -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.Mmc @{ diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml index 67ea16c9..b5a3b2f1 100644 --- a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml @@ -12,7 +12,7 @@ // Filename : Index.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml index 3b54d8e9..8e411206 100644 --- a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.SecureDigital -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.MmcSd @{ @@ -14,7 +14,7 @@ // Filename : Delete.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml index 95a00aac..112e303e 100644 --- a/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.SecureDigital -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.MmcSd @{ diff --git a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml index 787648dc..052d7114 100644 --- a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml index 028e550b..3dcd2a41 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml @@ -12,7 +12,7 @@ // Filename : Details.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml index 5bbed010..9946f7fb 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.SCSI -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.Scsi @{ diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml index bf1e6e0d..a0b314b2 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml @@ -1,5 +1,5 @@ @using DiscImageChef.Decoders.SCSI -@using DiscImageChef.Server.Core +@using Aaru.Server.Core @model DiscImageChef.CommonTypes.Metadata.Scsi @{ diff --git a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml index d17f401e..db9a00f6 100644 --- a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml @@ -9,7 +9,7 @@ // Filename : _Layout.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml index 502de848..33c9a73a 100644 --- a/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml @@ -12,7 +12,7 @@ // Filename : Delete.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml index f1671e57..9226a330 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml @@ -12,7 +12,7 @@ // Filename : Delete.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml index 8240b406..95abc52d 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml @@ -12,7 +12,7 @@ // Filename : Edit.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml index 18bb2ac7..9668b390 100644 --- a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml @@ -12,7 +12,7 @@ // Filename : Index.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml index f0b8ee0e..5f388c0d 100644 --- a/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml @@ -12,7 +12,7 @@ // Filename : Delete.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ License ] -------------------------------------------------------------- // diff --git a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml index b710bdad..8b86ef93 100644 --- a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml b/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml index bd476068..ba0bc6bc 100644 --- a/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml +++ b/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using DiscImageChef.Server -@using DiscImageChef.Server.Models +@using Aaru.Server +@using Aaru.Server.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/Aaru.Server/Areas/Identity/Pages/Account/Register.cshtml.cs b/Aaru.Server/Areas/Identity/Pages/Account/Register.cshtml.cs index 6d43e929..c4f31100 100644 --- a/Aaru.Server/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/Aaru.Server/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace DiscImageChef.Server.Areas.Identity.Pages.Account +namespace Aaru.Server.Areas.Identity.Pages.Account { [AllowAnonymous] public class RegisterModel : PageModel diff --git a/Aaru.Server/Areas/Identity/Pages/Account/_ViewImports.cshtml b/Aaru.Server/Areas/Identity/Pages/Account/_ViewImports.cshtml index 6397f35a..65bba4b6 100644 --- a/Aaru.Server/Areas/Identity/Pages/Account/_ViewImports.cshtml +++ b/Aaru.Server/Areas/Identity/Pages/Account/_ViewImports.cshtml @@ -1 +1 @@ -@using DiscImageChef.Server.Areas.Identity.Pages.Account \ No newline at end of file +@using Aaru.Server.Areas.Identity.Pages.Account \ No newline at end of file diff --git a/Aaru.Server/Areas/Identity/Pages/_ViewImports.cshtml b/Aaru.Server/Areas/Identity/Pages/_ViewImports.cshtml index 17ea58d9..57a777b0 100644 --- a/Aaru.Server/Areas/Identity/Pages/_ViewImports.cshtml +++ b/Aaru.Server/Areas/Identity/Pages/_ViewImports.cshtml @@ -1,4 +1,4 @@ @using Microsoft.AspNetCore.Identity -@using DiscImageChef.Server.Areas.Identity -@using DiscImageChef.Server.Areas.Identity.Pages +@using Aaru.Server.Areas.Identity +@using Aaru.Server.Areas.Identity.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/Aaru.Server/BasicAuthMiddleware.cs b/Aaru.Server/BasicAuthMiddleware.cs index 75d9dffe..dce66e7e 100644 --- a/Aaru.Server/BasicAuthMiddleware.cs +++ b/Aaru.Server/BasicAuthMiddleware.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; -namespace DiscImageChef.Server +namespace Aaru.Server { public class BasicAuthMiddleware { diff --git a/Aaru.Server/Controllers/HomeController.cs b/Aaru.Server/Controllers/HomeController.cs index fdd4dd3a..8183182b 100644 --- a/Aaru.Server/Controllers/HomeController.cs +++ b/Aaru.Server/Controllers/HomeController.cs @@ -37,7 +37,7 @@ using Markdig; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; -namespace DiscImageChef.Server.Controllers +namespace Aaru.Server.Controllers { public class HomeController : Controller { diff --git a/Aaru.Server/Controllers/ReportController.cs b/Aaru.Server/Controllers/ReportController.cs index 7c44e190..b76ad663 100644 --- a/Aaru.Server/Controllers/ReportController.cs +++ b/Aaru.Server/Controllers/ReportController.cs @@ -5,7 +5,7 @@ // Filename : ReportController.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -33,17 +33,17 @@ using System; using System.Collections.Generic; using System.Linq; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Structs.Devices.SCSI; using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry; using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; -namespace DiscImageChef.Server.Controllers +namespace Aaru.Server.Controllers { public class ReportController : Controller { diff --git a/Aaru.Server/Controllers/StatsController.cs b/Aaru.Server/Controllers/StatsController.cs index dcbee59c..59ad7ec8 100644 --- a/Aaru.Server/Controllers/StatsController.cs +++ b/Aaru.Server/Controllers/StatsController.cs @@ -38,16 +38,16 @@ using System.Reflection; using System.Threading; using System.Xml; using System.Xml.Serialization; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Interop; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; -using OperatingSystem = DiscImageChef.Server.Models.OperatingSystem; +using OperatingSystem = Aaru.Server.Models.OperatingSystem; using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; -using Version = DiscImageChef.Server.Models.Version; +using Version = Aaru.Server.Models.Version; -namespace DiscImageChef.Server.Controllers +namespace Aaru.Server.Controllers { /// Renders a page with statistics, list of media type, devices, etc public class StatsController : Controller @@ -96,7 +96,7 @@ namespace DiscImageChef.Server.Controllers { List operatingSystems = new List(); - foreach(OperatingSystem nvs in ctx.OperatingSystems) + foreach(Models.OperatingSystem nvs in ctx.OperatingSystems) operatingSystems.Add(new NameValueStats { name = @@ -111,7 +111,7 @@ namespace DiscImageChef.Server.Controllers { List versions = new List(); - foreach(Version nvs in ctx.Versions) + foreach(Models.Version nvs in ctx.Versions) versions.Add(new NameValueStats { name = nvs.Name == "previous" ? "Previous than 3.4.99.0" : nvs.Name, Value = nvs.Count diff --git a/Aaru.Server/Controllers/UpdateController.cs b/Aaru.Server/Controllers/UpdateController.cs index 72b949e8..2a21de6d 100644 --- a/Aaru.Server/Controllers/UpdateController.cs +++ b/Aaru.Server/Controllers/UpdateController.cs @@ -5,7 +5,7 @@ // Filename : UploadReportController.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Dto; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -namespace DiscImageChef.Server.Controllers +namespace Aaru.Server.Controllers { public class UpdateController : Controller { diff --git a/Aaru.Server/Controllers/UploadReportController.cs b/Aaru.Server/Controllers/UploadReportController.cs index 8617cff1..1a433406 100644 --- a/Aaru.Server/Controllers/UploadReportController.cs +++ b/Aaru.Server/Controllers/UploadReportController.cs @@ -38,9 +38,9 @@ using System.Net; using System.Text; using System.Threading.Tasks; using System.Xml.Serialization; +using Aaru.Server.Models; using Cinchoo.PGP; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using MailKit.Net.Smtp; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; @@ -48,7 +48,7 @@ using Microsoft.AspNetCore.Mvc; using MimeKit; using Newtonsoft.Json; -namespace DiscImageChef.Server.Controllers +namespace Aaru.Server.Controllers { public class UploadReportController : Controller { diff --git a/Aaru.Server/Controllers/UploadStatsController.cs b/Aaru.Server/Controllers/UploadStatsController.cs index c7406c6c..c08d9a37 100644 --- a/Aaru.Server/Controllers/UploadStatsController.cs +++ b/Aaru.Server/Controllers/UploadStatsController.cs @@ -5,7 +5,7 @@ // Filename : UploadStatsController.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -38,16 +38,16 @@ using System.Net; using System.Threading; using System.Threading.Tasks; using System.Xml.Serialization; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; -using OperatingSystem = DiscImageChef.Server.Models.OperatingSystem; -using Version = DiscImageChef.Server.Models.Version; +using OperatingSystem = Aaru.Server.Models.OperatingSystem; +using Version = Aaru.Server.Models.Version; -namespace DiscImageChef.Server.Controllers +namespace Aaru.Server.Controllers { public class UploadStatsController : Controller { @@ -150,10 +150,10 @@ namespace DiscImageChef.Server.Controllers if(newstats.Versions != null) foreach(NameValueStats nvs in newstats.Versions) { - Version existing = _ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); + Models.Version existing = _ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); if(existing == null) - _ctx.Versions.Add(new Version + _ctx.Versions.Add(new Models.Version { Name = nvs.name, Count = nvs.Value }); @@ -220,12 +220,12 @@ namespace DiscImageChef.Server.Controllers if(newstats.OperatingSystems != null) foreach(OsStats operatingSystem in newstats.OperatingSystems) { - OperatingSystem existing = + Models.OperatingSystem existing = _ctx.OperatingSystems.FirstOrDefault(c => c.Name == operatingSystem.name && c.Version == operatingSystem.version); if(existing == null) - _ctx.OperatingSystems.Add(new OperatingSystem + _ctx.OperatingSystems.Add(new Models.OperatingSystem { Name = operatingSystem.name, Version = operatingSystem.version, Count = operatingSystem.Value diff --git a/Aaru.Server/Core/Ata.cs b/Aaru.Server/Core/Ata.cs index b44818fa..82828ff1 100644 --- a/Aaru.Server/Core/Ata.cs +++ b/Aaru.Server/Core/Ata.cs @@ -35,7 +35,7 @@ using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Structs.Devices.ATA; using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class Ata { diff --git a/Aaru.Server/Core/Hash.cs b/Aaru.Server/Core/Hash.cs index 5c6f3c34..4d162ff9 100644 --- a/Aaru.Server/Core/Hash.cs +++ b/Aaru.Server/Core/Hash.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class Hash { diff --git a/Aaru.Server/Core/HtmlHelpers.cs b/Aaru.Server/Core/HtmlHelpers.cs index 36fe9ca4..f6bb93cd 100644 --- a/Aaru.Server/Core/HtmlHelpers.cs +++ b/Aaru.Server/Core/HtmlHelpers.cs @@ -2,7 +2,7 @@ using System.Text.RegularExpressions; using DiscImageChef.CommonTypes.Metadata; using Microsoft.AspNetCore.Mvc.Rendering; -namespace DiscImageChef.Server.Core +namespace Aaru.Server.Core { public static class HtmlHelpers { diff --git a/Aaru.Server/Core/ScsiEvpd.cs b/Aaru.Server/Core/ScsiEvpd.cs index f58a0573..9f2b4ec8 100644 --- a/Aaru.Server/Core/ScsiEvpd.cs +++ b/Aaru.Server/Core/ScsiEvpd.cs @@ -34,7 +34,7 @@ using System.Collections.Generic; using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.SCSI; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class ScsiEvpd { diff --git a/Aaru.Server/Core/ScsiInquiry.cs b/Aaru.Server/Core/ScsiInquiry.cs index ffd0a890..383b76ec 100644 --- a/Aaru.Server/Core/ScsiInquiry.cs +++ b/Aaru.Server/Core/ScsiInquiry.cs @@ -5,7 +5,7 @@ // Filename : ScsiInquiry.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -33,7 +33,7 @@ using System.Collections.Generic; using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -namespace DiscImageChef.Server +namespace Aaru.Server { internal static class ScsiInquiry { diff --git a/Aaru.Server/Core/ScsiMmcFeatures.cs b/Aaru.Server/Core/ScsiMmcFeatures.cs index d179e64f..72173ffe 100644 --- a/Aaru.Server/Core/ScsiMmcFeatures.cs +++ b/Aaru.Server/Core/ScsiMmcFeatures.cs @@ -35,7 +35,7 @@ using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Structs.Devices.SCSI; using DiscImageChef.Decoders.SCSI.MMC; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class ScsiMmcFeatures { diff --git a/Aaru.Server/Core/ScsiMmcMode.cs b/Aaru.Server/Core/ScsiMmcMode.cs index 82097119..8f38eb47 100644 --- a/Aaru.Server/Core/ScsiMmcMode.cs +++ b/Aaru.Server/Core/ScsiMmcMode.cs @@ -34,7 +34,7 @@ using System.Collections.Generic; using System.Linq; using DiscImageChef.CommonTypes.Structs.Devices.SCSI.Modes; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class ScsiMmcMode { diff --git a/Aaru.Server/Core/ScsiModeSense.cs b/Aaru.Server/Core/ScsiModeSense.cs index de85fbf1..bd21e7b5 100644 --- a/Aaru.Server/Core/ScsiModeSense.cs +++ b/Aaru.Server/Core/ScsiModeSense.cs @@ -5,7 +5,7 @@ // Filename : ScsiModeSense.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -35,7 +35,7 @@ using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Structs.Devices.SCSI; using DiscImageChef.Decoders.SCSI; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class ScsiModeSense { diff --git a/Aaru.Server/Core/SscTestedMedia.cs b/Aaru.Server/Core/SscTestedMedia.cs index 08581e81..0d8ffbdf 100644 --- a/Aaru.Server/Core/SscTestedMedia.cs +++ b/Aaru.Server/Core/SscTestedMedia.cs @@ -5,7 +5,7 @@ // Filename : SscTestedMedia.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -33,7 +33,7 @@ using System.Collections.Generic; using DiscImageChef.CommonTypes.Metadata; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class SscTestedMedia { diff --git a/Aaru.Server/Core/StatsConverter.cs b/Aaru.Server/Core/StatsConverter.cs index dfff068f..833d8954 100644 --- a/Aaru.Server/Core/StatsConverter.cs +++ b/Aaru.Server/Core/StatsConverter.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Linq; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Server.Models; -using Version = DiscImageChef.Server.Models.Version; +using Version = Aaru.Server.Models.Version; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class StatsConverter { @@ -362,10 +362,10 @@ namespace DiscImageChef.Server if(string.IsNullOrWhiteSpace(nvs.name)) continue; - Version existing = ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); + Models.Version existing = ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); if(existing == null) - ctx.Versions.Add(new Version + ctx.Versions.Add(new Models.Version { Count = nvs.Value, Name = nvs.name }); @@ -375,10 +375,10 @@ namespace DiscImageChef.Server } else { - Version existing = ctx.Versions.FirstOrDefault(c => c.Name == "previous"); + Models.Version existing = ctx.Versions.FirstOrDefault(c => c.Name == "previous"); if(existing == null) - ctx.Versions.Add(new Version + ctx.Versions.Add(new Models.Version { Count = 1, Name = "previous" }); diff --git a/Aaru.Server/Core/TestedMedia.cs b/Aaru.Server/Core/TestedMedia.cs index fd03f2d4..524e1b40 100644 --- a/Aaru.Server/Core/TestedMedia.cs +++ b/Aaru.Server/Core/TestedMedia.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; -namespace DiscImageChef.Server.App_Start +namespace Aaru.Server.App_Start { public static class TestedMedia { diff --git a/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs b/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs index ce57d727..1b0bc93b 100644 --- a/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs +++ b/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191102132240_InitialMigration")] diff --git a/Aaru.Server/Migrations/20191102132240_InitialMigration.cs b/Aaru.Server/Migrations/20191102132240_InitialMigration.cs index 63d169ca..3450def1 100644 --- a/Aaru.Server/Migrations/20191102132240_InitialMigration.cs +++ b/Aaru.Server/Migrations/20191102132240_InitialMigration.cs @@ -1,9 +1,9 @@ using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class InitialMigration : Migration { diff --git a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs b/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs index db282889..a9cb0fa7 100644 --- a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs +++ b/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191102231633_MakeFieldsUnsigned")] diff --git a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.cs b/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.cs index 8f1ca026..253d4472 100644 --- a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.cs +++ b/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class MakeFieldsUnsigned : Migration { diff --git a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs b/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs index f51322d3..1683f623 100644 --- a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs +++ b/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191106230730_CreateIdentitySchema")] diff --git a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.cs b/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.cs index a76f4597..ba3b0de6 100644 --- a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.cs +++ b/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class CreateIdentitySchema : Migration { diff --git a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs b/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs index 8f3f8d82..69729dbc 100644 --- a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs +++ b/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191108004756_SetAllOnDeleteSetNull")] diff --git a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.cs b/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.cs index 662dac82..457c623d 100644 --- a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.cs +++ b/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class SetAllOnDeleteSetNull : Migration { diff --git a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs b/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs index 304184b9..95dbca33 100644 --- a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs +++ b/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191110143605_CascadeDeleteDensityCodes")] diff --git a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.cs b/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.cs index c14bfbb3..de7f22b0 100644 --- a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.cs +++ b/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class CascadeDeleteDensityCodes : Migration { diff --git a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs b/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs index 59ccb2e2..7b3e93c4 100644 --- a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs +++ b/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191110144834_CascadeDeleteBlockDescriptors")] diff --git a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs b/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs index 0d32f776..562c9471 100644 --- a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs +++ b/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class CascadeDeleteBlockDescriptors : Migration { diff --git a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs b/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs index 1d54a362..2d642fa0 100644 --- a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs +++ b/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191113003156_CascadeDeleteMmcFeatures")] diff --git a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs b/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs index 0e01fd71..812f2401 100644 --- a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs +++ b/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class CascadeDeleteMmcFeatures : Migration { diff --git a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs b/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs index 9368ccec..7f5c7048 100644 --- a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs +++ b/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191117215158_CascadeDeleteSupportedDensities")] diff --git a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs b/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs index c7cf79a2..51048a33 100644 --- a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs +++ b/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class CascadeDeleteSupportedDensities : Migration { diff --git a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs b/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs index b71cbd3d..a5d753f7 100644 --- a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs +++ b/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191124212117_EFTypesUpdate")] diff --git a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.cs b/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.cs index f95b8fa7..9aa2bd91 100644 --- a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.cs +++ b/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class EFTypesUpdate : Migration { diff --git a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs b/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs index c3d640f2..d0743cac 100644 --- a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs +++ b/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191124220655_AddSupportsScrambledReadCd")] diff --git a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.cs b/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.cs index a9a2d10e..10f9cda8 100644 --- a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.cs +++ b/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class AddSupportsScrambledReadCd : Migration { diff --git a/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs b/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs index 1d7cc6db..d903abd9 100644 --- a/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs +++ b/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191203212552_NameCountModel")] diff --git a/Aaru.Server/Migrations/20191203212552_NameCountModel.cs b/Aaru.Server/Migrations/20191203212552_NameCountModel.cs index 7de65980..f9ec8a9e 100644 --- a/Aaru.Server/Migrations/20191203212552_NameCountModel.cs +++ b/Aaru.Server/Migrations/20191203212552_NameCountModel.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class NameCountModel : Migration { diff --git a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs b/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs index e40418f6..cd628bd7 100644 --- a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs +++ b/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] [Migration("20191204182314_RemoteStatistics")] diff --git a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.cs b/Aaru.Server/Migrations/20191204182314_RemoteStatistics.cs index 5b549cde..2ca2f0a8 100644 --- a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.cs +++ b/Aaru.Server/Migrations/20191204182314_RemoteStatistics.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { public partial class RemoteStatistics : Migration { diff --git a/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs b/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs index cae72c31..41a87d4e 100644 --- a/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs +++ b/Aaru.Server/Migrations/DicServerContextModelSnapshot.cs @@ -1,11 +1,11 @@ // using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace DiscImageChef.Server.Migrations +namespace Aaru.Server.Migrations { [DbContext(typeof(DicServerContext))] internal class DicServerContextModelSnapshot : ModelSnapshot diff --git a/Aaru.Server/Models/BaseModel.cs b/Aaru.Server/Models/BaseModel.cs index 14653a24..bafc4b95 100644 --- a/Aaru.Server/Models/BaseModel.cs +++ b/Aaru.Server/Models/BaseModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public abstract class BaseModel { diff --git a/Aaru.Server/Models/BaseOperatingSystem.cs b/Aaru.Server/Models/BaseOperatingSystem.cs index 954a9359..83f18ed6 100644 --- a/Aaru.Server/Models/BaseOperatingSystem.cs +++ b/Aaru.Server/Models/BaseOperatingSystem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public abstract class BaseOperatingSystem : BaseModel { diff --git a/Aaru.Server/Models/CdOffset.cs b/Aaru.Server/Models/CdOffset.cs index 507821de..2141d501 100644 --- a/Aaru.Server/Models/CdOffset.cs +++ b/Aaru.Server/Models/CdOffset.cs @@ -5,7 +5,7 @@ // Filename : CdOffset.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -35,7 +35,7 @@ using System.Collections.Generic; using System.ComponentModel; using DiscImageChef.CommonTypes.Metadata; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class CompactDiscOffset : CdOffset { diff --git a/Aaru.Server/Models/ChsModel.cs b/Aaru.Server/Models/ChsModel.cs index 3b1fd102..31186b7e 100644 --- a/Aaru.Server/Models/ChsModel.cs +++ b/Aaru.Server/Models/ChsModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class ChsModel { diff --git a/Aaru.Server/Models/Command.cs b/Aaru.Server/Models/Command.cs index e63a10c2..dddf1e49 100644 --- a/Aaru.Server/Models/Command.cs +++ b/Aaru.Server/Models/Command.cs @@ -5,7 +5,7 @@ // Filename : Command.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class Command : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Server/Models/CompareModel.cs b/Aaru.Server/Models/CompareModel.cs index d862eb8d..2355e90e 100644 --- a/Aaru.Server/Models/CompareModel.cs +++ b/Aaru.Server/Models/CompareModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class CompareModel { diff --git a/Aaru.Server/Models/Context.cs b/Aaru.Server/Models/Context.cs index 59c80468..88d57cec 100644 --- a/Aaru.Server/Models/Context.cs +++ b/Aaru.Server/Models/Context.cs @@ -37,7 +37,7 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public sealed class DicServerContext : IdentityDbContext { diff --git a/Aaru.Server/Models/Device.cs b/Aaru.Server/Models/Device.cs index d9901601..7f5e78e6 100644 --- a/Aaru.Server/Models/Device.cs +++ b/Aaru.Server/Models/Device.cs @@ -35,7 +35,7 @@ using System.ComponentModel; using DiscImageChef.CommonTypes.Enums; using DiscImageChef.CommonTypes.Metadata; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class Device : DeviceReportV2 { diff --git a/Aaru.Server/Models/DeviceDetails.cs b/Aaru.Server/Models/DeviceDetails.cs index 06cb8efd..a36fd031 100644 --- a/Aaru.Server/Models/DeviceDetails.cs +++ b/Aaru.Server/Models/DeviceDetails.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using DiscImageChef.CommonTypes.Metadata; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class DeviceDetails { diff --git a/Aaru.Server/Models/DeviceItem.cs b/Aaru.Server/Models/DeviceItem.cs index 2110a98c..63bd20dd 100644 --- a/Aaru.Server/Models/DeviceItem.cs +++ b/Aaru.Server/Models/DeviceItem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class DeviceItem { diff --git a/Aaru.Server/Models/DeviceStat.cs b/Aaru.Server/Models/DeviceStat.cs index 7d4250b7..dab29262 100644 --- a/Aaru.Server/Models/DeviceStat.cs +++ b/Aaru.Server/Models/DeviceStat.cs @@ -5,7 +5,7 @@ // Filename : DeviceStat.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class DeviceStat : BaseModel { diff --git a/Aaru.Server/Models/ErrorViewModel.cs b/Aaru.Server/Models/ErrorViewModel.cs index 7fbd7ccf..2a61bcfb 100644 --- a/Aaru.Server/Models/ErrorViewModel.cs +++ b/Aaru.Server/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class ErrorViewModel { diff --git a/Aaru.Server/Models/Filesystem.cs b/Aaru.Server/Models/Filesystem.cs index 9f899dbc..15eec158 100644 --- a/Aaru.Server/Models/Filesystem.cs +++ b/Aaru.Server/Models/Filesystem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class Filesystem : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Server/Models/Filter.cs b/Aaru.Server/Models/Filter.cs index b7f74737..ce5e37c2 100644 --- a/Aaru.Server/Models/Filter.cs +++ b/Aaru.Server/Models/Filter.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class Filter : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Server/Models/FindReportModel.cs b/Aaru.Server/Models/FindReportModel.cs index e8d95eb7..d2b1942a 100644 --- a/Aaru.Server/Models/FindReportModel.cs +++ b/Aaru.Server/Models/FindReportModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class FindReportModel : BaseModel { diff --git a/Aaru.Server/Models/FireWireModel.cs b/Aaru.Server/Models/FireWireModel.cs index 13aefefd..dd0b1bce 100644 --- a/Aaru.Server/Models/FireWireModel.cs +++ b/Aaru.Server/Models/FireWireModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class FireWireModel { diff --git a/Aaru.Server/Models/IdHashModel.cs b/Aaru.Server/Models/IdHashModel.cs index bd313598..a40b5f0d 100644 --- a/Aaru.Server/Models/IdHashModel.cs +++ b/Aaru.Server/Models/IdHashModel.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class IdHashModel : BaseModel { diff --git a/Aaru.Server/Models/IdHashModelForView.cs b/Aaru.Server/Models/IdHashModelForView.cs index 2488c4cd..14724a29 100644 --- a/Aaru.Server/Models/IdHashModelForView.cs +++ b/Aaru.Server/Models/IdHashModelForView.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class IdHashModelForView { diff --git a/Aaru.Server/Models/Media.cs b/Aaru.Server/Models/Media.cs index 4c4a98d0..34912590 100644 --- a/Aaru.Server/Models/Media.cs +++ b/Aaru.Server/Models/Media.cs @@ -35,7 +35,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations.Schema; using DiscImageChef.CommonTypes; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class Media : BaseModel { diff --git a/Aaru.Server/Models/MediaFormat.cs b/Aaru.Server/Models/MediaFormat.cs index 5a3eacbc..6c2c6763 100644 --- a/Aaru.Server/Models/MediaFormat.cs +++ b/Aaru.Server/Models/MediaFormat.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class MediaFormat : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Server/Models/MediaItem.cs b/Aaru.Server/Models/MediaItem.cs index 6a51d180..d734efff 100644 --- a/Aaru.Server/Models/MediaItem.cs +++ b/Aaru.Server/Models/MediaItem.cs @@ -5,7 +5,7 @@ // Filename : MediaItem.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class MediaItem { diff --git a/Aaru.Server/Models/MmcModelForView.cs b/Aaru.Server/Models/MmcModelForView.cs index ecda25a8..0fa62b06 100644 --- a/Aaru.Server/Models/MmcModelForView.cs +++ b/Aaru.Server/Models/MmcModelForView.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class MmcModelForView : BaseModel { diff --git a/Aaru.Server/Models/NameCountModel.cs b/Aaru.Server/Models/NameCountModel.cs index c229cc39..84532fc9 100644 --- a/Aaru.Server/Models/NameCountModel.cs +++ b/Aaru.Server/Models/NameCountModel.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public abstract class NameCountModel : BaseModel { diff --git a/Aaru.Server/Models/OperatingSystem.cs b/Aaru.Server/Models/OperatingSystem.cs index 77d34206..6f316b7d 100644 --- a/Aaru.Server/Models/OperatingSystem.cs +++ b/Aaru.Server/Models/OperatingSystem.cs @@ -5,7 +5,7 @@ // Filename : OperatingSystem.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class OperatingSystem : BaseOperatingSystem { } } \ No newline at end of file diff --git a/Aaru.Server/Models/Partition.cs b/Aaru.Server/Models/Partition.cs index e0579d7d..8b2b8335 100644 --- a/Aaru.Server/Models/Partition.cs +++ b/Aaru.Server/Models/Partition.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class Partition : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteApplication.cs b/Aaru.Server/Models/RemoteApplication.cs index 0365c185..e397c96b 100644 --- a/Aaru.Server/Models/RemoteApplication.cs +++ b/Aaru.Server/Models/RemoteApplication.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class RemoteApplication : BaseOperatingSystem { } } \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteArchitecture.cs b/Aaru.Server/Models/RemoteArchitecture.cs index 0ca0e23a..231b428d 100644 --- a/Aaru.Server/Models/RemoteArchitecture.cs +++ b/Aaru.Server/Models/RemoteArchitecture.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class RemoteArchitecture : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteOperatingSystem.cs b/Aaru.Server/Models/RemoteOperatingSystem.cs index a0d329ec..9ddf6836 100644 --- a/Aaru.Server/Models/RemoteOperatingSystem.cs +++ b/Aaru.Server/Models/RemoteOperatingSystem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class RemoteOperatingSystem : BaseOperatingSystem { } } \ No newline at end of file diff --git a/Aaru.Server/Models/SscModel.cs b/Aaru.Server/Models/SscModel.cs index c4888036..fac16488 100644 --- a/Aaru.Server/Models/SscModel.cs +++ b/Aaru.Server/Models/SscModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class SscModel { diff --git a/Aaru.Server/Models/TestedMediaDataModel.cs b/Aaru.Server/Models/TestedMediaDataModel.cs index 4375ec3e..940785ed 100644 --- a/Aaru.Server/Models/TestedMediaDataModel.cs +++ b/Aaru.Server/Models/TestedMediaDataModel.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class TestedMediaDataModel { diff --git a/Aaru.Server/Models/UploadedReport.cs b/Aaru.Server/Models/UploadedReport.cs index 31a2feef..fd1858d4 100644 --- a/Aaru.Server/Models/UploadedReport.cs +++ b/Aaru.Server/Models/UploadedReport.cs @@ -34,7 +34,7 @@ using System; using System.ComponentModel; using DiscImageChef.CommonTypes.Metadata; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class UploadedReport : DeviceReportV2 { diff --git a/Aaru.Server/Models/UploadedReportDetails.cs b/Aaru.Server/Models/UploadedReportDetails.cs index c7872e08..0f9c9005 100644 --- a/Aaru.Server/Models/UploadedReportDetails.cs +++ b/Aaru.Server/Models/UploadedReportDetails.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using DiscImageChef.CommonTypes.Metadata; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class UploadedReportDetails { diff --git a/Aaru.Server/Models/UsbModel.cs b/Aaru.Server/Models/UsbModel.cs index cee53c84..4a72d0b1 100644 --- a/Aaru.Server/Models/UsbModel.cs +++ b/Aaru.Server/Models/UsbModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class UsbModel { diff --git a/Aaru.Server/Models/UsbProduct.cs b/Aaru.Server/Models/UsbProduct.cs index 1b22c173..0d765966 100644 --- a/Aaru.Server/Models/UsbProduct.cs +++ b/Aaru.Server/Models/UsbProduct.cs @@ -5,7 +5,7 @@ // Filename : UsbProduct.cs // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // @@ -33,7 +33,7 @@ using System; using Newtonsoft.Json; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class UsbProduct : BaseModel { diff --git a/Aaru.Server/Models/UsbProductModel.cs b/Aaru.Server/Models/UsbProductModel.cs index e92824e1..6b6f9bb9 100644 --- a/Aaru.Server/Models/UsbProductModel.cs +++ b/Aaru.Server/Models/UsbProductModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class UsbProductModel { diff --git a/Aaru.Server/Models/UsbVendor.cs b/Aaru.Server/Models/UsbVendor.cs index 121738d6..a2aaa169 100644 --- a/Aaru.Server/Models/UsbVendor.cs +++ b/Aaru.Server/Models/UsbVendor.cs @@ -36,7 +36,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using Newtonsoft.Json; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class UsbVendor : BaseModel { diff --git a/Aaru.Server/Models/UsbVendorModel.cs b/Aaru.Server/Models/UsbVendorModel.cs index b43f980e..ee3e56fe 100644 --- a/Aaru.Server/Models/UsbVendorModel.cs +++ b/Aaru.Server/Models/UsbVendorModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class UsbVendorModel { diff --git a/Aaru.Server/Models/Version.cs b/Aaru.Server/Models/Version.cs index 7c99fd4b..e691baa0 100644 --- a/Aaru.Server/Models/Version.cs +++ b/Aaru.Server/Models/Version.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Server.Models +namespace Aaru.Server.Models { public class Version : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Server/Program.cs b/Aaru.Server/Program.cs index 672ca84c..a1995b07 100644 --- a/Aaru.Server/Program.cs +++ b/Aaru.Server/Program.cs @@ -1,13 +1,13 @@ using System; +using Aaru.Server.Models; using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.Server.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Version = DiscImageChef.CommonTypes.Interop.Version; -namespace DiscImageChef.Server +namespace Aaru.Server { public class Program { @@ -68,7 +68,7 @@ namespace DiscImageChef.Server "\u001b[32m .dWMMM0; dWMMMMXl. \u001b[37;1m Thanks to all contributors, collaborators, translators, donators and friends.\u001b[0m\n" + "\u001b[32m .......,cd0WMMNk: c0MMMMMWKkolc:clodc'\u001b[0m\n" + "\u001b[32m .';loddol:'. ':oxkkOkkxoc,.\u001b[0m\n" + - "\u001b[0m\n", Version.GetVersion(), + "\u001b[0m\n", System.Version.GetVersion(), #if DEBUG "DEBUG" #else @@ -77,7 +77,7 @@ namespace DiscImageChef.Server , DetectOS.GetPlatformName(DetectOS.GetRealPlatformID()), Environment.Is64BitOperatingSystem ? 64 : 32, Environment.Is64BitProcess ? 64 : 32, DetectOS.IsMono ? "Mono" : ".NET Core", - DetectOS.IsMono ? Version.GetMonoVersion() : Version.GetNetCoreVersion()); + DetectOS.IsMono ? System.Version.GetMonoVersion() : System.Version.GetNetCoreVersion()); IHost host = CreateHostBuilder(args).Build(); diff --git a/Aaru.Server/Seeder.cs b/Aaru.Server/Seeder.cs index 979dc2fa..2cc0ccea 100644 --- a/Aaru.Server/Seeder.cs +++ b/Aaru.Server/Seeder.cs @@ -1,9 +1,9 @@ using System; -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; -namespace DiscImageChef.Server +namespace Aaru.Server { public static class Seeder { diff --git a/Aaru.Server/Startup.cs b/Aaru.Server/Startup.cs index b83b014b..21411093 100644 --- a/Aaru.Server/Startup.cs +++ b/Aaru.Server/Startup.cs @@ -1,4 +1,4 @@ -using DiscImageChef.Server.Models; +using Aaru.Server.Models; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.HttpOverrides; @@ -10,7 +10,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Prometheus; -namespace DiscImageChef.Server +namespace Aaru.Server { public class Startup { diff --git a/Aaru.Server/Views/Home/Changelog.cshtml b/Aaru.Server/Views/Home/Changelog.cshtml index b4bba00e..7b07dd7b 100644 --- a/Aaru.Server/Views/Home/Changelog.cshtml +++ b/Aaru.Server/Views/Home/Changelog.cshtml @@ -10,7 +10,7 @@ // Filename : Changelog.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // diff --git a/Aaru.Server/Views/Home/ISSUE_TEMPLATE.cshtml b/Aaru.Server/Views/Home/ISSUE_TEMPLATE.cshtml index fc81af16..e4f4e298 100644 --- a/Aaru.Server/Views/Home/ISSUE_TEMPLATE.cshtml +++ b/Aaru.Server/Views/Home/ISSUE_TEMPLATE.cshtml @@ -10,7 +10,7 @@ // Filename : ISSUE_TEMPLATE.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // diff --git a/Aaru.Server/Views/Home/NEEDINFO.cshtml b/Aaru.Server/Views/Home/NEEDINFO.cshtml index 7be0e7c1..119b128a 100644 --- a/Aaru.Server/Views/Home/NEEDINFO.cshtml +++ b/Aaru.Server/Views/Home/NEEDINFO.cshtml @@ -10,7 +10,7 @@ // Filename : NEEDINFO.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // diff --git a/Aaru.Server/Views/Home/PULL_REQUEST_TEMPLATE.cshtml b/Aaru.Server/Views/Home/PULL_REQUEST_TEMPLATE.cshtml index 44a0b738..1e8a47d8 100644 --- a/Aaru.Server/Views/Home/PULL_REQUEST_TEMPLATE.cshtml +++ b/Aaru.Server/Views/Home/PULL_REQUEST_TEMPLATE.cshtml @@ -10,7 +10,7 @@ // Filename : PULL_REQUEST_TEMPLATE.cshtml // Author(s) : Natalia Portillo // - // Component : DiscImageChef Server. + // Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- // diff --git a/Aaru.Server/Views/_ViewImports.cshtml b/Aaru.Server/Views/_ViewImports.cshtml index bd476068..ba0bc6bc 100644 --- a/Aaru.Server/Views/_ViewImports.cshtml +++ b/Aaru.Server/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using DiscImageChef.Server -@using DiscImageChef.Server.Models +@using Aaru.Server +@using Aaru.Server.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/Aaru.Server/wwwroot/css/dos/_font.scss b/Aaru.Server/wwwroot/css/dos/_font.scss index 4c5e62d4..5e5d7b66 100644 --- a/Aaru.Server/wwwroot/css/dos/_font.scss +++ b/Aaru.Server/wwwroot/css/dos/_font.scss @@ -5,7 +5,7 @@ // Filename : _font.scss // Author(s) : Natalia Portillo // -// Component : DiscImageChef Server. +// Component : Aaru Server. // // --[ Description ] ---------------------------------------------------------- //