Skip to content

Commit

Permalink
* reduce indent level from two to one for all primary constructors @ c#
Browse files Browse the repository at this point in the history
  • Loading branch information
n0099 committed May 16, 2024
1 parent 114f3c8 commit 3a13c14
Show file tree
Hide file tree
Showing 16 changed files with 89 additions and 89 deletions.
20 changes: 10 additions & 10 deletions c#/crawler/src/Tieba/Crawl/Facade/ReplyCrawlFacade.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
namespace tbm.Crawler.Tieba.Crawl.Facade;

public class ReplyCrawlFacade(
ReplyCrawler.New crawlerFactory,
Fid fid,
Tid tid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
ReplyParser postParser,
ReplySaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory,
CrawlerDbContext.New dbContextFactory,
SonicPusher sonicPusher)
ReplyCrawler.New crawlerFactory,
Fid fid,
Tid tid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
ReplyParser postParser,
ReplySaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory,
CrawlerDbContext.New dbContextFactory,
SonicPusher sonicPusher)
: CrawlFacade<ReplyPost, ReplyResponse, Reply>(
crawlerFactory(fid, tid), fid, new(fid, tid), locks[CrawlerLocks.Type.Reply],
postParser, postSaverFactory.Invoke,
Expand Down
20 changes: 10 additions & 10 deletions c#/crawler/src/Tieba/Crawl/Facade/SubReplyCrawlFacade.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
namespace tbm.Crawler.Tieba.Crawl.Facade;

public class SubReplyCrawlFacade(
SubReplyCrawler.New crawlerFactory,
Fid fid,
Tid tid,
Pid pid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
SubReplyParser postParser,
SubReplySaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory,
SonicPusher sonicPusher)
SubReplyCrawler.New crawlerFactory,
Fid fid,
Tid tid,
Pid pid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
SubReplyParser postParser,
SubReplySaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory,
SonicPusher sonicPusher)
: CrawlFacade<SubReplyPost, SubReplyResponse, SubReply>(
crawlerFactory(tid, pid), fid, new(fid, tid, pid), locks[CrawlerLocks.Type.SubReply],
postParser, postSaverFactory.Invoke,
Expand Down
16 changes: 8 additions & 8 deletions c#/crawler/src/Tieba/Crawl/Facade/ThreadArchiveCrawlFacade.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
namespace tbm.Crawler.Tieba.Crawl.Facade;

public class ThreadArchiveCrawlFacade(
ThreadArchiveCrawler.New crawlerFactory,
string forumName,
Fid fid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
ThreadParser postParser,
ThreadSaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory)
ThreadArchiveCrawler.New crawlerFactory,
string forumName,
Fid fid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
ThreadParser postParser,
ThreadSaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory)
: ThreadCrawlFacade(
crawlerFactory.Invoke, forumName, fid, locks,
postParser, postSaverFactory,
Expand Down
16 changes: 8 additions & 8 deletions c#/crawler/src/Tieba/Crawl/Facade/ThreadCrawlFacade.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
namespace tbm.Crawler.Tieba.Crawl.Facade;

public class ThreadCrawlFacade(
ThreadCrawler.New crawlerFactory,
string forumName,
Fid fid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
ThreadParser postParser,
ThreadSaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory)
ThreadCrawler.New crawlerFactory,
string forumName,
Fid fid,
IIndex<CrawlerLocks.Type, CrawlerLocks> locks,
ThreadParser postParser,
ThreadSaver.New postSaverFactory,
UserParser.New userParserFactory,
UserSaver.New userSaverFactory)
: CrawlFacade<ThreadPost, ThreadResponse, Thread>(
crawlerFactory(forumName), fid, new(fid), locks[CrawlerLocks.Type.Thread],
postParser, postSaverFactory.Invoke,
Expand Down
8 changes: 4 additions & 4 deletions c#/crawler/src/Tieba/Crawl/Saver/Post/PostSaver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
namespace tbm.Crawler.Tieba.Crawl.Saver.Post;

public abstract class PostSaver<TPost, TBaseRevision>(
ILogger<PostSaver<TPost, TBaseRevision>> logger,
ConcurrentDictionary<PostId, TPost> posts,
AuthorRevisionSaver.New authorRevisionSaverFactory,
PostType currentPostType)
ILogger<PostSaver<TPost, TBaseRevision>> logger,
ConcurrentDictionary<PostId, TPost> posts,
AuthorRevisionSaver.New authorRevisionSaverFactory,
PostType currentPostType)
: SaverWithRevision<TBaseRevision>(logger), IPostSaver<TPost>
where TPost : BasePost
where TBaseRevision : BaseRevisionWithSplitting
Expand Down
10 changes: 5 additions & 5 deletions c#/crawler/src/Tieba/Crawl/Saver/Post/ReplySaver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
namespace tbm.Crawler.Tieba.Crawl.Saver.Post;

