Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
rhbz865668 Delete source docs only when source push is enabled
  • Loading branch information
@seanf
seanf committed Oct 12, 2012
1 parent f8c1d65 commit 0bfdb2f
Showing 1 changed file with 55 additions and 31 deletions.
86 changes: 55 additions & 31 deletions zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
View file
Expand Up @@ -94,13 +94,11 @@ private void logOptions()
log.info("Source language: {}", getOpts().getSourceLang());
log.info("Copy previous translations: {}", getOpts().getCopyTrans());
log.info("Merge type: {}", getOpts().getMergeType());
log.info("Batch size: {}", getOpts().getBatchSize());
log.info("Enable modules: {}", getOpts().getEnableModules());

if (getOpts().getBatchSize() <= 0)
if (pushTrans() && mergeAuto())
{
throw new RuntimeException("Batch size needs to be 1 or more.");
log.info("Batch size: {}", getOpts().getBatchSize());
}
log.info("Enable modules: {}", getOpts().getEnableModules());

if (getOpts().getEnableModules())
{
Expand Down Expand Up @@ -143,21 +141,42 @@ else if (getOpts().getPushType() == PushPullType.Source)
}
}

private boolean mergeAuto()
{
return getOpts().getMergeType().toUpperCase().equals(MergeType.AUTO.name());
}

private boolean pushSource()
{
return getOpts().getPushType() == PushPullType.Both || getOpts().getPushType() == PushPullType.Source;
}

private boolean pushTrans()
{
return getOpts().getPushType() == PushPullType.Both || getOpts().getPushType() == PushPullType.Trans;
}

