Change namespace structure

b0wter · Oct 19, 2024 · 49192a9 · 49192a9
1 parent e510934
commit 49192a9
Show file tree

Hide file tree

Showing 20 changed files with 34 additions and 38 deletions.
diff --git a/src/cli/Arguments.fs b/src/cli/Arguments.fs
@@ -1,4 +1,4 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
 open Argu
 

diff --git a/src/cli/Assets.fs b/src/cli/Assets.fs
@@ -1,7 +1,7 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
 open System
-open b0wter.Fbrary.Core
+open Fbrary.Core
 
 module Assets =
     module RatingSymbols =

diff --git a/src/cli/Config.fs b/src/cli/Config.fs
@@ -1,12 +1,12 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
 open System
 open System.Collections.Generic
 open Argu
-open b0wter.Fbrary.Arguments
+open Fbrary.Cli.Arguments
 open b0wter.FSharp.Operators
 open System.Linq
-open b0wter.Fbrary.Core
+open Fbrary.Core
 
 module Config =
 

diff --git a/src/cli/Fbrary.Cli.fsproj b/src/cli/Fbrary.Cli.fsproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <RootNamespace>b0wter.Fbrary</RootNamespace>
     <AssemblyName>fbrary</AssemblyName>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>

diff --git a/src/cli/Formatter.fs b/src/cli/Formatter.fs
@@ -1,9 +1,9 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
-open b0wter.Fbrary.Core
+open Fbrary.Core
 
 module Formatter =
-    open b0wter.Fbrary.Assets
+    open Fbrary.Cli.Assets
     open System.Text.RegularExpressions
 
     // If you change the regex you probably need to change `optionalSymbol` as well!

diff --git a/src/cli/GlobalConfig.fs b/src/cli/GlobalConfig.fs
@@ -1,7 +1,7 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
 open System
-open b0wter.Fbrary.Core
+open Fbrary.Core
 
 module GlobalConfig =
 

diff --git a/src/cli/Library.fs b/src/cli/Library.fs
@@ -1,10 +1,10 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
 open System
 open FsToolkit.ErrorHandling
 open b0wter.FSharp.Collections
-open b0wter.Fbrary.Core.Utilities
-open b0wter.Fbrary.Core
+open Fbrary.Core.Utilities
+open Fbrary.Core
 
 module Library =
 

diff --git a/src/cli/Program.fs b/src/cli/Program.fs
@@ -1,12 +1,11 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
 open Argu
 open System
 open FsToolkit.ErrorHandling
 open b0wter.FSharp.Operators
-open b0wter.Fbrary
-open b0wter.Fbrary.Core.Utilities
-open b0wter.Fbrary.Core
+open Fbrary.Core.Utilities
+open Fbrary.Core
 module Program =
 
     let getDirectoryFromArgs (argv: string []) =

diff --git a/src/cli/Version.fs b/src/cli/Version.fs
@@ -1,4 +1,4 @@
-namespace b0wter.Fbrary
+namespace Fbrary.Cli
 
 module Version =
 

diff --git a/src/lib/Audiobook.fs b/src/lib/Audiobook.fs
@@ -1,7 +1,7 @@
-namespace b0wter.Fbrary.Core
+namespace Fbrary.Core
 
 open System
-open b0wter.Fbrary.Core.Utilities
+open Fbrary.Core.Utilities
 open b0wter.FSharp
 
 module Audiobook =

diff --git a/src/lib/Fbrary.Core.fsproj b/src/lib/Fbrary.Core.fsproj
@@ -4,7 +4,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Fbrary.Core</AssemblyName>
-    <RootNamespace>b0wter.Fbrary.Core</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/lib/IO.fs b/src/lib/IO.fs
@@ -1,4 +1,4 @@
-namespace b0wter.Fbrary.Core
+namespace Fbrary.Core
 
 open System
 open System.IO

diff --git a/src/lib/Metadata.fs b/src/lib/Metadata.fs
@@ -1,4 +1,4 @@
-namespace b0wter.Fbrary.Core
+namespace Fbrary.Core
 
 open System
 

diff --git a/src/lib/Rating.fs b/src/lib/Rating.fs
@@ -1,4 +1,4 @@
-namespace b0wter.Fbrary.Core
+namespace Fbrary.Core
 
 module Rating =
     type Rating = Rating of int

diff --git a/src/lib/TagLib.fs b/src/lib/TagLib.fs
@@ -1,6 +1,6 @@
-namespace b0wter.Fbrary.Core
+namespace Fbrary.Core
 
-open b0wter.Fbrary.Core.Metadata
+open Fbrary.Core.Metadata
 open System
 open System.IO
 open b0wter.FSharp

diff --git a/src/lib/Utilities.fs b/src/lib/Utilities.fs
@@ -1,4 +1,4 @@
-namespace b0wter.Fbrary.Core
+namespace Fbrary.Core
 
 module Utilities =
     module Parsers =

diff --git a/src/tui/Fbrary.Tui.fsproj b/src/tui/Fbrary.Tui.fsproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <RootNamespace>b0wter.Fbrary.Tui</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/cli/FormatterTests.fs b/tests/cli/FormatterTests.fs
@@ -1,10 +1,10 @@
-namespace b0wter.Fbrary.Tests
+namespace Fbrary.Tests
 
 open System
 open FsUnit
 open Xunit
-open b0wter.Fbrary
-open b0wter.Fbrary.Core
+open Fbrary.Cli
+open Fbrary.Core
 
 module Formatter =
 

diff --git a/tests/cli/IoTests.fs b/tests/cli/IoTests.fs
@@ -1,8 +1,8 @@
-namespace b0wter.Fbrary.Tests
+namespace Fbrary.Tests
 
 open FsUnit
 open Xunit
-open b0wter.Fbrary.Core
+open Fbrary.Core
 
 module IO =
 

diff --git a/tests/cli/ProgramTests.fs b/tests/cli/ProgramTests.fs
@@ -1,9 +1,9 @@
-namespace FbraryTests
+namespace Fbrary.Tests
 
 open FsUnit.Xunit
 open Xunit
-open b0wter.Fbrary.GlobalConfig
-open b0wter.Fbrary
+open Fbrary.Cli.GlobalConfig
+open Fbrary.Cli
 
 module ProgramTests =