public class ReplySaver(
ILogger<ReplySaver> logger,
ConcurrentDictionary<PostId, ReplyPost> posts,
ReplyContentImageSaver replyContentImageSaver,
ReplySignatureSaver replySignatureSaver,
AuthorRevisionSaver.New authorRevisionSaverFactory)
ILogger<ReplySaver> logger,
ConcurrentDictionary<PostId, ReplyPost> posts,
ReplyContentImageSaver replyContentImageSaver,
ReplySignatureSaver replySignatureSaver,
AuthorRevisionSaver.New authorRevisionSaverFactory)
: PostSaver<ReplyPost, BaseReplyRevision>(
logger, posts, authorRevisionSaverFactory, PostType.Reply)
{
Expand Down
6 changes: 3 additions & 3 deletions c#/crawler/src/Tieba/Crawl/Saver/Post/SubReplySaver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace tbm.Crawler.Tieba.Crawl.Saver.Post;

public class SubReplySaver(
ILogger<SubReplySaver> logger,
ConcurrentDictionary<PostId, SubReplyPost> posts,
AuthorRevisionSaver.New authorRevisionSaverFactory)
ILogger<SubReplySaver> logger,
ConcurrentDictionary<PostId, SubReplyPost> posts,
AuthorRevisionSaver.New authorRevisionSaverFactory)
: PostSaver<SubReplyPost, BaseSubReplyRevision>(
logger, posts, authorRevisionSaverFactory, PostType.SubReply)
{
Expand Down
6 changes: 3 additions & 3 deletions c#/crawler/src/Tieba/Crawl/Saver/Post/ThreadSaver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace tbm.Crawler.Tieba.Crawl.Saver.Post;

public class ThreadSaver(
ILogger<ThreadSaver> logger,
ConcurrentDictionary<Tid, ThreadPost> posts,
AuthorRevisionSaver.New authorRevisionSaverFactory)
ILogger<ThreadSaver> logger,
ConcurrentDictionary<Tid, ThreadPost> posts,
AuthorRevisionSaver.New authorRevisionSaverFactory)
: PostSaver<ThreadPost, BaseThreadRevision>(
logger, posts, authorRevisionSaverFactory, PostType.Thread)
{
Expand Down
12 changes: 6 additions & 6 deletions c#/crawler/src/Worker/ArchiveCrawlWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ namespace tbm.Crawler.Worker;
using SavedRepliesKeyByTid = ConcurrentDictionary<Tid, SaverChangeSet<ReplyPost>>;

public class ArchiveCrawlWorker(
ILogger<ArchiveCrawlWorker> logger,
Func<Owned<ThreadLateCrawlFacade.New>> threadLateCrawlFacadeFactory,
Func<Owned<ThreadArchiveCrawler.New>> threadArchiveCrawlerFactory,
Func<Owned<ThreadArchiveCrawlFacade.New>> threadArchiveCrawlFacadeFactory,
Func<Owned<ReplyCrawlFacade.New>> replyCrawlFacadeFactory,
Func<Owned<SubReplyCrawlFacade.New>> subReplyCrawlFacadeFactory)
ILogger<ArchiveCrawlWorker> logger,
Func<Owned<ThreadLateCrawlFacade.New>> threadLateCrawlFacadeFactory,
Func<Owned<ThreadArchiveCrawler.New>> threadArchiveCrawlerFactory,
Func<Owned<ThreadArchiveCrawlFacade.New>> threadArchiveCrawlFacadeFactory,
Func<Owned<ReplyCrawlFacade.New>> replyCrawlFacadeFactory,
Func<Owned<SubReplyCrawlFacade.New>> subReplyCrawlFacadeFactory)
: ErrorableWorker(shouldExitOnException: true, shouldExitOnFinish: true)
{
// as of March 2019, tieba had restrict the max accepted value for page param of forum's threads api
Expand Down
4 changes: 2 additions & 2 deletions c#/crawler/src/Worker/MainCrawlWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace tbm.Crawler.Worker;

public class MainCrawlWorker(
Func<Owned<CrawlerDbContext.NewDefault>> dbContextDefaultFactory,
CrawlPost crawlPost)
Func<Owned<CrawlerDbContext.NewDefault>> dbContextDefaultFactory,
CrawlPost crawlPost)
: CyclicCrawlWorker
{
protected override async Task DoWork(CancellationToken stoppingToken)
Expand Down
10 changes: 5 additions & 5 deletions c#/crawler/src/Worker/PushAllPostContentsIntoSonicWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ namespace tbm.Crawler.Worker;

// ReSharper disable once UnusedType.Global
public class PushAllPostContentsIntoSonicWorker(
ILogger<PushAllPostContentsIntoSonicWorker> logger,
IConfiguration config,
SonicPusher pusher,
Func<Owned<CrawlerDbContext.New>> dbContextFactory,
Func<Owned<CrawlerDbContext.NewDefault>> dbContextDefaultFactory)
ILogger<PushAllPostContentsIntoSonicWorker> logger,
IConfiguration config,
SonicPusher pusher,
Func<Owned<CrawlerDbContext.New>> dbContextFactory,
Func<Owned<CrawlerDbContext.NewDefault>> dbContextDefaultFactory)
: ErrorableWorker(shouldExitOnException: true, shouldExitOnFinish: true)
{
private readonly IConfiguration _config = config.GetSection("Sonic");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
namespace tbm.Crawler.Worker;

public class ResumeSuspendPostContentsPushingWorker(
ILogger<ResumeSuspendPostContentsPushingWorker> logger,
SonicPusher pusher)
ILogger<ResumeSuspendPostContentsPushingWorker> logger,
SonicPusher pusher)
: ErrorableWorker
{
public static string GetFilePath(string postType) =>
Expand Down
16 changes: 8 additions & 8 deletions c#/crawler/src/Worker/RetryCrawlWorker.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
namespace tbm.Crawler.Worker;

public class RetryCrawlWorker(
ILogger<RetryCrawlWorker> logger,
IIndex<CrawlerLocks.Type, CrawlerLocks> registeredLocksLookup,
CrawlPost crawlPost,
Func<Owned<CrawlerDbContext.NewDefault>> dbContextDefaultFactory,
Func<Owned<ThreadLateCrawlFacade.New>> threadLateCrawlFacadeFactory,
Func<Owned<ThreadCrawlFacade.New>> threadCrawlFacadeFactory,
Func<Owned<ReplyCrawlFacade.New>> replyCrawlFacadeFactory,
Func<Owned<SubReplyCrawlFacade.New>> subReplyCrawlFacadeFactory)
ILogger<RetryCrawlWorker> logger,
IIndex<CrawlerLocks.Type, CrawlerLocks> registeredLocksLookup,
CrawlPost crawlPost,
Func<Owned<CrawlerDbContext.NewDefault>> dbContextDefaultFactory,
Func<Owned<ThreadLateCrawlFacade.New>> threadLateCrawlFacadeFactory,
Func<Owned<ThreadCrawlFacade.New>> threadCrawlFacadeFactory,
Func<Owned<ReplyCrawlFacade.New>> replyCrawlFacadeFactory,
Func<Owned<SubReplyCrawlFacade.New>> subReplyCrawlFacadeFactory)
: CyclicCrawlWorker
{
protected override async Task DoWork(CancellationToken stoppingToken)
Expand Down
6 changes: 3 additions & 3 deletions c#/imagePipeline/src/Consumer/OcrConsumer.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
namespace tbm.ImagePipeline.Consumer;

public class OcrConsumer(
JointRecognizer.New recognizerFactory,
FailedImageHandler failedImageHandler,
string script)
JointRecognizer.New recognizerFactory,
FailedImageHandler failedImageHandler,
string script)
: MatrixConsumer
{
private readonly JointRecognizer _recognizer = recognizerFactory(script);
Expand Down
12 changes: 6 additions & 6 deletions c#/imagePipeline/src/ImageBatchConsumingWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
namespace tbm.ImagePipeline;

public class ImageBatchConsumingWorker(
ILogger<ImageBatchConsumingWorker> logger,
ILifetimeScope scope0,
ILogger<ImageBatchConsumingWorker> logger,
ILifetimeScope scope0,

// ReSharper disable once SuggestBaseTypeForParameterInConstructor
Channel<List<ImageWithBytes>> channel,
Func<Owned<ImagePipelineDbContext.New>> dbContextFactory,
Func<Owned<ImagePipelineDbContext.NewDefault>> dbContextDefaultFactory)
// ReSharper disable once SuggestBaseTypeForParameterInConstructor
Channel<List<ImageWithBytes>> channel,
Func<Owned<ImagePipelineDbContext.New>> dbContextFactory,
Func<Owned<ImagePipelineDbContext.NewDefault>> dbContextDefaultFactory)
: ErrorableWorker(shouldExitOnException: true, shouldExitOnFinish: true)
{
protected override async Task DoWork(CancellationToken stoppingToken)
Expand Down
12 changes: 6 additions & 6 deletions c#/imagePipeline/src/ImageBatchProducingWorker.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
namespace tbm.ImagePipeline;

public class ImageBatchProducingWorker(
ILogger<ImageBatchProducingWorker> logger,
IConfiguration config,
ImageRequester imageRequester,
ILogger<ImageBatchProducingWorker> logger,
IConfiguration config,
ImageRequester imageRequester,

// ReSharper disable once SuggestBaseTypeForParameterInConstructor
Channel<List<ImageWithBytes>> channel,
Func<Owned<ImagePipelineDbContext.NewDefault>> dbContextDefaultFactory)
// ReSharper disable once SuggestBaseTypeForParameterInConstructor
Channel<List<ImageWithBytes>> channel,
Func<Owned<ImagePipelineDbContext.NewDefault>> dbContextDefaultFactory)
: ErrorableWorker(shouldExitOnException: true)
{
private readonly IConfigurationSection _config = config.GetSection("ImageBatchProducer");
Expand Down

0 comments on commit 3a13c14

Please sign in to comment.