@Override
public void run() throws Exception
{
logOptions();

if (getOpts().getBatchSize() <= 0)
{
throw new RuntimeException("Batch size needs to be 1 or more.");
}

pushCurrentModule();

if (getOpts().getEnableModules() && getOpts().isRootModule())
if (pushSource() && getOpts().getEnableModules() && getOpts().isRootModule())
{
List<String> obsoleteDocs = getObsoleteDocNamesForProjectIterationFromServer();
log.info("found {} docs in obsolete modules (or no module): {}", obsoleteDocs.size(), obsoleteDocs);
if (getOpts().getDeleteObsoleteModules() && !obsoleteDocs.isEmpty())
{
// offer to delete obsolete documents
confirmWithUser("Do you want to delete all documents from the server which don't belong to any module in the Maven reactor?\n");
deleteDocsFromServer(obsoleteDocs);
deleteSourceDocsFromServer(obsoleteDocs);
}
else
{
Expand Down Expand Up @@ -234,7 +253,11 @@ private void pushCurrentModule() throws IOException
{
log.info("Found source document: {}", docName);
}
List<String> obsoleteDocs = getObsoleteDocsInModuleFromServer(localDocNames);
List<String> obsoleteDocs = Collections.emptyList();
if (pushSource())
{
obsoleteDocs = getObsoleteDocsInModuleFromServer(localDocNames);
}
if (obsoleteDocs.isEmpty())
{
if (localDocNames.isEmpty())
Expand All @@ -253,7 +276,7 @@ private void pushCurrentModule() throws IOException
log.info("Obsolete docs: {}", obsoleteDocs);
}

if (getOpts().getPushType() == PushPullType.Trans || getOpts().getPushType() == PushPullType.Both)
if (pushTrans())
{
if (getOpts().getLocaleMapList() == null)
throw new ConfigException("pushType set to '" + getOpts().getPushType() + "', but zanata.xml contains no <locales>");
Expand All @@ -270,7 +293,7 @@ else if (getOpts().getPushType() == PushPullType.Trans)
}
else
{
confirmWithUser("This will overwrite existing documents on the server, and delete obsolete documents.\n");
confirmWithUser("This will overwrite existing source documents on the server, and delete obsolete documents.\n");
}

for (String localDocName : localDocNames)
Expand All @@ -281,11 +304,11 @@ else if (getOpts().getPushType() == PushPullType.Trans)
srcDoc.setName(qualifiedDocName);
debug(srcDoc);

if (getOpts().getPushType() == PushPullType.Source || getOpts().getPushType() == PushPullType.Both)
if (pushSource())
{
pushSrcDocToServer(docUri, srcDoc, extensions);
}
if (getOpts().getPushType() == PushPullType.Trans || getOpts().getPushType() == PushPullType.Both)
if (pushTrans())
{
strat.visitTranslationResources(localDocName, srcDoc, new TranslationResourcesVisitor()
{
Expand All @@ -299,7 +322,7 @@ public void visit(LocaleMapping locale, TranslationsResource targetDoc)
});
}
}
deleteDocsFromServer(obsoleteDocs);
deleteSourceDocsFromServer(obsoleteDocs);
}

/**
Expand Down Expand Up @@ -327,11 +350,11 @@ private List<String> getObsoleteDocsInModuleFromServer(Set<String> localDocNames
/**
* @param qualifiedDocNames
*/
private void deleteDocsFromServer(List<String> qualifiedDocNames)
private void deleteSourceDocsFromServer(List<String> qualifiedDocNames)
{
for (String qualifiedDocName : qualifiedDocNames)
{
deleteDocFromServer(qualifiedDocName);
deleteSourceDocFromServer(qualifiedDocName);
}
}

Expand All @@ -355,49 +378,50 @@ private void pushSrcDocToServer(final String docUri, final Resource srcDoc, fina
}

/**
* Split TranslationsResource into List<TranslationsResource> according to
* Batch processing only applies when mergeType=AUTO
* Split TranslationsResource into List&lt;TranslationsResource&gt; according to
* maxBatchSize, but only if mergeType=AUTO
*
* @param doc
* @param batchSize
* @return list of transaltionsResource
* @param maxBatchSize
* @return list of TranslationsResource, each containing up to maxBatchSize TextFlowTargets
*/
public List<TranslationsResource> splitIntoBatch(TranslationsResource doc, int batchSize)
public List<TranslationsResource> splitIntoBatch(TranslationsResource doc, int maxBatchSize)
{
List<TranslationsResource> targetDocList = new ArrayList<TranslationsResource>();
int size = doc.getTextFlowTargets().size();
int numTargets = doc.getTextFlowTargets().size();

if (size > batchSize && getOpts().getMergeType().toUpperCase().equals(MergeType.AUTO.name()))
if (numTargets > maxBatchSize && mergeAuto())
{
int batch = size / batchSize;
int numBatches = numTargets / maxBatchSize;

if (size % batchSize != 0)
if (numTargets % maxBatchSize != 0)
{
batch = batch + 1;
++numBatches;
}

int fromIndex = 0;
int toIndex = 0;

for (int i = 1; i <= batch; i++)
for (int i = 1; i <= numBatches; i++)
{
// make a dummy TranslationsResource to hold just the TextFlowTargets for each batch
TranslationsResource resource = new TranslationsResource();
resource.setExtensions(doc.getExtensions());
resource.setLinks(doc.getLinks());
resource.setRevision(doc.getRevision());

if ((i * batchSize) > size)
if ((i * maxBatchSize) > numTargets)
{
toIndex = size;
toIndex = numTargets;
}
else
{
toIndex = i * batchSize;
toIndex = i * maxBatchSize;
}

resource.getTextFlowTargets().addAll(doc.getTextFlowTargets().subList(fromIndex, toIndex));

fromIndex = i * batchSize;
fromIndex = i * maxBatchSize;

targetDocList.add(resource);
}
Expand Down Expand Up @@ -441,7 +465,7 @@ private void pushTargetDocToServer(final String docUri, LocaleMapping locale, fi
}
}

private void deleteDocFromServer(String qualifiedDocName)
private void deleteSourceDocFromServer(String qualifiedDocName)
{
if (!getOpts().isDryRun())
{
Expand Down

0 comments on commit 0bfdb2f

Please sign in to comment.